[java-identity-provider COMMIT] in /trunk/idp-conf/src: main/resources/conf/property-placeholder.xml main/resources/c...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov 18 23:07:02 2014
New Revision: 6948

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6948&view=rev
Log:
Move property placeholder to system tree.

Added:
    trunk/idp-conf/src/main/resources/system/conf/property-placeholder.xml
      - copied unchanged from r6946, trunk/idp-conf/src/main/resources/conf/property-placeholder.xml
Modified:
    trunk/idp-conf/src/main/resources/conf/property-placeholder.xml
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/test/resources/mapping/configs/override.xml

Modified: trunk/idp-conf/src/main/resources/conf/services.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.xml?rev=6948&r1=6947&r2=6948&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Tue Nov 18 23:07:02 2014
@@ -69,23 +69,23 @@
     <!-- This set of resources supports a legacy 2.x relying-party.xml file. -->
     <util:list id="shibboleth.LegacyRelyingPartyResolverResources">
         <value>%{idp.home}/conf/relying-party.xml</value>
-        <value>%{idp.home}/conf/property-placeholder.xml</value>
+        <value>%{idp.home}/system/conf/property-placeholder.xml</value>
         <value>%{idp.home}/system/conf/legacy-relying-party-defaults.xml</value>
     </util:list>
 
     <util:list id="shibboleth.MetadataResolverResources">
         <value>%{idp.home}/conf/metadata-providers.xml</value>
-        <value>%{idp.home}/conf/property-placeholder.xml</value>
+        <value>%{idp.home}/system/conf/property-placeholder.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.AttributeResolverResources">
         <value>%{idp.home}/conf/attribute-resolver.xml</value>
-        <value>%{idp.home}/conf/property-placeholder.xml</value>
+        <value>%{idp.home}/system/conf/property-placeholder.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.AttributeFilterResources">
         <value>%{idp.home}/conf/attribute-filter.xml</value>
-        <value>%{idp.home}/conf/property-placeholder.xml</value>
+        <value>%{idp.home}/system/conf/property-placeholder.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.NameIdentifierGenerationResources">

Modified: trunk/idp-conf/src/test/resources/mapping/configs/override.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/mapping/configs/override.xml?rev=6948&r1=6947&r2=6948&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/mapping/configs/override.xml (original)
+++ trunk/idp-conf/src/test/resources/mapping/configs/override.xml Tue Nov 18 23:07:02 2014
@@ -11,13 +11,13 @@
 	<util:list id="shibboleth.AttributeResolverResources">
         <value>classpath:/mapping/configs/attribute-resolver.xml</value>
         <value>classpath:/mapping/configs/attribute-resolver2.xml</value>
-		<value>%{idp.home}/conf/property-placeholder.xml</value>
+		<value>%{idp.home}/system/conf/property-placeholder.xml</value>
 	</util:list>
 
 	<util:list id="shibboleth.AttributeFilterResources">
         <value>classpath:/mapping/configs/attribute-filter.xml</value>
         <value>classpath:/mapping/configs/attribute-filter2.xml</value>
-		<value>%{idp.home}/conf/property-placeholder.xml</value>
+		<value>%{idp.home}/system/conf/property-placeholder.xml</value>
 	</util:list>
 
 </beans>