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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 18 14:19:06 2014
New Revision: 7162

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7162&view=rev
Log:
IDP-546 - Clean up some comments, add some attributes and adjust some names and defs.

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

Modified: trunk/idp-conf/src/main/resources/conf/attribute-filter.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-filter.xml?rev=7162&r1=7161&r2=7162&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-filter.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-filter.xml Thu Dec 18 14:19:06 2014
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
     This file is an EXAMPLE policy file.  While the policy presented in this 
-    example file is functional, it isn't very interesting.
+    example file is illustrative of some simple cases, it relies on the names of
+    non-existent example services and the example attributes demonstrated in the
+    default attribute-resolver.xml file.
     
-    Deployers should refer to the documentation for a complete list of components and their options.
+    Deployers should refer to the documentation for a complete list of components
+    and their options.
 -->
 <afp:AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
         xmlns:afp="urn:mace:shibboleth:2.0:afp"
@@ -26,23 +29,21 @@
             <afp:PermitValueRule xsi:type="basic:ANY" />
         </afp:AttributeRule>
 
-        <afp:AttributeRule attributeID="email">
+        <afp:AttributeRule attributeID="mail">
             <afp:PermitValueRule xsi:type="basic:ANY" />
         </afp:AttributeRule>
-
     </afp:AttributeFilterPolicy>
 
     <!-- Release eduPersonAffiliation to two specific SPs. -->
     <afp:AttributeFilterPolicy id="example2">
         <afp:PolicyRequirementRule xsi:type="basic:OR">
             <basic:Rule xsi:type="basic:AttributeRequesterString" value="https://sp.example.org" />
-            <basic:Rule xsi:type="basic:AttributeRequesterString" value="https://another.example.org" />
+            <basic:Rule xsi:type="basic:AttributeRequesterString" value="https://another.example.org/shibboleth" />
         </afp:PolicyRequirementRule>
 
         <afp:AttributeRule attributeID="eduPersonScopedAffiliation">
             <afp:PermitValueRule xsi:type="basic:ANY" />
         </afp:AttributeRule>
-
     </afp:AttributeFilterPolicy>
 
 </afp:AttributeFilterPolicyGroup>

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=7162&r1=7161&r2=7162&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 Thu Dec 18 14:19:06 2014
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-    This file is an EXAMPLE configuration file.  While the configuration presented in this 
-    example file is semi-functional, it isn't very interesting.  However, there are lots of
+    This file is an EXAMPLE configuration file containing lots of commented
     example attributes, encoders, and a couple of example data connectors.
     
-    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.
+    Not all attribute definitions or data connectors are demonstrated, but
+    a variety of LDAP attributes, some common to Shibboleth deployments and
+    many not, are included.
+    
+    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"
@@ -31,122 +33,116 @@
     <!--
     <resolver:AttributeDefinition xsi:type="ad:Simple" id="uid" sourceAttributeID="uid">
         <resolver:Dependency ref="myLDAP" />
-        <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:uid" />
-        <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
-    </resolver:AttributeDefinition>
-
-    <resolver:AttributeDefinition xsi:type="ad:Simple" id="email" sourceAttributeID="mail">
-        <resolver:Dependency ref="myLDAP" />
-        <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:mail" />

[... 481 lines stripped ...]