[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system: conf/services-system.xml conf/webflow-c...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Aug 15 22:28:46 2015
New Revision: 7679

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7679&view=rev
Log:
IDP-594 - Wire in client-storage load into SAML flows.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.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/services-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/services-system.xml?rev=7679&r1=7678&r2=7679&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/services-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/services-system.xml	Sat Aug 15 22:28:46 2015
@@ -101,12 +101,12 @@
           p:serviceConfigurations-ref="#{
             getObject('%{idp.service.cas.registry.resources:shibboleth.CASServiceRegistryResources}'.trim()) != null
                 ? '%{idp.service.cas.registry.resources:shibboleth.CASServiceRegistryResources}'.trim()
-                : 'shibboelth.DefaultCASServiceRegistryResources' }"
+                : 'shibboleth.DefaultCASServiceRegistryResources' }"
           p:failFast="%{idp.service.cas.registry.failFast:false}"
           p:reloadCheckDelay="%{idp.service.cas.registry.checkInterval:PT0S}"
           p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
           p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer" />
-    <util:list id="shibboelth.DefaultCASServiceRegistryResources">
+    <util:list id="shibboleth.DefaultCASServiceRegistryResources">
         <value>%{idp.home}/conf/cas-protocol.xml</value>
     </util:list>
 
@@ -143,4 +143,13 @@
           class="net.shibboleth.idp.cas.service.ReloadingServiceRegistry"
           c:delegate-ref="shibboleth.ReloadableCASServiceRegistry" />
 
+    <!-- List of ClientStorageService plugins needed for injection into storage read/write flows. -->
+    <bean id="shibboleth.DefaultClientStorageServices"
+            class="org.springframework.beans.factory.config.ListFactoryBean" abstract="true">
+        <property name="sourceList">
+            <list>
+            </list>
+        </property>
+    </bean>
+
  </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml?rev=7679&r1=7678&r2=7679&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml	Sat Aug 15 22:28:46 2015
@@ -132,6 +132,8 @@
         <webflow:flow-location id="local-storage/read" path="../system/flows/local-storage/local-storage-read-flow.xml" />
         <webflow:flow-location id="local-storage/write" path="../system/flows/local-storage/local-storage-write-flow.xml" />
 
+        <!-- Client storage flows. -->
+        <webflow:flow-location id="client-storage/read" path="../system/flows/client-storage/client-storage-read-flow.xml" />
     </webflow:flow-registry>
 
     <webflow:flow-executor id="flowExecutor">

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=7679&r1=7678&r2=7679&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	Sat Aug 15 22:28:46 2015
@@ -122,6 +122,42 @@
         p:endpointType="#{getObject('shibboleth.EndpointType')}"
         p:bindings-ref="shibboleth.OutgoingBindings"
         p:artifactImpliesSecureChannel="%{idp.artifact.secureChannel:true}" />
+
+    <bean id="PopulateResponseSignatureSigningParameters"
+            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.profile.config.logic.SignResponsesPredicate" />
+        </property>
+    </bean>
+
+    <bean id="PopulateAssertionSignatureSigningParameters"
+            class="org.opensaml.saml.common.profile.impl.PopulateSignatureSigningParameters" scope="prototype"
+            p:configurationLookupStrategy-ref="shibboleth.SignatureSigningConfigurationLookup"

[... 135 lines stripped ...]