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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Apr  1 18:05:16 2014
New Revision: 5678

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5678&view=rev
Log:
OSJ-70 - Wire in action for signature validation params, and some supporting beans

Modified:
    trunk/idp-conf/src/main/resources/system/conf/global-system.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/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=5678&r1=5677&r2=5678&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Tue Apr  1 18:05:16 2014
@@ -138,6 +138,15 @@
     <bean id="shibboleth.SAMLArtifactMap" depends-on="shibboleth.StorageService"
         class="org.opensaml.saml.common.binding.artifact.StorageServiceSAMLArtifactMap"
         p:storageService-ref="shibboleth.StorageService" />
+        
+    <bean id="shibboleth.SignatureValidationParametersResolver"
+        class="org.opensaml.xmlsec.impl.BasicSignatureValidationParametersResolver" />
+    <bean id="shibboleth.SignatureSigningParametersResolver"
+        class="org.opensaml.xmlsec.impl.BasicSignatureSigningParametersResolver" />
+    <bean id="shibboleth.DecryptionParametersResolver" class="org.opensaml.xmlsec.impl.BasicDecryptionParametersResolver" />
+    <!--
+    <bean id="shibboleth.EncryptionParametersResolver" class="org.opensaml.xmlsec.impl.BasicEncryptionParametersResolver" />
+    -->
 
     <bean id="shibboleth.AttributeFilterService" class="net.shibboleth.idp.service.ReloadableSpringService" depends-on="shibboleth.VelocityEngine"
         c:claz="net.shibboleth.idp.attribute.filter.AttributeFilter"

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=5678&r1=5677&r2=5678&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Tue Apr  1 18:05:16 2014
@@ -28,4 +28,13 @@
     <bean id="shibboleth.RelyingPartyIdLookup.Simple"
         class="net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction" />
 
+    <bean id="shibboleth.SignatureValidationConfigurationLookup"
+        class="net.shibboleth.idp.profile.config.navigate.SignatureValidationConfigurationLookupFunction" />
+    <bean id="shibboleth.SignatureSigningConfigurationLookup"
+        class="net.shibboleth.idp.profile.config.navigate.SignatureSigningConfigurationLookupFunction" />
+    <bean id="shibboleth.DecryptionConfigurationLookup"
+        class="net.shibboleth.idp.profile.config.navigate.DecryptionConfigurationLookupFunction" />
+    <bean id="shibboleth.EncryptionConfigurationLookup"
+        class="net.shibboleth.idp.profile.config.navigate.EncryptionConfigurationLookupFunction" />
+        
 </beans>

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=5678&r1=5677&r2=5678&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 Tue Apr  1 18:05:16 2014
@@ -45,6 +45,11 @@
 
     <bean id="SelectProfileConfiguration"
         class="net.shibboleth.idp.profile.impl.SelectProfileConfiguration" scope="prototype" />
+        
+    <bean id="PopulateSignatureValidationParameters"
+        class="org.opensaml.profile.action.impl.PopulateSignatureValidationParameters" scope="prototype"
+        p:configurationLookupStrategy-ref="shibboleth.SignatureValidationConfigurationLookup"
+        p:signatureValidationParametersResolver-ref="shibboleth.SignatureValidationParametersResolver" />
 
     <bean id="InitializeOutboundMessageContext"
         class="net.shibboleth.idp.saml.impl.profile.InitializeOutboundMessageContext" 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=5678&r1=5677&r2=5678&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml (original)

[... 18 lines stripped ...]