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

[noreply at shibboleth.net]

Author: scantor
Date: Sun Dec 14 00:08:28 2014
New Revision: 7090

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7090&view=rev
Log:
Hide unnecessary material from user config.

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

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=7090&r1=7089&r2=7090&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/session-manager.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/session-manager.xml Sun Dec 14 00:08:28 2014
@@ -9,6 +9,11 @@
 
 	default-init-method="initialize" default-destroy-method="destroy">
 
+    <!-- Flows that propagate logout to additional services using supported protocols. -->
+    <util:list id="shibboleth.LogoutPropagationFlows">
+        <ref bean="logoutprop/saml2" />
+    </util:list>
+
     <!-- Modify only to add extension types associated with non-built-in SSO protocols. -->
     <bean id="shibboleth.SPSessionSerializerRegistry" parent="shibboleth.DefaultSPSessionSerializerRegistry">
         <property name="mappings">
@@ -17,22 +22,12 @@
         </property>
     </bean>
     
-    <!-- Includes defaults for SAML session types. -->
-    <util:map id="shibboleth.SessionTypeProtocolMap" >
-        <entry key="#{T(net.shibboleth.idp.saml.session.SAML1SPSession)}">
-            <util:constant static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML11P_NS" />
-        </entry>
-        <entry key="#{T(net.shibboleth.idp.saml.session.SAML2SPSession)}">
-            <util:constant static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML20P_NS" />
-        </entry>
-    </util:map>
-    
-    <!-- Flows that propagate logout to additional services using supported protocols. -->
-    <util:list id="shibboleth.LogoutPropagationFlows">
-        <!--
-        For future use, not yet implemented.
-        <ref bean="logoutprop/saml2" />
-        -->
-    </util:list>
-    
+    <!-- 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">
+            </map>
+        </property>
+    </bean>
+        
 </beans>

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=7090&r1=7089&r2=7090&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 Sun Dec 14 00:08:28 2014
@@ -37,6 +37,20 @@
         </property>
     </bean>
     
+    <bean id="shibboleth.DefaultSessionTypeProtocolMap"
+            class="org.springframework.beans.factory.config.MapFactoryBean" abstract="true">
+        <property name="sourceMap">
+            <map>
+                <entry key="#{T(net.shibboleth.idp.saml.session.SAML1SPSession)}">
+                    <util:constant static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML11P_NS" />
+                </entry>
+                <entry key="#{T(net.shibboleth.idp.saml.session.SAML2SPSession)}">
+                    <util:constant static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML20P_NS" />
+                </entry>
+            </map>
+        </property>
+    </bean>
+    
     <bean id="shibboleth.SessionManager" class="net.shibboleth.idp.session.impl.StorageBackedSessionManager"
             depends-on="shibboleth.OpenSAMLConfig"
             p:httpServletRequest-ref="shibboleth.HttpServletRequest"