Updated attribute URIs.

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

diff --git a/data/arp.site.xml b/data/arp.site.xml
index 1bd23d6..ace2382 100755 (executable)
--- a/data/arp.site.xml
+++ b/data/arp.site.xml
@@ -5,7 +5,7 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation">
                        <AnyValue release="permit"/>
                </Attribute>
        </Rule>

diff --git a/data/arp.user.test.xml b/data/arp.user.test.xml
index acc9cd9..abf4e8c 100755 (executable)
--- a/data/arp.user.test.xml
+++ b/data/arp.user.test.xml
@@ -4,7 +4,7 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute name="urn:mace:dir:eduperson#eduPersonPrincipalName">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonPrincipalName">
                        <AnyValue release="permit"/>
                </Attribute>
        </Rule>

diff --git a/data/arp1.xml b/data/arp1.xml
index d48a99e..a429292 100755 (executable)
--- a/data/arp1.xml
+++ b/data/arp1.xml
@@ -6,7 +6,7 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation">
                        <AnyValue release="permit"/>
                </Attribute>
        </Rule>

diff --git a/data/arp2.xml b/data/arp2.xml
index 00647e8..878f91f 100755 (executable)
--- a/data/arp2.xml
+++ b/data/arp2.xml
@@ -4,7 +4,7 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation">
                        <AnyValue release="permit"/>
                </Attribute>
        </Rule>

diff --git a/data/arp6.xml b/data/arp6.xml
index a4c46b5..808f92f 100755 (executable)
--- a/data/arp6.xml
+++ b/data/arp6.xml
@@ -5,7 +5,7 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation">
                        <AnyValue release="deny"/>
                </Attribute>
        </Rule>

diff --git a/data/arp7.xml b/data/arp7.xml
index 6867455..65b54f3 100755 (executable)
--- a/data/arp7.xml
+++ b/data/arp7.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:dir:eduperson#eduPersonPrincipalName">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonPrincipalName">
                        <AnyValue release="permit"/>
                </Attribute>
-               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation">
                        <Value release="permit">member@example.edu</Value>
                </Attribute>
        </Rule>

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

diff --git a/data/example10.xml b/data/example10.xml
index 0ca5e72..2c6af5e 100755 (executable)
--- a/data/example10.xml
+++ b/data/example10.xml
@@ -5,7 +5,7 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def: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:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def: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:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def: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:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation">
                        <AnyValue release="permit"/>
                </Attribute>
        </Rule>

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

diff --git a/data/example3.xml b/data/example3.xml
index d4fe4e4..0b71b23 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:dir:eduperson#eduPersonPrincipalName">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonPrincipalName">
                        <AnyValue release="permit"/>
                </Attribute>
-               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation">
                        <Value release="permit">member@example.edu</Value>
                </Attribute>
        </Rule>

diff --git a/data/example4.xml b/data/example4.xml
index b965869..3fc7a7e 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:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation">
                        <Value release="permit">member@example.edu</Value>
                </Attribute>
                <AttributeReference identifier="http://example.edu/attributes/attribute1"/>
        </Rule>
-       <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation" identifier="http://example.edu/attributes/attribute1">
+       <Attribute name="urn:mace:dir:attribute-def: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 76adde6..cc1e447 100755 (executable)
--- a/data/example5.xml
+++ b/data/example5.xml
@@ -5,7 +5,7 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation">
                        <AnyValue release="permit"/>
                        <Value release="deny">faculty@example.edu</Value>
                </Attribute>

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

diff --git a/data/example7.xml b/data/example7.xml
index b426028..e8adf15 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:dir:eduperson#eduPersonPrincipalName">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonPrincipalName">
                        <AnyValue release="permit"/>
                </Attribute>
-               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation">
                        <Value release="permit">member@example.edu</Value>
                </Attribute>
        </Rule>

diff --git a/data/example8.xml b/data/example8.xml
index 2e857a6..83c985f 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:dir:eduperson#eduPersonPrincipalName">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonPrincipalName">
                        <AnyValue release="permit"/>
                </Attribute>
-               <Attribute name="urn:mace:dir:eduperson#eduPersonAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation">
                        <Value release="permit">member@example.edu</Value>
                </Attribute>
        </Rule>

diff --git a/data/example9.xml b/data/example9.xml
index bc0c3d3..eb81bb7 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:dir:eduperson#eduPersonAffiliation">
+               <Attribute identifier="http://example.edu/attributes/attribute10" name="urn:mace:dir:attribute-def:eduPersonAffiliation">
                        <Value release="permit">member@example.edu</Value>
                </Attribute>
        </Rule>

diff --git a/data/resolver1.xml b/data/resolver1.xml
index ee4df06..4aeec84 100644 (file)
--- a/data/resolver1.xml
+++ b/data/resolver1.xml
@@ -1,18 +1,18 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonPrincipalName" smartScope="columbia.edu">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonPrincipalName" smartScope="columbia.edu">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonNickName">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonNickName">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonEntitlement">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonEntitlement">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonAffiliation">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonAffiliation">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        

diff --git a/data/resolver10.xml b/data/resolver10.xml
index f63bf85..af57625 100644 (file)
--- a/data/resolver10.xml
+++ b/data/resolver10.xml
@@ -1,10 +1,10 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonScopedAffiliation" smartScope="example.edu">
-               <DataConnectorDependency requires="urn:mace:dir:eduperson#eduPersonAffiliation"/>
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" smartScope="example.edu">
+               <DataConnectorDependency requires="urn:mace:dir:attribute-def:eduPersonAffiliation"/>
        </SimpleAttributeDefinition>
 
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonAffiliation">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonAffiliation">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        

diff --git a/data/resolver11.xml b/data/resolver11.xml
index 2b7ebdb..47542a1 100644 (file)
--- a/data/resolver11.xml
+++ b/data/resolver11.xml
@@ -1,6 +1,6 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonAffiliation">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonAffiliation">
                <AttributeDependency requires="echo"/>
        </SimpleAttributeDefinition>
        

diff --git a/data/resolver2.xml b/data/resolver2.xml
index cea621b..b5f4b42 100644 (file)
--- a/data/resolver2.xml
+++ b/data/resolver2.xml
@@ -1,6 +1,6 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonPrincipalName" smartScope="example.edu">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonPrincipalName" smartScope="example.edu">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        

diff --git a/data/resolver8.xml b/data/resolver8.xml
index 399d0df..8e2f952 100644 (file)
--- a/data/resolver8.xml
+++ b/data/resolver8.xml
@@ -1,14 +1,14 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonPrincipalName" smartScope="example.edu">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonPrincipalName" smartScope="example.edu">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonEntitlement">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonEntitlement">
                <DataConnectorDependency requires="echo2"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonAffiliation">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonAffiliation">
                <DataConnectorDependency requires="echo3"/>
        </SimpleAttributeDefinition>
        

diff --git a/data/resolver9.xml b/data/resolver9.xml
index 5a5258a..f1a3365 100644 (file)
--- a/data/resolver9.xml
+++ b/data/resolver9.xml
@@ -1,10 +1,10 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonScopedAffiliation" smartScope="example.edu">
-               <AttributeDependency requires="urn:mace:dir:eduperson#eduPersonAffiliation"/>
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" smartScope="example.edu">
+               <AttributeDependency requires="urn:mace:dir:attribute-def:eduPersonAffiliation"/>
        </SimpleAttributeDefinition>
 
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonAffiliation">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonAffiliation">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        

diff --git a/src/conf/arps/arp.site.xml b/src/conf/arps/arp.site.xml
index cedeb37..069f25d 100755 (executable)
--- a/src/conf/arps/arp.site.xml
+++ b/src/conf/arps/arp.site.xml
@@ -5,7 +5,7 @@
                <Target>
                        <AnyTarget/>
                </Target>
-               <Attribute name="urn:mace:dir:eduperson#eduPersonScopedAffiliation">
+               <Attribute name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation">
                        <AnyValue release="permit"/>
                </Attribute>
        </Rule>

diff --git a/src/conf/resolver.ldap.xml b/src/conf/resolver.ldap.xml
index 73dacca..f37e7d6 100644 (file)
--- a/src/conf/resolver.ldap.xml
+++ b/src/conf/resolver.ldap.xml
@@ -1,20 +1,20 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonPrincipalName" smartScope="shibdev.edu">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonPrincipalName" smartScope="shibdev.edu">
                <DataConnectorDependency requires="directory"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonEntitlement">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonEntitlement">
                <DataConnectorDependency requires="directory"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonAffiliation">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonAffiliation">
                <DataConnectorDependency requires="directory"/>
        </SimpleAttributeDefinition>
        
        <!-- To use this attribute, you should change the smartScope value to match your site's domain name.
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonScopedAffiliation" smartScope="shibdev.edu">
-               <AttributeDependency requires="urn:mace:dir:eduperson#eduPersonAffiliation"/>
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" smartScope="shibdev.edu">
+               <AttributeDependency requires="urn:mace:dir:attribute-def:eduPersonAffiliation"/>
        </SimpleAttributeDefinition>
        -->
 

diff --git a/src/conf/resolver.xml b/src/conf/resolver.xml
index 9a93bbd..1d17328 100644 (file)
--- a/src/conf/resolver.xml
+++ b/src/conf/resolver.xml
@@ -1,20 +1,20 @@
 <AttributeResolver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:resolver:1.0" xsi:schemaLocation="urn:mace:shibboleth:resolver:1.0 shibboleth-resolver-1.0.xsd">
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonPrincipalName" smartScope="shibdev.edu">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonPrincipalName" smartScope="shibdev.edu">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonEntitlement">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonEntitlement">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
        
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonAffiliation">
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonAffiliation">
                <DataConnectorDependency requires="echo"/>
        </SimpleAttributeDefinition>
 
        <!-- To use this attribute, you should change the smartScope value to match your site's domain name.
-       <SimpleAttributeDefinition id="urn:mace:dir:eduperson#eduPersonScopedAffiliation" smartScope="shibdev.edu">
-               <AttributeDependency requires="urn:mace:dir:eduperson#eduPersonAffiliation"/>
+       <SimpleAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" smartScope="shibdev.edu">
+               <AttributeDependency requires="urn:mace:dir:attribute-def:eduPersonAffiliation"/>
        </SimpleAttributeDefinition>
        -->
        

diff --git a/tests/edu/internet2/middleware/shibboleth/aa/arp/ArpTests.java b/tests/edu/internet2/middleware/shibboleth/aa/arp/ArpTests.java
index 175bfcd..9039f19 100755 (executable)
--- a/tests/edu/internet2/middleware/shibboleth/aa/arp/ArpTests.java
+++ b/tests/edu/internet2/middleware/shibboleth/aa/arp/ArpTests.java
@@ -517,11 +517,11 @@ public class ArpTests extends TestCase {
                try {
                        Principal principal1 = new AuthNPrincipal("TestPrincipal");
                        URL url1 = new URL("http://www.example.edu/");
-                       URI[] list1 = { new URI("urn:mace:dir:eduperson#eduPersonAffiliation")};
+                       URI[] list1 = { new URI("urn:mace:dir:attribute-def:eduPersonAffiliation")};
                        URI[] list2 =
                                {
-                                       new URI("urn:mace:dir:eduperson#eduPersonAffiliation"),
-                                       new URI("urn:mace:dir:eduperson#eduPersonPrincipalName")};
+                                       new URI("urn:mace:dir:attribute-def:eduPersonAffiliation"),
+                                       new URI("urn:mace:dir:attribute-def:eduPersonPrincipalName")};
                        URI[] list3 = new URI[0];
 
                        //Test with just a site ARP
@@ -656,7 +656,7 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -667,13 +667,13 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
 
                AAAttributeSet releaseSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
 
                //Setup the engine
@@ -704,7 +704,7 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -716,10 +716,10 @@ public class ArpTests extends TestCase {
                        new AAAttributeSet(
                                new AAAttribute[] {
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                               "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                                new Object[] { "member@example.edu", "faculty@example.edu" }),
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonPrincipalName",
+                                               "urn:mace:dir:attribute-def:eduPersonPrincipalName",
                                                new Object[] { "mehoehn@example.edu" })
                });
 
@@ -727,7 +727,7 @@ public class ArpTests extends TestCase {
                        new AAAttributeSet(
                                new AAAttribute[] {
                                         new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                               "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                                new Object[] { "member@example.edu", "faculty@example.edu" })
                });
 
@@ -759,7 +759,7 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <Value release=\"permit\">member@example.edu</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -770,11 +770,11 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
                AAAttributeSet releaseSet =
                        new AAAttributeSet(
-                               new AAAttribute("urn:mace:dir:eduperson#eduPersonAffiliation", new Object[] { "member@example.edu" }));
+                               new AAAttribute("urn:mace:dir:attribute-def:eduPersonAffiliation", new Object[] { "member@example.edu" }));
 
                //Setup the engine
                parser.parse(new InputSource(new StringReader(rawArp)));
@@ -804,7 +804,7 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                                     <Value release=\"deny\">member@example.edu</Value>"
                                + "                             </Attribute>"
@@ -816,12 +816,12 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu", "employee@example.edu" }));
                AAAttributeSet releaseSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "faculty@example.edu", "employee@example.edu" }));
 
                //Setup the engine
@@ -852,10 +852,10 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <Value release=\"deny\">member@example.edu</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -866,12 +866,12 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu", "employee@example.edu" }));
                AAAttributeSet releaseSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "faculty@example.edu", "employee@example.edu" }));
 
                //Setup the engine
@@ -902,13 +902,13 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <Value release=\"deny\">member@example.edu</Value>"
                                + "                             </Attribute>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <Value release=\"deny\">faculty@example.edu</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -919,12 +919,12 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu", "employee@example.edu" }));
                AAAttributeSet releaseSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "employee@example.edu" }));
 
                //Setup the engine
@@ -955,7 +955,7 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <Value release=\"permit\">member@example.edu</Value>"
                                + "                                     <Value release=\"permit\">faculty@example.edu</Value>"
                                + "                             </Attribute>"
@@ -967,12 +967,12 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu", "employee@example.edu" }));
                AAAttributeSet releaseSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
 
                //Setup the engine
@@ -1003,10 +1003,10 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <Value release=\"permit\">member@example.edu</Value>"
                                + "                             </Attribute>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <Value release=\"permit\">faculty@example.edu</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1017,12 +1017,12 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu", "employee@example.edu" }));
                AAAttributeSet releaseSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
 
                //Setup the engine
@@ -1053,7 +1053,7 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"deny\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1064,7 +1064,7 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
 
                //Setup the engine
@@ -1095,10 +1095,10 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"deny\"/>"
                                + "                             </Attribute>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <Value release=\"permit\">member@example.edu</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1109,7 +1109,7 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
 
                //Setup the engine
@@ -1140,7 +1140,7 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"deny\"/>"
                                + "                                     <Value release=\"permit\">member@example.edu</Value>"
                                + "                             </Attribute>"
@@ -1152,7 +1152,7 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
 
                //Setup the engine
@@ -1184,7 +1184,7 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester>shar.example.edu</Requester>"
                                + "                                     <AnyResource />"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1195,12 +1195,12 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
                AAAttributeSet releaseSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
 
                //Setup the engine
@@ -1232,7 +1232,7 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester>shar.example.edu</Requester>"
                                + "                                     <AnyResource />"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1243,12 +1243,12 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
                AAAttributeSet releaseSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
 
                //Setup the engine
@@ -1280,7 +1280,7 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester>shar.example.edu</Requester>"
                                + "                                     <AnyResource />"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1291,7 +1291,7 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
 
                //Setup the engine
@@ -1323,7 +1323,7 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester>shar.example.edu</Requester>"
                                + "                                     <Resource>http://www.example.edu/</Resource>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1334,12 +1334,12 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
                AAAttributeSet releaseSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
 
                //Setup the engine
@@ -1371,7 +1371,7 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester>shar.example.edu</Requester>"
                                + "                                     <Resource>http://www.example.edu/</Resource>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1382,7 +1382,7 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
 
                //Setup the engine
@@ -1413,7 +1413,7 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget />"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1422,7 +1422,7 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester>shar1.example.edu</Requester>"
                                + "                                     <AnyResource />"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <Value release=\"deny\">faculty@example.edu</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1431,7 +1431,7 @@ public class ArpTests extends TestCase {
                                + "                                     <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:dir:eduperson#eduPersonPrincipalName\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonPrincipalName\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1443,10 +1443,10 @@ public class ArpTests extends TestCase {
                        new AAAttributeSet(
                                new AAAttribute[] {
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                               "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                                new Object[] { "member@example.edu", "faculty@example.edu" }),
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonPrincipalName",
+                                               "urn:mace:dir:attribute-def:eduPersonPrincipalName",
                                                new Object[] { "wassa@columbia.edu" })
                });
 
@@ -1454,10 +1454,10 @@ public class ArpTests extends TestCase {
                        new AAAttributeSet(
                                new AAAttribute[] {
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonPrincipalName",
+                                               "urn:mace:dir:attribute-def:eduPersonPrincipalName",
                                                new Object[] { "wassa@columbia.edu" }),
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                               "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                                new Object[] { "member@example.edu" })
                });
 
@@ -1489,10 +1489,10 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonPrincipalName\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonPrincipalName\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1504,10 +1504,10 @@ public class ArpTests extends TestCase {
                        new AAAttributeSet(
                                new AAAttribute[] {
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                               "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                                new Object[] { "member@example.edu", "faculty@example.edu" }),
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonPrincipalName",
+                                               "urn:mace:dir:attribute-def:eduPersonPrincipalName",
                                                new Object[] { "mehoehn@example.edu" })
                });
 
@@ -1515,10 +1515,10 @@ public class ArpTests extends TestCase {
                        new AAAttributeSet(
                                new AAAttribute[] {
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                               "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                                new Object[] { "member@example.edu", "faculty@example.edu" }),
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonPrincipalName",
+                                               "urn:mace:dir:attribute-def:eduPersonPrincipalName",
                                                new Object[] { "mehoehn@example.edu" })
                });
 
@@ -1550,7 +1550,7 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1561,12 +1561,12 @@ public class ArpTests extends TestCase {
                AAAttributeSet inputSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
                AAAttributeSet releaseSet =
                        new AAAttributeSet(
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                       "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                        new Object[] { "member@example.edu", "faculty@example.edu" }));
 
                //Setup the engine
@@ -1598,7 +1598,7 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <Value release=\"permit\">member@example.edu</Value>"
                                + "                             </Attribute>"
                                + "                             <Attribute name=\"urn:mace:inetOrgPerson:preferredLanguage\">"
@@ -1610,7 +1610,7 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester matchFunction=\"urn:mace:shibboleth:arp:matchFunction:regexMatch\">.*\\.example\\.edu</Requester>"
                                + "                                     <AnyResource />"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonPrincipalName\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonPrincipalName\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1619,10 +1619,10 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester>www.example.edu</Requester>"
                                + "                                     <Resource>http://www.example.edu/</Resource>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonEntitlement\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonEntitlement\">"
                                + "                                     <Value release=\"permit\">urn:example:contract:4657483</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1631,7 +1631,7 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester>www.external.com</Requester>"
                                + "                                     <Resource>http://www.external.com/</Resource>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonEntitlement\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonEntitlement\">"
                                + "                                     <Value release=\"permit\">urn:example:contract:113455</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1644,7 +1644,7 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonEntitlement\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonEntitlement\">"
                                + "                                     <Value release=\"deny\">urn:example:poorlyDressed</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1653,10 +1653,10 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester matchFunction=\"urn:mace:shibboleth:arp:matchFunction:regexMatch\">.*\\.example\\.edu</Requester>"
                                + "                                     <AnyResource />"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <Value release=\"deny\">faculty@example.edu</Value>"
                                + "                             </Attribute>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonEntitlement\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonEntitlement\">"
                                + "                                     <Value release=\"permit\">urn:example:lovesIceCream</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1669,17 +1669,17 @@ public class ArpTests extends TestCase {
                        new AAAttributeSet(
                                new AAAttribute[] {
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonEntitlement",
+                                               "urn:mace:dir:attribute-def:eduPersonEntitlement",
                                                new Object[] {
                                                        "urn:example:lovesIceCream",
                                                        "urn:example:poorlyDressed",
                                                        "urn:example:contract:113455",
                                                        "urn:example:contract:4657483" }),
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                               "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                                new Object[] { "member@example.edu", "faculty@example.edu", "employee@example.edu" }),
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonPrincipalName",
+                                               "urn:mace:dir:attribute-def:eduPersonPrincipalName",
                                                new Object[] { "wassa@example.edu" }),
                                        new AAAttribute("urn:mace:inetOrgPerson:preferredLanguage", new Object[] { "EO" })
                });
@@ -1688,13 +1688,13 @@ public class ArpTests extends TestCase {
                        new AAAttributeSet(
                                new AAAttribute[] {
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonEntitlement",
+                                               "urn:mace:dir:attribute-def:eduPersonEntitlement",
                                                new Object[] { "urn:example:lovesIceCream", "urn:example:contract:4657483" }),
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                               "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                                new Object[] { "member@example.edu", "employee@example.edu" }),
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonPrincipalName",
+                                               "urn:mace:dir:attribute-def:eduPersonPrincipalName",
                                                new Object[] { "wassa@example.edu" }),
                                        new AAAttribute("urn:mace:inetOrgPerson:preferredLanguage", new Object[] { "EO" })
                });
@@ -1735,7 +1735,7 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <Value release=\"permit\">member@example.edu</Value>"
                                + "                             </Attribute>"
                                + "                             <Attribute name=\"urn:mace:inetOrgPerson:preferredLanguage\">"
@@ -1747,7 +1747,7 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester matchFunction=\"urn:mace:shibboleth:arp:matchFunction:regexMatch\">.*\\.example\\.edu</Requester>"
                                + "                                     <AnyResource />"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonPrincipalName\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonPrincipalName\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1756,10 +1756,10 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester>www.example.edu</Requester>"
                                + "                                     <Resource>http://www.example.edu/</Resource>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <AnyValue release=\"permit\"/>"
                                + "                             </Attribute>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonEntitlement\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonEntitlement\">"
                                + "                                     <Value release=\"permit\">urn:example:contract:4657483</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1768,7 +1768,7 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester>www.external.com</Requester>"
                                + "                                     <Resource>http://www.external.com/</Resource>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonEntitlement\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonEntitlement\">"
                                + "                                     <Value release=\"permit\">urn:example:contract:113455</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1781,7 +1781,7 @@ public class ArpTests extends TestCase {
                                + "                             <Target>"
                                + "                                     <AnyTarget/>"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonEntitlement\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonEntitlement\">"
                                + "                                     <Value release=\"deny\">urn:example:poorlyDressed</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1790,10 +1790,10 @@ public class ArpTests extends TestCase {
                                + "                                     <Requester matchFunction=\"urn:mace:shibboleth:arp:matchFunction:regexMatch\">.*\\.example\\.edu</Requester>"
                                + "                                     <AnyResource />"
                                + "                             </Target>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonAffiliation\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonAffiliation\">"
                                + "                                     <Value release=\"deny\">faculty@example.edu</Value>"
                                + "                             </Attribute>"
-                               + "                             <Attribute name=\"urn:mace:dir:eduperson#eduPersonEntitlement\">"
+                               + "                             <Attribute name=\"urn:mace:dir:attribute-def:eduPersonEntitlement\">"
                                + "                                     <Value release=\"permit\">urn:example:lovesIceCream</Value>"
                                + "                             </Attribute>"
                                + "                     </Rule>"
@@ -1806,17 +1806,17 @@ public class ArpTests extends TestCase {
                        new AAAttributeSet(
                                new AAAttribute[] {
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonEntitlement",
+                                               "urn:mace:dir:attribute-def:eduPersonEntitlement",
                                                new Object[] {
                                                        "urn:example:lovesIceCream",
                                                        "urn:example:poorlyDressed",
                                                        "urn:example:contract:113455",
                                                        "urn:example:contract:4657483" }),
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                               "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                                new Object[] { "member@example.edu", "faculty@example.edu", "employee@example.edu" }),
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonPrincipalName",
+                                               "urn:mace:dir:attribute-def:eduPersonPrincipalName",
                                                new Object[] { "wassa@example.edu" }),
                                        new AAAttribute("urn:mace:inetOrgPerson:preferredLanguage", new Object[] { "EO" })
                });
@@ -1825,10 +1825,10 @@ public class ArpTests extends TestCase {
                        new AAAttributeSet(
                                new AAAttribute[] {
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonEntitlement",
+                                               "urn:mace:dir:attribute-def:eduPersonEntitlement",
                                                new Object[] { "urn:example:contract:113455" }),
                                        new AAAttribute(
-                                               "urn:mace:dir:eduperson#eduPersonAffiliation",
+                                               "urn:mace:dir:attribute-def:eduPersonAffiliation",
                                                new Object[] { "member@example.edu" }),
                                        new AAAttribute("urn:mace:inetOrgPerson:preferredLanguage", new Object[] { "EO" })
                });

diff --git a/tests/edu/internet2/middleware/shibboleth/aa/attrresolv/ResolverTests.java b/tests/edu/internet2/middleware/shibboleth/aa/attrresolv/ResolverTests.java
index 50a9db1..ad8a9e6 100644 (file)
--- a/tests/edu/internet2/middleware/shibboleth/aa/attrresolv/ResolverTests.java
+++ b/tests/edu/internet2/middleware/shibboleth/aa/attrresolv/ResolverTests.java
@@ -107,14 +107,14 @@ public class ResolverTests extends TestCase {
                        AAAttributeSet inputAttributes =
                                new AAAttributeSet(
                                        new AAAttribute[] {
-                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonNickName"),
-                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonEntitlement")});
+                                               new AAAttribute("urn:mace:dir:attribute-def:eduPersonNickName"),
+                                               new AAAttribute("urn:mace:dir:attribute-def:eduPersonEntitlement")});
 
                        AAAttributeSet outputAttributes =
                                new AAAttributeSet(
                                        new AAAttribute[] {
                                                 new AAAttribute(
-                                                       "urn:mace:dir:eduperson#eduPersonEntitlement",
+                                                       "urn:mace:dir:attribute-def:eduPersonEntitlement",
                                                        new Object[] { "urn:mace:example.edu:exampleEntitlement" })
                                                });
 
@@ -145,13 +145,13 @@ public class ResolverTests extends TestCase {
                        AAAttributeSet inputAttributes =
                                new AAAttributeSet(
                                        new AAAttribute[] {
-                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonPrincipalName"),
+                                               new AAAttribute("urn:mace:dir:attribute-def:eduPersonPrincipalName"),
                                                new AAAttribute("foo")});
 
                        AAAttributeSet outputAttributes = new AAAttributeSet(new AAAttribute[] {
                                //Attribute should have scope appended to connector output
                                new AAAttribute(
-                                       "urn:mace:dir:eduperson#eduPersonPrincipalName",
+                                       "urn:mace:dir:attribute-def:eduPersonPrincipalName",
                                        new Object[] { "mytestuser@example.edu" },
                                        new ScopedStringValueHandler("example.edu")),
                                //Attribute should retain scope from connector output
@@ -288,20 +288,20 @@ public class ResolverTests extends TestCase {
                        AAAttributeSet inputAttributes =
                                new AAAttributeSet(
                                        new AAAttribute[] {
-                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonPrincipalName"),
-                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonAffiliation"),
-                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonEntitlement")});
+                                               new AAAttribute("urn:mace:dir:attribute-def:eduPersonPrincipalName"),
+                                               new AAAttribute("urn:mace:dir:attribute-def:eduPersonAffiliation"),
+                                               new AAAttribute("urn:mace:dir:attribute-def:eduPersonEntitlement")});
 
                        AAAttributeSet outputAttributes =
                                new AAAttributeSet(
                                        new AAAttribute[] {
                                                new AAAttribute(
-                                                       "urn:mace:dir:eduperson#eduPersonPrincipalName",
+                                                       "urn:mace:dir:attribute-def:eduPersonPrincipalName",
                                                        new Object[] { "mytestuser@example.edu" },
                                                        new ScopedStringValueHandler("example.edu")),
-                                               new AAAttribute("urn:mace:dir:eduperson#eduPersonAffiliation", new Object[] { "member" }),
+                                               new AAAttribute("urn:mace:dir:attribute-def:eduPersonAffiliation", new Object[] { "member" }),
                                                new AAAttribute(
-                                                       "urn:mace:dir:eduperson#eduPersonEntitlement",
+                                                       "urn:mace:dir:attribute-def:eduPersonEntitlement",
                                                        new Object[] { "urn:mace:example.edu:exampleEntitlement" })
                                                });
 
@@ -331,13 +331,13 @@ public class ResolverTests extends TestCase {
 
                        AAAttributeSet inputAttributes =
                                new AAAttributeSet(
-                                       new AAAttribute[] { new AAAttribute("urn:mace:dir:eduperson#eduPersonScopedAffiliation")});
+                                       new AAAttribute[] { new AAAttribute("urn:mace:dir:attribute-def:eduPersonScopedAffiliation")});
 
                        AAAttributeSet outputAttributes =
                                new AAAttributeSet(
                                        new AAAttribute[] {
                                                 new AAAttribute(
-                                                       "urn:mace:dir:eduperson#eduPersonScopedAffiliation",
+                                                       "urn:mace:dir:attribute-def:eduPersonScopedAffiliation",
                                                        new Object[] { "member@example.edu" },
                                                        new ScopedStringValueHandler("example.edu"))
                                                });
@@ -368,7 +368,7 @@ public class ResolverTests extends TestCase {
 
                        AAAttributeSet inputAttributes =
                                new AAAttributeSet(
-                                       new AAAttribute[] { new AAAttribute("urn:mace:dir:eduperson#eduPersonScopedAffiliation")});
+                                       new AAAttribute[] { new AAAttribute("urn:mace:dir:attribute-def:eduPersonScopedAffiliation")});
 
                        AAAttributeSet outputAttributes = new AAAttributeSet();
 
@@ -398,7 +398,7 @@ public class ResolverTests extends TestCase {
 
                        AAAttributeSet inputAttributes =
                                new AAAttributeSet(
-                                       new AAAttribute[] { new AAAttribute("urn:mace:dir:eduperson#eduPersonScopedAffiliation")});
+                                       new AAAttribute[] { new AAAttribute("urn:mace:dir:attribute-def:eduPersonScopedAffiliation")});
 
                        AAAttributeSet outputAttributes = new AAAttributeSet();