[java-identity-provider COMMIT] /trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/ma...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Aug  6 11:14:44 2013
New Revision: 4668

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4668&view=rev
Log:
IDP-264 Some minor changes as a result of conversations in shib-dev. Most notable are
 - use a default setting for brevity in the beans file
 - The id is no longer the primary attribute id.  Rather all attribute Ids are now contained in the array formaly known as aliases and now known as attributeIds

Modified:
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/mapper/attributesMapper.xml

Modified: trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/mapper/attributesMapper.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/mapper/attributesMapper.xml?rev=4668&r1=4667&r2=4668&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/mapper/attributesMapper.xml (original)
+++ trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/mapper/attributesMapper.xml Tue Aug  6 11:14:44 2013
@@ -2,110 +2,104 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-	
-	
-	<!--  This is what we are trying to reverse map (note bi-directional aliasing, just to confuse things.  And me.
-	
+
+    <!--  This is what we are trying to reverse map (note bi-directional aliasing, just to confuse things.  And me.
+    
             <resolver:AttributeDefinition xsi:type="ad:Simple" id="eduPersonAssurance" sourceAttributeID="eduPersonAssurance">
                 <resolver:Dependency ref="myLDAP" />
                 <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
                 <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" />
-                <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="http://example.org/name/for/Attribute" friendlyName="otherPersonAssurance" />
+                <resolver:AttributeEncoder xsi:type="enc:SAML2String" nameFormat="http://example.org/Format" name="http://example.org/name/for/Attribute" friendlyName="otherSAMLNamee" />
             </resolver:AttributeDefinition>
 
-            <resolver:AttributeDefinition xsi:type="ad:Simple" id="eduPersonAssurance" sourceAttributeID="otherPersonAssurance">
+            <resolver:AttributeDefinition xsi:type="ad:Simple" id="otherPersonAssurance" sourceAttributeID="otherPersonAssurance">
                 <resolver:Dependency ref="myLDAP" />
                 <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
                 <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" />
             </resolver:AttributeDefinition>
                 
-		    <resolver:AttributeDefinition xsi:type="ad:Scoped" id="eduPersonScopedAffiliation" scope="example.org" 
-		                                  sourceAttributeID="eduPersonAffiliation">
-		        <resolver:Dependency ref="myLDAP" />
-		        <resolver:AttributeEncoder xsi:type="enc:SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" />
-		        <resolver:AttributeEncoder xsi:type="enc:SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="eduPersonScopedAffiliation" 
-		               scopeDelimiter='#'/>
-		    </resolver:AttributeDefinition>
-		    
-		    <resolver:AttributeDefinition xsi:type="ad:SAML2NameID" id="eduPersonTargetedID" 
-		                                  nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" sourceAttributeID="computedID">
-		        <resolver:Dependency ref="computedID" />
-		        <resolver:AttributeEncoder xsi:type="enc:SAML1XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" />
-		        <resolver:AttributeEncoder xsi:type="enc:SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="eduPersonTargetedID" />
-		    </resolver:AttributeDefinition>	
-	
-	
-	      But note that this is unmappable (no source name)
-	      
-		    <resolver:AttributeDefinition id="transientId" xsi:type="ad:TransientId">
-		        <resolver:AttributeEncoder xsi:type="enc:SAML1StringNameIdentifier" nameFormat="urn:mace:shibboleth:1.0:nameIdentifier"/>
-		        <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" nameFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient"/>
-		    </resolver:AttributeDefinition>
-	      
-	
-	 -->

[... 131 lines stripped ...]