[java-identity-provider COMMIT] in /branches/3.1: ./ idp-conf/src/main/resources/system/conf/session-manager-system.xml

[noreply at shibboleth.net]

Author: serac
Date: Tue Jun 23 09:53:09 2015
New Revision: 7598

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

Modified:
    branches/3.1/   (props changed)
    branches/3.1/idp-conf/src/main/resources/system/conf/session-manager-system.xml

Modified: branches/3.1/idp-conf/src/main/resources/system/conf/session-manager-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.1/idp-conf/src/main/resources/system/conf/session-manager-system.xml?rev=7598&r1=7597&r2=7598&view=diff
==============================================================================
--- branches/3.1/idp-conf/src/main/resources/system/conf/session-manager-system.xml	(original)
+++ branches/3.1/idp-conf/src/main/resources/system/conf/session-manager-system.xml	Tue Jun 23 09:53:09 2015
@@ -33,6 +33,10 @@
                         c:offset="%{idp.session.slop:0}"
                         p:parserPool-ref="shibboleth.ParserPool" />
                 </entry>
+                <entry key="#{T(net.shibboleth.idp.cas.session.CASSPSession)}">
+                    <bean class="net.shibboleth.idp.cas.session.CASSPSessionSerializer"
+                        c:offset="%{idp.session.slop:PT0S}" />
+                </entry>
             </map>
         </property>
     </bean>
@@ -46,6 +50,9 @@
                 </entry>
                 <entry key="#{T(net.shibboleth.idp.saml.session.SAML2SPSession)}">
                     <util:constant static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML20P_NS" />
+                </entry>
+                <entry key="#{T(net.shibboleth.idp.cas.session.CASSPSession)}">
+                    <util:constant static-field="net.shibboleth.idp.cas.config.AbstractProtocolConfiguration.PROTOCOL_URI" />
                 </entry>
             </map>
         </property>