[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src/test: java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Feb 21 09:54:55 2014
New Revision: 5434

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5434&view=rev
Log:
Add a trabsient attribute and transient principal connectors to top level resolver

Added:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java?rev=5434&r1=5433&r2=5434&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java Fri Feb 21 09:54:55 2014
@@ -134,7 +134,7 @@
         Map<String, IdPAttribute> resolvedAttributes = resolutionContext.getResolvedIdPAttributes();
         log.debug("resolved attributes '{}'", resolvedAttributes);
 
-        Assert.assertEquals(resolvedAttributes.size(), 12);
+        Assert.assertEquals(resolvedAttributes.size(), 13);
 
         // Static
         IdPAttribute attribute = resolvedAttributes.get("eduPersonAffiliation");

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml?rev=5434&r1=5433&r2=5434&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml Fri Feb 21 09:54:55 2014
@@ -276,12 +276,11 @@
     -->
 
     <!-- Name Identifier related attributes -->
-    <!--
+
     <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>
-    -->
 
     <!-- ========================================== -->
     <!--      Data Connectors                       -->
@@ -340,6 +339,7 @@
     <!--      Principal Connectors                  -->
     <!-- ========================================== -->
 
-    <resolver:PrincipalConnector xsi:type="pc:Direct" id="shibTransient" nameIDFormat="urn:mace:shibboleth:1.0:nameIdentifier"/>
+    <resolver:PrincipalConnector xsi:type="pc:Transient" id="shibTransient" nameIDFormat="https://www.exmaple.org/bogus/name/id"/>
+    <resolver:PrincipalConnector xsi:type="pc:Direct" id="shibDirect" nameIDFormat="urn:mace:shibboleth:1.0:nameIdentifier"/>
 
 </resolver:AttributeResolver>

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml?rev=5434&r1=5433&r2=5434&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml Fri Feb 21 09:54:55 2014
@@ -23,6 +23,7 @@
         <property name="serviceConfigurations">
             <util:list>
             	<value>net/shibboleth/idp/attribute/resolver/spring/velocity.xml</value>
+                <value>net/shibboleth/idp/attribute/resolver/spring/storageService.xml</value>
                 <value>net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml</value>
             </util:list>
         </property>