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

[noreply at shibboleth.net]

Author: scantor
Date: Sun Aug 24 22:16:21 2014
New Revision: 6464

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6464&view=rev
Log:
- Rework session serializer registry component, to support user extension.
- Add SAML 1 session marker type for consistency.

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML1SPSession.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/SAML1SPSessionCreationStrategy.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/SAML1SPSessionSerializer.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/global.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/session-manager.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML2SPSession.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/SAML2SPSessionSerializer.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SPSession.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SPSessionSerializerRegistry.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializer.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSession.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedSessionManagerTest.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSessionTest.java

Modified: trunk/idp-conf/src/main/resources/conf/global.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global.xml?rev=6464&r1=6463&r2=6464&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global.xml Sun Aug 24 22:16:21 2014
@@ -18,4 +18,12 @@
 	<import resource="authn/authn-comparison.xml" />
 	<import resource="authn/general-authn.xml" />
 
+    <!-- Modify only to add extension types associated with non-built-in protocols. -->
+    <bean id="shibboleth.SPSessionSerializerRegistry" parent="shibboleth.DefaultSPSessionSerializerRegistry">
+        <property name="mappings">
+            <map merge="true">
+            </map>
+        </property>
+    </bean>
+
 </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=6464&r1=6463&r2=6464&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 Sun Aug 24 22:16:21 2014
@@ -51,7 +51,7 @@
           p:failFast="%{idp.service.logging.failFast:true}" />
     
     <bean id="shibboleth.OpenSAMLConfig" class="net.shibboleth.idp.spring.OpenSAMLConfigBean"
-        depends-on="shibboleth.LogbackLogging" p:parserPool-ref="shibboleth.ParserPool" />
+        depends-on="shibboleth.LogbackLogging,shibboleth.ParserPool" p:parserPool-ref="shibboleth.ParserPool" />
 
     <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean" depends-on="shibboleth.LogbackLogging">
         <property name="overrideLogging" value="false"/>

Modified: trunk/idp-conf/src/main/resources/system/conf/session-manager.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/session-manager.xml?rev=6464&r1=6463&r2=6464&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/session-manager.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/session-manager.xml Sun Aug 24 22:16:21 2014
@@ -16,12 +16,16 @@
         class="net.shibboleth.utilities.java.support.security.SecureRandomIdentifierGenerationStrategy"
         c:identifierSize="%{idp.session.idSize:32}" />
 
-    <bean id="shibboleth.SPSessionSerializerRegistry" class="net.shibboleth.idp.session.SPSessionSerializerRegistry"
-            depends-on="shibboleth.OpenSAMLConfig">
-        <constructor-arg>
+    <bean id="shibboleth.DefaultSPSessionSerializerRegistry" abstract="true"
+            class="net.shibboleth.idp.session.SPSessionSerializerRegistry">
+        <property name="mappings">
             <map>
                 <entry key="#{ T(net.shibboleth.idp.session.BasicSPSession) }">
                     <bean class="net.shibboleth.idp.session.impl.BasicSPSessionSerializer"
+                        c:offset="%{idp.session.slop:0}" />

[... 780 lines stripped ...]