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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jul 17 19:28:37 2014
New Revision: 6304

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6304&view=rev
Log:
IDP-415: Action to populate ECP context.

Modified:
    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/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml?rev=6304&r1=6303&r2=6304&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml Thu Jul 17 19:28:37 2014
@@ -27,6 +27,18 @@
         
     <bean id="VerifyChannelBindings"
         class="org.opensaml.saml.common.profile.impl.VerifyChannelBindings" scope="prototype" />
+    
+    <bean id="PopulateECPContext"
+            class="org.opensaml.saml.saml2.profile.impl.PopulateECPContext" scope="prototype">
+        <property name="activationCondition">
+            <bean class="org.opensaml.profile.logic.ProfileIdPredicate">
+                <constructor-arg>
+                    <util:constant
+                        static-field="net.shibboleth.idp.saml.saml2.profile.config.ECPProfileConfiguration.PROFILE_ID"/>
+                </constructor-arg>
+            </bean>
+        </property>
+    </bean>
     
     <bean id="ProcessRequestedAuthnContext"
         class="net.shibboleth.idp.saml.saml2.profile.impl.ProcessRequestedAuthnContext" scope="prototype" />

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=6304&r1=6303&r2=6304&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 Jul 17 19:28:37 2014
@@ -14,6 +14,7 @@
 
     <action-state id="DoProfileWork">
         <evaluate expression="VerifyChannelBindings" />
+        <evaluate expression="PopulateECPContext" />
         <evaluate expression="InitializeAuthenticationContext" />
         <evaluate expression="InitializeRequestedPrincipalContext" />
         <evaluate expression="ProcessRequestedAuthnContext" />