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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar  4 22:20:39 2014
New Revision: 5522

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5522&view=rev
Log:
Factor out some reusable functions.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=5522&r1=5521&r2=5522&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Tue Mar  4 22:20:39 2014
@@ -15,4 +15,11 @@
     <bean id="shibboleth.Predicates.True" class="com.google.common.base.Predicates" factory-method="alwaysTrue" />
     <bean id="shibboleth.Predicates.False" class="com.google.common.base.Predicates" factory-method="alwaysFalse" />
 
+    <bean id="shibboleth.ChildLookup.RelyingParty"
+        class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+        c:type="#{ T(net.shibboleth.idp.profile.context.RelyingPartyContext) }" />
+    <bean id="shibboleth.ChildLookup.SecurityParameters"
+        class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+        c:type="#{ T(org.opensaml.xmlsec.context.SecurityParametersContext) }" />
+
 </beans>

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=5522&r1=5521&r2=5522&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 Tue Mar  4 22:20:39 2014
@@ -261,16 +261,9 @@
 
     <bean id="SignAssertions" class="org.opensaml.saml.saml1.profile.impl.SignAssertions" scope="prototype">
         <property name="securityParametersLookupStrategy">
-            <bean class="com.google.common.base.Functions" factory-method="compose">
-                <constructor-arg>
-                    <bean class="org.opensaml.messaging.context.navigate.ChildContextLookup"
-                        c:type="#{ T(org.opensaml.xmlsec.context.SecurityParametersContext) }" />
-                </constructor-arg>
-                <constructor-arg>
-                    <bean class="org.opensaml.messaging.context.navigate.ChildContextLookup"
-                        c:type="#{ T(net.shibboleth.idp.profile.context.RelyingPartyContext) }" />
-                </constructor-arg>
-            </bean>
+            <bean class="com.google.common.base.Functions" factory-method="compose"
+                c:g-ref="shibboleth.ChildLookup.SecurityParameters"
+                c:f-ref="shibboleth.ChildLookup.RelyingParty" />
         </property>
     </bean>