[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 Apr  3 11:13:53 2014
New Revision: 5689

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5689&view=rev
Log:
OSJ-70 - wire in encryption parameter action, disable for now.

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

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=5689&r1=5688&r2=5689&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 Apr  3 11:13:53 2014
@@ -120,6 +120,14 @@
                 c:f-ref="shibboleth.MessageContextLookup.Outbound" />
         </property>
     </bean>
+    
+    <!--
+    TODO: activate once resolver is available
+    <bean id="PopulateEncryptionParameters"
+            class="net.shibboleth.idp.saml.impl.profile.saml2.PopulateEncryptionParameters" scope="prototype"
+            p:configurationLookupStrategy-ref="shibboleth.EncryptionConfigurationLookup"
+            p:encryptionParametersResolver-ref="shibboleth.EncryptionParametersResolver" />
+    -->
 
     <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=5689&r1=5688&r2=5689&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 Apr  3 11:13:53 2014
@@ -86,12 +86,16 @@
         <transition on="proceed" to="PopulateAssertionSignatureSigningParameters" />
     </action-state>
     
+    <!-- TODO: route to encryption parameter action once bean is live -->
     <action-state id="PopulateAssertionSignatureSigningParameters">
         <evaluate expression="PopulateAssertionSignatureSigningParameters" />
         <transition on="proceed" to="DoProfileWork" />
     </action-state>
-    
-    <!-- TODO: action to check encryption options and set EncryptionParameters on RP context. -->
+
+    <action-state id="PopulateEncryptionParameters">
+        <evaluate expression="PopulateEncryptionParameters" />
+        <transition on="proceed" to="DoProfileWork" />
+    </action-state>
     
     <!--
     The meat will be inserted here by defining DoProfileWork and transitioning from