[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml idp-...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb 26 21:49:30 2014
New Revision: 5484

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5484&view=rev
Log:
Move response creation action down to OpenSAML

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddResponseShell.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddResponseShellTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponseTest.java

Modified: trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml?rev=5484&r1=5483&r2=5484&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml Wed Feb 26 21:49:30 2014
@@ -191,8 +191,12 @@
 
     <bean
         id="AddResponseShell"
-        class="net.shibboleth.idp.saml.impl.profile.saml1.AddResponseShell"
-        scope="prototype" />
+        class="org.opensaml.saml.saml1.profile.impl.AddResponseShell"
+        scope="prototype">
+        <property name="identifierGeneratorLookupStrategy">
+            <bean class="net.shibboleth.idp.saml.impl.profile.config.navigate.IdentifierGenerationStrategyLookupFunction" />
+        </property>
+    </bean>
 
     <bean
         id="AddInResponseToToResponse"

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponseTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponseTest.java?rev=5484&r1=5483&r2=5484&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponseTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponseTest.java Wed Feb 26 21:49:30 2014
@@ -27,6 +27,7 @@
 import net.shibboleth.idp.profile.config.SecurityConfiguration;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
+import net.shibboleth.idp.saml.impl.profile.config.navigate.IdentifierGenerationStrategyLookupFunction;
 import net.shibboleth.idp.saml.profile.config.saml1.BrowserSSOProfileConfiguration;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
@@ -35,6 +36,7 @@
 import org.opensaml.saml.saml1.core.Response;
 import org.opensaml.saml.saml1.core.Status;
 import org.opensaml.saml.saml1.core.StatusCode;
+import org.opensaml.saml.saml1.profile.impl.AddResponseShell;
 import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceResolvable;
 import org.springframework.context.NoSuchMessageException;
@@ -69,6 +71,7 @@
 
         addResponse = new AddResponseShell();
         addResponse.setId("test");
+        addResponse.setIdentifierGeneratorLookupStrategy(new IdentifierGenerationStrategyLookupFunction());
         addResponse.initialize();
         addResponse.execute(prc);