[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/global-user.xml conf/subject-c14n-user.xm...

[noreply at shibboleth.net]

Author: scantor
Date: Mon May  5 12:29:30 2014
New Revision: 5843

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5843&view=rev
Log:
Rename subject-config files to match actual content

Added:
    trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml
      - copied unchanged from r5840, trunk/idp-conf/src/main/resources/conf/subject-config.xml
    trunk/idp-conf/src/main/resources/system/conf/subject-c14n-system.xml
      - copied unchanged from r5840, trunk/idp-conf/src/main/resources/system/conf/subject-config-system.xml
Modified:
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/conf/subject-config.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/subject-config-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-user.xml?rev=5843&r1=5842&r2=5843&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Mon May  5 12:29:30 2014
@@ -12,9 +12,9 @@
 	<context:property-placeholder location="file://${idp.home}/conf/idp.properties" />
 
     <import resource="services-user.xml" />
+    <import resource="subject-c14n-user.xml" />
 	<import resource="authn-comparison.xml" />
 	<import resource="general-authn-config.xml" />
-    <import resource="subject-config.xml" />
 
     <!-- List of event/error codes during SSO to trap and handle without returning to SPs. -->
 

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=5843&r1=5842&r2=5843&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 May  5 12:29:30 2014
@@ -33,7 +33,7 @@
     <import resource="session-manager.xml" />
     <import resource="services-system.xml" />
     <import resource="saml-binding-config.xml" />
-    <import resource="subject-config-system.xml" />
+    <import resource="subject-c14n-system.xml" />
     <import resource="utilities.xml" />
     
     <bean id="shibboleth.TaskTimer" class="java.util.Timer" destroy-method="cancel"/> <!--  only needed if you do reloading -->