[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/logback.xml system/conf/utilities.xml sys...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Apr  2 13:21:20 2014
New Revision: 5685

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

Modified:
    trunk/idp-conf/src/main/resources/conf/logback.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    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/conf/logback.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/logback.xml?rev=5685&r1=5684&r2=5685&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/logback.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/logback.xml Wed Apr  2 13:21:20 2014
@@ -22,6 +22,8 @@
     <logger name="org.opensaml.saml.common.binding" level="DEBUG" />
 
     <logger name="org.opensaml.saml.saml1.binding" level="DEBUG" />
+
+    <logger name="org.opensaml.saml.common.profile" level="DEBUG" />
 
     <logger name="org.opensaml.saml.saml1.profile" level="DEBUG" />
 

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=5685&r1=5684&r2=5685&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Wed Apr  2 13:21:20 2014
@@ -15,12 +15,22 @@
     <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.MessageContextLookup.Inbound"
+        class="org.opensaml.profile.context.navigate.InboundMessageContextLookup" />
+    <bean id="shibboleth.MessageContextLookup.Outbound"
+        class="org.opensaml.profile.context.navigate.OutboundMessageContextLookup" />
+
     <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) }" />
+    <bean id="shibboleth.ChildLookupOrCreate.SecurityParameters"
+        class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+        c:type="#{ T(org.opensaml.xmlsec.context.SecurityParametersContext) }"
+        c:createContext="true" />
 
     <bean id="shibboleth.ResponderIdLookup.Simple"
         class="net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction" />

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=5685&r1=5684&r2=5685&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 Wed Apr  2 13:21:20 2014
@@ -94,8 +94,30 @@
             class="org.opensaml.saml.common.profile.impl.PopulateSignatureSigningParameters" scope="prototype"
             p:configurationLookupStrategy-ref="shibboleth.SignatureSigningConfigurationLookup"
             p:signatureSigningParametersResolver-ref="shibboleth.SignatureSigningParametersResolver">
+        <!-- TODO: disable until parameter resolver in OpenSAML is working -->
+        <property name="activationCondition" ref="shibboleth.Predicates.False">
+            <!--
+            <bean class="net.shibboleth.idp.saml.impl.profile.config.logic.SignResponsesPredicate" />
+            -->
+        </property>
+    </bean>
+
+    <bean id="PopulateAssertionSignatureSigningParameters"
+            class="org.opensaml.saml.common.profile.impl.PopulateSignatureSigningParameters" scope="prototype"
+            p:configurationLookupStrategy-ref="shibboleth.SignatureSigningConfigurationLookup"
+            p:signatureSigningParametersResolver-ref="shibboleth.SignatureSigningParametersResolver">
         <property name="activationCondition">
-            <bean class="net.shibboleth.idp.saml.impl.profile.config.logic.SignResponsesPredicate" />
+            <bean class="net.shibboleth.idp.saml.impl.profile.config.logic.SignAssertionsPredicate" />
+        </property>
+        <property name="securityParametersContextLookupStrategy">
+            <bean class="com.google.common.base.Functions" factory-method="compose"

[... 44 lines stripped ...]