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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar 20 22:05:59 2014
New Revision: 5620

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5620&view=rev
Log:
Move endpoint/binding action into SAML parent flow.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    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-beans.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-beans.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-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=5620&r1=5619&r2=5620&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml Thu Mar 20 22:05:59 2014
@@ -48,6 +48,11 @@
 
     <bean id="InitializeOutboundMessageContext"
         class="net.shibboleth.idp.saml.impl.profile.InitializeOutboundMessageContext" scope="prototype" />
+
+    <bean id="PopulateBindingAndEndpointContexts"
+        class="net.shibboleth.idp.saml.impl.profile.PopulateBindingAndEndpointContexts" scope="prototype"
+        p:endpointResolver-ref="shibboleth.EndpointResolver"
+        p:bindings-ref="shibboleth.OutgoingBindings" />
 
     <bean id="InitializeAuthenticationContext"
         class="net.shibboleth.idp.saml.impl.profile.InitializeAuthenticationContext" scope="prototype" />

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=5620&r1=5619&r2=5620&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 22:05:59 2014
@@ -39,8 +39,13 @@
         <transition on="proceed" to="PopulateBindingAndEndpointContexts" />
     </action-state>
     
+    <action-state id="PopulateBindingAndEndpointContexts">
+        <evaluate expression="PopulateBindingAndEndpointContexts" />
+        <transition on="proceed" to="InitializeAuthenticationContext" />
+    </action-state>
+    
     <!--
-    The meat will be inserted here by defining PopulateBindingAndEndpointContexts and transitioning from
+    The meat will be inserted here by defining InitializeAuthenticationContext 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-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml?rev=5620&r1=5619&r2=5620&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml Thu Mar 20 22:05:59 2014
@@ -66,10 +66,7 @@
         p:detailedErrors="true"
         p:profileConfigurations-ref="SAML1BrowserSSOProfileConfiguration" />
 
-    <bean id="PopulateBindingAndEndpointContexts"
-        class="net.shibboleth.idp.saml.impl.profile.PopulateBindingAndEndpointContexts" scope="prototype"
-        p:endpointResolver-ref="shibboleth.EndpointResolver"
-        p:bindings-ref="shibboleth.OutgoingSAML1SSOBindings" />
+    <alias name="shibboleth.OutgoingSAML1SSOBindings" alias="shibboleth.OutgoingBindings"/>
 
     <bean id="AddResponseShell" class="org.opensaml.saml.saml1.profile.impl.AddResponseShell" scope="prototype">
         <property name="identifierGeneratorLookupStrategy">

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=5620&r1=5619&r2=5620&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 22:05:59 2014
@@ -11,14 +11,7 @@
         <transition on="proceed" to="DecodeMessage" />
     </action-state>
 
-    <!-- This picks up from the parent flow with endpoint validation. -->
-
-    <action-state id="PopulateBindingAndEndpointContexts">

[... 57 lines stripped ...]