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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 25 13:27:20 2014
New Revision: 6468

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6468&view=rev
Log:
Reorganize config imports to eliminate global.xml

Added:
    trunk/idp-conf/src/main/resources/conf/session-manager.xml
      - copied, changed from r6464, trunk/idp-conf/src/main/resources/conf/global.xml
    trunk/idp-conf/src/main/resources/system/conf/session-manager-system.xml
      - copied, changed from r6464, trunk/idp-conf/src/main/resources/system/conf/session-manager.xml
Modified:
    trunk/idp-conf/src/main/resources/conf/global.xml
    trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml
    trunk/idp-conf/src/main/resources/system/conf/session-manager.xml
    trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml

Copied: trunk/idp-conf/src/main/resources/conf/session-manager.xml (from r6464, 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/session-manager.xml?p2=trunk/idp-conf/src/main/resources/conf/session-manager.xml&p1=trunk/idp-conf/src/main/resources/conf/global.xml&r1=6464&r2=6468&rev=6468&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/session-manager.xml Mon Aug 25 13:27:20 2014
@@ -9,16 +9,8 @@
 
 	default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
-    <import resource="error-mappings.xml" />
-    <import resource="services.xml" />
-    <import resource="c14n/subject-c14n.xml" />
-	<import resource="authn/authn-comparison.xml" />
-	<import resource="authn/general-authn.xml" />
-
-    <!-- Modify only to add extension types associated with non-built-in protocols. -->
+    <!-- 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">

Modified: trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml?rev=6468&r1=6467&r2=6468&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml Mon Aug 25 13:27:20 2014
@@ -11,6 +11,9 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
+
+	<import resource="../../conf/authn/authn-comparison.xml" />
+	<import resource="../../conf/authn/general-authn.xml" />
 
     <!-- Parent beans for custom principal types. -->
     

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=6468&r1=6467&r2=6468&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 Mon Aug 25 13:27:20 2014
@@ -35,8 +35,9 @@
             p:cacheSeconds="%{idp.errors.cacheSeconds:300}"
             p:basenames-ref="shibboleth.MessageSourceResources" />
 
+    <import resource="../../conf/error-mappings.xml" />
     <import resource="general-authn-system.xml" />
-    <import resource="session-manager.xml" />
+    <import resource="session-manager-system.xml" />
     <import resource="services-system.xml" />
     <import resource="saml-binding-config.xml" />
     <import resource="subject-c14n-system.xml" />

Modified: trunk/idp-conf/src/main/resources/system/conf/services-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/services-system.xml?rev=6468&r1=6467&r2=6468&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/services-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/services-system.xml Mon Aug 25 13:27:20 2014
@@ -11,6 +11,8 @@
 
        default-init-method="initialize"
        default-destroy-method="destroy">
+
+    <import resource="../../conf/services.xml" />
 
     <!--

[... 87 lines stripped ...]