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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Feb 22 20:02:04 2014
New Revision: 5455

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5455&view=rev
Log:
IDP-219 - rework message encoding to use OpenSAML action, move Spring lookup to a factory

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/SpringAwareMessageEncoderFactory.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.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=5455&r1=5454&r2=5455&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 Sat Feb 22 20:02:04 2014
@@ -89,9 +89,12 @@
         </property>
     </bean>
 
-    <!-- This is used with the "encoder selected via lookup component" style. -->
-    <bean id="EncodeMessage" class="idp.EncodeSAMLMessageFromBindingURI" scope="prototype"
-        p:bindings-ref="shibboleth.OutgoingSAML1SSOBindings" />
+    <bean id="EncodeMessage" class="org.opensaml.profile.action.impl.EncodeMessage" scope="prototype">
+        <property name="messageEncoderFactory">
+            <bean class="net.shibboleth.idp.saml.impl.profile.SpringAwareMessageEncoderFactory"
+                p:bindings-ref="shibboleth.OutgoingSAML1SSOBindings" />
+        </property>
+    </bean>
 
     <bean
         id="InitializeProfileRequestContext"

Modified: trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml?rev=5455&r1=5454&r2=5455&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml Sat Feb 22 20:02:04 2014
@@ -130,9 +130,12 @@
         <constructor-arg value="OUTBOUND" />
     </bean>
     
-    <!-- This is used with the "encoder selected via lookup component" style. -->
-    <bean id="EncodeMessage" class="idp.EncodeSAMLMessageFromBindingURI" scope="prototype"
-        p:bindings-ref="shibboleth.OutgoingSAML2SSOBindings" />
+    <bean id="EncodeMessage" class="org.opensaml.profile.action.impl.EncodeMessage" scope="prototype">
+        <property name="messageEncoderFactory">
+            <bean class="net.shibboleth.idp.saml.impl.profile.SpringAwareMessageEncoderFactory"
+                p:bindings-ref="shibboleth.OutgoingSAML2SSOBindings" />
+        </property>
+    </bean>
     
     <bean id="AddBasicMessageMetadataContext" class="idp.AddBasicMessageMetadataContext" />