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

[noreply at shibboleth.net]

Author: serac
Date: Thu Jun 18 14:23:45 2015
New Revision: 7575

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7575&view=rev
Log:
IDP-745 Add mappings for CASSPSession.

https://issues.shibboleth.net/jira/browse/IDP-745

Modified:
    trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml
    trunk/idp-conf/src/test/resources/test/test-cas-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml?rev=7575&r1=7574&r2=7575&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml	Thu Jun 18 14:23:45 2015
@@ -33,6 +33,10 @@
                         c:offset="%{idp.session.slop:PT0S}"
                         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>

Modified: trunk/idp-conf/src/test/resources/test/test-cas-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/test/test-cas-beans.xml?rev=7575&r1=7574&r2=7575&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/test/test-cas-beans.xml	(original)
+++ trunk/idp-conf/src/test/resources/test/test-cas-beans.xml	Thu Jun 18 14:23:45 2015
@@ -8,29 +8,6 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
 
        default-init-method="initialize" default-destroy-method="destroy">
-
-    <!-- Modify only to add extension types associated with non-built-in SSO protocols. -->
-    <bean id="shibboleth.SPSessionSerializerRegistry" parent="shibboleth.DefaultSPSessionSerializerRegistry">
-        <property name="mappings">
-            <map merge="true">
-                <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>
-
-    <!-- Modify only to add extension types associated with non-built-in SSO protocols. -->
-    <bean id="shibboleth.SessionTypeProtocolMap" parent="shibboleth.DefaultSessionTypeProtocolMap">
-        <property name="sourceMap">
-            <map merge="true">
-                <entry key="#{T(net.shibboleth.idp.cas.session.CASSPSession)}">
-                    <util:constant static-field="net.shibboleth.idp.cas.config.AbstractProtocolConfiguration.PROTOCOL_URI" />
-                </entry>
-            </map>
-        </property>
-    </bean>
 
     <bean id="shibboleth.SessionManager" class="net.shibboleth.idp.session.impl.StorageBackedSessionManager"
           depends-on="shibboleth.OpenSAMLConfig"