[java-identity-provider COMMIT] in /branches/3.1: ./ idp-conf/src/main/resources/conf/idp.properties idp-conf/src/mai...

[noreply at shibboleth.net]

Author: serac
Date: Tue Jun 23 09:45:20 2015
New Revision: 7597

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7597&view=rev
Log:
IDP-640 Merge fix into 3.1 release branch.

Modified:
    branches/3.1/   (props changed)
    branches/3.1/idp-conf/src/main/resources/conf/idp.properties
    branches/3.1/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml

Modified: branches/3.1/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.1/idp-conf/src/main/resources/conf/idp.properties?rev=7597&r1=7596&r2=7597&view=diff
==============================================================================
--- branches/3.1/idp-conf/src/main/resources/conf/idp.properties	(original)
+++ branches/3.1/idp-conf/src/main/resources/conf/idp.properties	Tue Jun 23 09:45:20 2015
@@ -164,3 +164,10 @@
 # Comma-delimited languages to use if not match can be found with the
 # browser-supported languages, defaults to an empty list.
 idp.ui.fallbackLanguages=en,fr,de
+
+# Storage service used by CAS protocol
+# Defaults to shibboleth.StorageService (in-memory)
+# MUST be server-side storage (e.g. in-memory, memcached, database)
+# NOTE that idp.session.StorageService requires server-side storage
+# when CAS protocol is enabled
+#idp.cas.StorageService=shibboleth.StorageService

Modified: branches/3.1/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.1/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml?rev=7597&r1=7596&r2=7597&view=diff
==============================================================================
--- branches/3.1/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml	(original)
+++ branches/3.1/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml	Tue Jun 23 09:45:20 2015
@@ -11,7 +11,7 @@
        default-destroy-method="destroy">
 
     <bean id="cas.ticketService" class="net.shibboleth.idp.cas.ticket.SimpleTicketService"
-          c:service-ref="shibboleth.StorageService" />
+          c:service-ref="%{idp.cas.StorageService:shibboleth.StorageService}" />
 
     <bean id="cas.proxyAuthenticator" class="net.shibboleth.idp.cas.proxy.HttpClientProxyAuthenticator" />