Change to new eduPerson URNs.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@616 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/data/example1.xml b/data/example1.xml
index 91d2c1a..a781a5e 100755 (executable)
--- a/data/example1.xml
+++ b/data/example1.xml
@@ -5,7 +5,7 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
                        <AnyValue release="permit"/>
                </Attribute>
        </Rule>

diff --git a/data/example10.xml b/data/example10.xml
index 7b041d9..0ca5e72 100755 (executable)
--- a/data/example10.xml
+++ b/data/example10.xml
@@ -5,7 +5,7 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
                        <Value release="permit">member@example.edu</Value>
                </Attribute>
        </Rule>
@@ -14,7 +14,7 @@
                        <Requester matchFunction="urn:mace:shibboleth:arp:matchFunction:regexMatch">shar[1-9]\.example\.edu</Requester>
                        <Resource matchFunction="urn:mace:shibboleth:arp:matchFunction:regexMatch">^https?://.+\.example\.edu/.*$</Resource>
                </Target>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
                        <Value release="permit">faculty@example.edu</Value>
                </Attribute>
        </Rule>
@@ -23,7 +23,7 @@
                        <Requester>shar.example.edu</Requester>
                        <Resource>http://www.example.edu/example1/</Resource>
                </Target>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
                        <Value release="deny">faculty@example.edu</Value>
                </Attribute>
        </Rule>
@@ -32,7 +32,7 @@
                        <Requester>shar.example.edu</Requester>
                        <Resource>http://www.example.edu/example2/</Resource>
                </Target>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
                        <AnyValue release="permit"/>
                </Attribute>
        </Rule>

diff --git a/data/example2.xml b/data/example2.xml
index 74cd44c..0780630 100755 (executable)
--- a/data/example2.xml
+++ b/data/example2.xml
@@ -5,10 +5,10 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonPrincipalName">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonPrincipalName">
                        <AnyValue release="permit"/>
                </Attribute>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
                        <Value release="permit">member@example.edu</Value>
                </Attribute>
        </Rule>

diff --git a/data/example3.xml b/data/example3.xml
index 6570600..d4fe4e4 100755 (executable)
--- a/data/example3.xml
+++ b/data/example3.xml
@@ -6,10 +6,10 @@
                        <Requester>shar.example.edu</Requester>
                        <Resource>http://www.example.edu/</Resource>
                </Target>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonPrincipalName">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonPrincipalName">
                        <AnyValue release="permit"/>
                </Attribute>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
                        <Value release="permit">member@example.edu</Value>
                </Attribute>
        </Rule>

diff --git a/data/example4.xml b/data/example4.xml
index 484d1fb..b965869 100755 (executable)
--- a/data/example4.xml
+++ b/data/example4.xml
@@ -6,12 +6,12 @@
                        <Requester>shar.example.edu</Requester>
                        <Resource>http://www.example.edu/</Resource>
                </Target>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
                        <Value release="permit">member@example.edu</Value>
                </Attribute>
                <AttributeReference identifier="http://example.edu/attributes/attribute1"/>
        </Rule>
-       <Attribute name="urn:mace:eduPerson:1.0:eduPersonAffiliation" identifier="http://example.edu/attributes/attribute1">
+       <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation" identifier="http://example.edu/attributes/attribute1">
                <Value release="permit">student@example.edu</Value>
        </Attribute>
 </AttributeReleasePolicy>

diff --git a/data/example5.xml b/data/example5.xml
index 501a3cb..76adde6 100755 (executable)
--- a/data/example5.xml
+++ b/data/example5.xml
@@ -5,7 +5,7 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
                        <AnyValue release="permit"/>
                        <Value release="deny">faculty@example.edu</Value>
                </Attribute>

diff --git a/data/example6.xml b/data/example6.xml
index a817403..961ce01 100755 (executable)
--- a/data/example6.xml
+++ b/data/example6.xml
@@ -5,7 +5,7 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
                        <AnyValue release="deny"/>
                </Attribute>
        </Rule>

diff --git a/data/example7.xml b/data/example7.xml
index 4816951..b426028 100755 (executable)
--- a/data/example7.xml
+++ b/data/example7.xml
@@ -6,10 +6,10 @@
                        <Requester>shar.example.edu</Requester>
                        <Resource matchFunction="urn:mace:shibboleth:arp:matchFunction:regexMatch">^https?://.+\.example\.edu/.*$</Resource>
                </Target>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonPrincipalName">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonPrincipalName">
                        <AnyValue release="permit"/>
                </Attribute>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
                        <Value release="permit">member@example.edu</Value>
                </Attribute>
        </Rule>

diff --git a/data/example8.xml b/data/example8.xml
index 8634162..2e857a6 100755 (executable)
--- a/data/example8.xml
+++ b/data/example8.xml
@@ -6,10 +6,10 @@
                        <Requester matchFunction="urn:mace:shibboleth:arp:matchFunction:regexMatch">shar[1-9]\.example\.edu</Requester>
                        <Resource matchFunction="urn:mace:shibboleth:arp:matchFunction:regexMatch">^https?://.+\.example\.edu/.*$</Resource>
                </Target>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonPrincipalName">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonPrincipalName">
                        <AnyValue release="permit"/>
                </Attribute>
-               <Attribute name="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
                        <Value release="permit">member@example.edu</Value>
                </Attribute>
        </Rule>

diff --git a/data/example9.xml b/data/example9.xml
index f088df9..bc0c3d3 100755 (executable)
--- a/data/example9.xml
+++ b/data/example9.xml
@@ -5,7 +5,7 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute identifier="http://example.edu/attributes/attribute10" name="urn:mace:eduPerson:1.0:eduPersonAffiliation">
+               <Attribute identifier="http://example.edu/attributes/attribute10" name="urn:mace:dir:eduperson#eduPersonAffiliation">
                        <Value release="permit">member@example.edu</Value>
                </Attribute>
        </Rule>