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

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Jan 31 12:57:52 2014
New Revision: 5287

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5287&view=rev
Log:
IDP-219 : Add AddResponseShell action to SAML 1 flow.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml

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=5287&r1=5286&r2=5287&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 Fri Jan 31 12:57:52 2014
@@ -122,10 +122,6 @@
         c:service-ref="shibboleth.AttributeFilterService" />
 
     <bean
-        id="AddResponseShell"
-        class="net.shibboleth.idp.saml.impl.profile.saml1.AddResponseShell" />
-
-    <bean
         id="UpdateSessionWithSPSession"
         class="net.shibboleth.idp.session.impl.UpdateSessionWithSPSession"
         scope="prototype"
@@ -136,6 +132,10 @@
     <bean
         id="InitializeOutboundMessageContext"
         class="net.shibboleth.idp.saml.impl.profile.saml1.InitializeOutboundMessageContext" />
+
+    <bean
+        id="AddResponseShell"
+        class="net.shibboleth.idp.saml.impl.profile.saml1.AddResponseShell" />
 
     <bean
         id="RecordResponseComplete"

Modified: trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml?rev=5287&r1=5286&r2=5287&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-flow.xml Fri Jan 31 12:57:52 2014
@@ -67,13 +67,6 @@
         <transition on="proceed" to="UpdateSessionWithSPSession" />
     </action-state>
     
-    <!-- TODO 
-    <action-state id="AddResponseShell">
-        <evaluate expression="AddResponseShell" />
-        <transition on="proceed" to="RecordResponseComplete" />
-    </action-state>
-    -->
-    
     <action-state id="UpdateSessionWithSPSession">
         <evaluate expression="UpdateSessionWithSPSession" />
         <transition on="proceed" to="InitializeOutboundMessageContext"/>
@@ -83,6 +76,11 @@
    
     <action-state id="InitializeOutboundMessageContext">
         <evaluate expression="InitializeOutboundMessageContext" />
+        <transition on="proceed" to="AddResponseShell" />
+    </action-state>
+    
+    <action-state id="AddResponseShell">
+        <evaluate expression="AddResponseShell" />
         <transition on="proceed" to="RecordResponseComplete" />
     </action-state>