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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar  4 20:45:49 2014
New Revision: 5521

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5521&view=rev
Log:
IDP-129 - refactor down into OpenSAML, using lookup strategies

Modified:
    trunk/idp-conf/src/main/resources/conf/logback.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/SignAssertions.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/SignAssertionsTest.java

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=5521&r1=5520&r2=5521&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/logback.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/logback.xml Tue Mar  4 20:45:49 2014
@@ -21,7 +21,13 @@
    
     <logger name="org.opensaml.saml.common.binding" level="DEBUG" />
 
+    <logger name="org.opensaml.saml.saml1.binding" level="DEBUG" />
+
+    <logger name="org.opensaml.saml.saml1.profile" level="DEBUG" />
+
     <logger name="org.opensaml.saml.saml2.binding" level="DEBUG" />
+
+    <logger name="org.opensaml.saml.saml2.profile" level="DEBUG" />
 
     <logger name="org.opensaml.storage" level="TRACE" />
 

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=5521&r1=5520&r2=5521&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 20:45:49 2014
@@ -259,10 +259,20 @@
         </property>
     </bean>
 
-    <bean
-        id="SignAssertions"
-        class="net.shibboleth.idp.saml.impl.profile.saml1.SignAssertions"
-        scope="prototype" />
+    <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>
+        </property>
+    </bean>
 
     <bean
         id="RecordResponseComplete"