Updated attribute URIs.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@488 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/configs/AAP.xml b/configs/AAP.xml
index 7327f41..73be956 100644 (file)
--- a/configs/AAP.xml
+++ b/configs/AAP.xml
@@ -11,7 +11,7 @@
        -->
        
        <!-- Filtering rule to limit values to eduPerson-defined enumeration. -->
-       <AttributeRule Name="urn:mace:eduPerson:1.0:eduPersonScopedAffiliation">
+       <AttributeRule Name="urn:mace:dir:eduperson#eduPersonScopedAffiliation">
         <AnySite>
             <Value>member</Value>
             <Value>faculty</Value>
@@ -24,14 +24,14 @@
        </AttributeRule>
 
        <!-- Basic rule to pass through any value. -->
-    <AttributeRule Name="urn:mace:eduPerson:1.0:eduPersonPrincipalName">
+    <AttributeRule Name="urn:mace:dir:eduperson#eduPersonPrincipalName">
         <AnySite>
             <AnyValue/>
         </AnySite>
     </AttributeRule>
 
        <!-- Entitlements tend to be filtered per-site. -->
-       <AttributeRule Name="urn:mace:eduPerson:1.0:eduPersonEntitlement">
+       <AttributeRule Name="urn:mace:dir:eduperson#eduPersonEntitlement">
 
                <!--
                Optional site rule that applies to any site

diff --git a/configs/apache.config b/configs/apache.config
index f60e037..6e728e9 100644 (file)
--- a/configs/apache.config
+++ b/configs/apache.config
@@ -48,9 +48,9 @@ SHIREURL /shibboleth/SHIRE
 # and is automatically checked by a "require user" rule.
 # The parameter syntax is <attribute-uri> <HTTP-header> [<alias>]
 #
-ShibMapAttribute urn:mace:eduPerson:1.0:eduPersonPrincipalName REMOTE_USER
-ShibMapAttribute urn:mace:eduPerson:1.0:eduPersonScopedAffiliation Shib-EP-Affiliation affiliation
-ShibMapAttribute urn:mace:eduPerson:1.0:eduPersonEntitlement Shib-EP-Entitlement entitlement
+ShibMapAttribute urn:mace:dir:eduperson#eduPersonPrincipalName REMOTE_USER
+ShibMapAttribute urn:mace:dir:eduperson#eduPersonScopedAffiliation Shib-EP-Affiliation affiliation
+ShibMapAttribute urn:mace:dir:eduperson#eduPersonEntitlement Shib-EP-Entitlement entitlement
 
 #
 # Configure a test directory

diff --git a/configs/shibboleth.ini b/configs/shibboleth.ini
index 6a764f3..1b05a9c 100644 (file)
--- a/configs/shibboleth.ini
+++ b/configs/shibboleth.ini
@@ -55,9 +55,9 @@ edu.internet2.middleware.shibboleth.metadata.XML=/opt/shibboleth/etc/shibboleth/
 edu.internet2.middleware.shibboleth.trust.XML=/opt/shibboleth/etc/shibboleth/trust.xml
 
 [attributes]
-urn:mace:eduPerson:1.0:eduPersonPrincipalName=scoped
-urn:mace:eduPerson:1.0:eduPersonScopedAffiliation=scoped
-urn:mace:eduPerson:1.0:eduPersonEntitlement=simple
+urn:mace:dir:eduperson#eduPersonPrincipalName=scoped
+urn:mace:dir:eduperson#eduPersonScopedAffiliation=scoped
+urn:mace:dir:eduperson#eduPersonEntitlement=simple
 
 [policies]
 InCommonPilot=urn:mace:incommon:pilot