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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Feb 26 20:14:00 2015
New Revision: 7384

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7384&view=rev
Log:
IDP-616 - wire key strategy into persistent client storage for detection of key changes

Modified:
    trunk/idp-conf/src/main/resources/system/conf/global-system.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=7384&r1=7383&r2=7384&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 Thu Feb 26 20:14:00 2015
@@ -151,18 +151,18 @@
         p:cookiePath="%{idp.cookie.path:}"
         p:maxAge="%{idp.cookie.maxAge:31536000}" />
 
-    <bean id="shibboleth.DataSealer" class="net.shibboleth.utilities.java.support.security.DataSealer">
-        <property name="keyStrategy">
-            <bean class="net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategy"
-                p:keystoreType="%{idp.sealer.storeType:JCEKS}"
-                p:keystoreResource="%{idp.sealer.storeResource}"
-                p:keyVersionResource="%{idp.sealer.versionResource}"
-                p:keystorePassword="%{idp.sealer.storePassword}"
-                p:keyAlias="%{idp.sealer.aliasBase:secret}"
-                p:keyPassword="%{idp.sealer.keyPassword}"
-                p:updateInterval="%{idp.sealer.updateInterval:PT15M}" />
-        </property>
-    </bean>
+    <bean id="shibboleth.DataSealerKeyStrategy"
+            class="net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategy"
+        p:keystoreType="%{idp.sealer.storeType:JCEKS}"
+        p:keystoreResource="%{idp.sealer.storeResource}"
+        p:keyVersionResource="%{idp.sealer.versionResource}"
+        p:keystorePassword="%{idp.sealer.storePassword}"
+        p:keyAlias="%{idp.sealer.aliasBase:secret}"
+        p:keyPassword="%{idp.sealer.keyPassword}"
+        p:updateInterval="%{idp.sealer.updateInterval:PT15M}" />
+
+    <bean id="shibboleth.DataSealer" class="net.shibboleth.utilities.java.support.security.DataSealer"
+        p:keyStrategy-ref="shibboleth.DataSealerKeyStrategy" />
 
     <!-- This is a convenience for compatibility with the examples for configuring this in V2. -->
     <alias name="shibboleth.DataSealer" alias="shibboleth.TransientIDDataSealer"/>
@@ -185,7 +185,8 @@
         p:httpServletResponse-ref="shibboleth.HttpServletResponse"
         p:cookieManager-ref="shibboleth.PersistentCookieManager"
         p:cookieName="shib_idp_persistent_ss"
-        p:dataSealer-ref="shibboleth.DataSealer" />
+        p:dataSealer-ref="shibboleth.DataSealer"
+        p:keyStrategy-ref="shibboleth.DataSealerKeyStrategy" />
 
     <bean id="shibboleth.ReplayCache" class="org.opensaml.storage.ReplayCache" depends-on="shibboleth.LoggingService"
         p:storage-ref="%{idp.replayCache.StorageService:shibboleth.StorageService}" p:strict="true" />
@@ -275,7 +276,8 @@
         lazy-init="true"
         class="org.opensaml.security.httpclient.impl.TrustEngineTLSSocketFactory">
         <constructor-arg>
-            <bean factory-method="buildNoTrustSSLConnectionSocketFactory" class="net.shibboleth.utilities.java.support.httpclient.HttpClientSupport"/>
+            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpClientSupport"
+                factory-method="buildNoTrustSSLConnectionSocketFactory" />
         </constructor-arg>
         <constructor-arg>
             <bean class="org.apache.http.conn.ssl.StrictHostnameVerifier" />