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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar 20 23:06:57 2014
New Revision: 5621

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5621&view=rev
Log:
Indirect into the first state of the SAML child flows.

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

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml?rev=5621&r1=5620&r2=5621&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml Thu Mar 20 23:06:57 2014
@@ -41,11 +41,11 @@
     
     <action-state id="PopulateBindingAndEndpointContexts">
         <evaluate expression="PopulateBindingAndEndpointContexts" />
-        <transition on="proceed" to="InitializeAuthenticationContext" />
+        <transition on="proceed" to="DoProfileWork" />
     </action-state>
     
     <!--
-    The meat will be inserted here by defining InitializeAuthenticationContext and transitioning from
+    The meat will be inserted here by defining DoProfileWork and transitioning from
     there to profile activity and eventually to the final stages below.
     -->
 

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml?rev=5621&r1=5620&r2=5621&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml Thu Mar 20 23:06:57 2014
@@ -1,4 +1,5 @@
-<flow xmlns="http://www.springframework.org/schema/webflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<flow xmlns="http://www.springframework.org/schema/webflow"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
     abstract="true" parent="SAML.Abstract">
 
@@ -11,7 +12,12 @@
         <transition on="proceed" to="DecodeMessage" />
     </action-state>
 
-    <!-- This picks up from the parent flow with the authentication step. -->
+    <!-- This picks up from the parent flow with the transition step. -->
+    
+    <action-state id="DoProfileWork">
+        <evaluate expression="true" />
+        <transition on="#{true}" to="InitializeAuthenticationContext" />
+    </action-state>
 
     <action-state id="InitializeAuthenticationContext">
         <evaluate expression="InitializeAuthenticationContext" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml?rev=5621&r1=5620&r2=5621&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml Thu Mar 20 23:06:57 2014
@@ -10,7 +10,12 @@
         <transition on="proceed" to="DecodeMessage" />
     </action-state>
     
-    <!-- This picks up from the parent flow with authentication. -->
+    <!-- This picks up from the parent flow with the transition step. -->
+    
+    <action-state id="DoProfileWork">
+        <evaluate expression="true" />
+        <transition on="#{true}" to="InitializeAuthenticationContext" />
+    </action-state>
         
     <action-state id="InitializeAuthenticationContext">
         <evaluate expression="InitializeAuthenticationContext" />