[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: attribute-resolver-full.xml attribute-res...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Sep 26 05:14:15 2014
New Revision: 6588

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6588&view=rev
Log:
IDP-469 Port the "full" attribute resolver to V3.  Add the idp.scope property and clean up the comments at the top of the minimal attribute-resolver.

Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml?rev=6588&r1=6587&r2=6588&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml Fri Sep 26 05:14:15 2014
@@ -4,20 +4,24 @@
     example file is functional, it isn't very interesting.  However, there are lots of example
     attributes, encoders, and a couple example data connectors.
     
-    Not all attribute definitions, data connectors, or principal connectors are demonstrated.
+    Not all attribute definitions, or data connectors are demonstrated.
     Deployers should refer to the Shibboleth 2 documentation for a complete list of components 
     and their options.
 -->
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" 
-                            xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-                            xmlns:sec="urn:mace:shibboleth:2.0:security" 
-                            xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver classpath:/schema/shibboleth-2.0-attribute-resolver.xsd
-                                               urn:mace:shibboleth:2.0:resolver:pc classpath:/schema/shibboleth-2.0-attribute-resolver-pc.xsd
-                                               urn:mace:shibboleth:2.0:resolver:ad classpath:/schema/shibboleth-2.0-attribute-resolver-ad.xsd
-                                               urn:mace:shibboleth:2.0:resolver:dc classpath:/schema/shibboleth-2.0-attribute-resolver-dc.xsd
-                                               urn:mace:shibboleth:2.0:attribute:encoder classpath:/schema/shibboleth-2.0-attribute-encoder.xsd
-                                               urn:mace:shibboleth:2.0:security classpath:/schema/shibboleth-2.0-security.xsd">
+<resolver:AttributeResolver
+        xmlns:resolver="urn:mace:shibboleth:2.0:resolver" 
+        xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
+        xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" 
+        xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
+        xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
+        xmlns:sec="urn:mace:shibboleth:2.0:security"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    	xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
+                            urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
+                            urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
+                            urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
+                            urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
+                            urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
 
     <!-- ========================================== -->
     <!--      Attribute Definitions                 -->
@@ -229,13 +233,13 @@
         <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" friendlyName="eduPersonPrimaryOrgUnitDN" />
     </resolver:AttributeDefinition>
 
-    <resolver:AttributeDefinition xsi:type="ad:Scoped" id="eduPersonPrincipalName" scope="$IDP_SCOPE$" sourceAttributeID="uid">
+    <resolver:AttributeDefinition xsi:type="ad:Scoped" id="eduPersonPrincipalName" scope="%{idp.scope}" sourceAttributeID="uid">
         <resolver:Dependency ref="myLDAP" />
         <resolver:AttributeEncoder xsi:type="enc:SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonPrincipalName" />
         <resolver:AttributeEncoder xsi:type="enc:SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" friendlyName="eduPersonPrincipalName" />
     </resolver:AttributeDefinition>
 

[... 98 lines stripped ...]