[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/services.xml conf/session-manager.xml sys...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Aug 28 20:34:57 2015
New Revision: 7715

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7715&view=rev
Log:
IDP-594 - Proposed "shipping" config for new client storage plugins.

Modified:
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/main/resources/conf/session-manager.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/services.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.xml?rev=7715&r1=7714&r2=7715&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml	Fri Aug 28 20:34:57 2015
@@ -141,13 +141,5 @@
         <value>%{idp.home}/messages/consent-messages</value>
         <value>%{idp.home}/messages/error-messages</value>
     </util:list>
-
-    <!-- List of client-side storage service plugins if you define any special ones of your own. -->
-    <bean id="shibboleth.ClientStorageServices" parent="shibboleth.DefaultClientStorageServices">
-        <property name="sourceList">
-            <list merge="true">
-            </list>
-        </property>
-    </bean>
     
 </beans>

Modified: trunk/idp-conf/src/main/resources/conf/session-manager.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/session-manager.xml?rev=7715&r1=7714&r2=7715&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/session-manager.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/session-manager.xml	Fri Aug 28 20:34:57 2015
@@ -31,4 +31,14 @@
         </property>
     </bean>
         
+    <!--
+    List of client-side storage service plugins. If you use server-side storage and don't need these
+    services, you can remove or comment out the <ref> elements, but don't remove the list bean or
+    a default list will be substituted for backward compatibility.
+    -->
+    <util:list id="shibboleth.ClientStorageServices">
+        <ref bean="shibboleth.ClientSessionStorageService" />
+        <ref bean="shibboleth.ClientPersistentStorageService" />
+    </util:list>
+    
 </beans>

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=7715&r1=7714&r2=7715&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	Fri Aug 28 20:34:57 2015
@@ -174,21 +174,29 @@
         p:cleanupInterval="%{idp.storage.cleanupInterval:PT10M}" />
 
     <bean id="shibboleth.ClientSessionStorageService"
-        class="%{idp.storage.ClientStorageService:org.opensaml.storage.impl.ServletRequestScopedStorageService}"
+        class="org.opensaml.storage.impl.client.ClientStorageService"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest"
-        p:httpServletResponse-ref="shibboleth.HttpServletResponse"
         p:cookieManager-ref="shibboleth.CookieManager"
-        p:cookieName="shib_idp_session_ss"
+        p:storageName="shib_idp_session_ss"
         p:dataSealer-ref="shibboleth.DataSealer" />
 
     <bean id="shibboleth.ClientPersistentStorageService"
-        class="%{idp.storage.ClientStorageService:org.opensaml.storage.impl.ServletRequestScopedStorageService}"
+        class="org.opensaml.storage.impl.client.ClientStorageService"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest"
-        p:httpServletResponse-ref="shibboleth.HttpServletResponse"
         p:cookieManager-ref="shibboleth.PersistentCookieManager"
-        p:cookieName="shib_idp_persistent_ss"
+        p:storageName="shib_idp_persistent_ss"
         p:dataSealer-ref="shibboleth.DataSealer"
         p:keyStrategy-ref="shibboleth.DataSealerKeyStrategy" />
+
+    <!--
+    Default list of ClientStorageService plugins needed for injection into storage read/write flows.
+    Declared here for compatibility with pre-3.2 installs that don't declare this list inside
+    session-manager.xml
+    -->
+    <util:list id="shibboleth.DefaultClientStorageServices">
+        <ref bean="shibboleth.ClientSessionStorageService" />
+        <ref bean="shibboleth.ClientPersistentStorageService" />
+    </util:list>
 
     <bean id="shibboleth.ReplayCache" class="org.opensaml.storage.ReplayCache" depends-on="shibboleth.LoggingService"
         p:storage-ref="#{'%{idp.replayCache.StorageService:shibboleth.StorageService}'.trim()}" p:strict="true" />

Modified: trunk/idp-conf/src/main/resources/system/conf/services-system.xml

[... 19 lines stripped ...]