[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/conf/services.xml

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jun 17 23:20:39 2014
New Revision: 6100

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6100&view=rev
Log:
Reorder services.

Modified:
    trunk/idp-conf/src/main/resources/conf/services.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=6100&r1=6099&r2=6100&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Tue Jun 17 23:20:39 2014
@@ -59,6 +59,26 @@
     property sources.
     -->
 
+    <util:list id="shibboleth.RelyingPartyResolverResources">
+        <value>file:///${idp.home}/conf/relying-party.xml</value>
+        <value>file:///${idp.home}/conf/credentials.xml</value>
+        <value>file:///${idp.home}/system/conf/relying-party-system.xml</value>
+    </util:list>
+
+    <!-- Use this set of resources (the first one suitably modified) to load a legacy 2.x file. -->
+    <!--
+    <util:list id="shibboleth.RelyingPartyResolverResources">
+        <value>file:///${idp.home}/conf/relying-party-legacy.xml</value>
+        <value>file:///${idp.home}/conf/property-placeholder.xml</value>
+        <value>file:///${idp.home}/system/conf/profile-defaults.xml</value>
+    </util:list>
+    -->
+
+    <util:list id="shibboleth.MetadataResolverResources">
+        <value>file:///${idp.home}/conf/metadata-providers.xml</value>
+        <value>file:///${idp.home}/conf/property-placeholder.xml</value>
+    </util:list>
+
     <util:list id ="shibboleth.AttributeResolverResources">
         <value>file:///${idp.home}/conf/attribute-resolver.xml</value>
         <value>file:///${idp.home}/conf/property-placeholder.xml</value>
@@ -69,24 +89,6 @@
         <value>file:///${idp.home}/conf/property-placeholder.xml</value>
     </util:list>
 
-    <util:list id="shibboleth.MetadataResolverResources">
-        <value>file:///${idp.home}/conf/metadata-providers.xml</value>
-        <value>file:///${idp.home}/conf/property-placeholder.xml</value>
-    </util:list>
-
-    <!--
-    <util:list id="shibboleth.RelyingPartyResolverResources">
-        <value>file:///${idp.home}/conf/relying-party-legacy.xml</value>
-        <value>file:///${idp.home}/conf/property-placeholder.xml</value>
-        <value>file:///${idp.home}/system/conf/profile-defaults.xml</value>
-    </util:list>
-    -->
-    <util:list id="shibboleth.RelyingPartyResolverResources">
-        <value>file:///${idp.home}/conf/relying-party.xml</value>
-        <value>file:///${idp.home}/conf/credentials.xml</value>
-        <value>file:///${idp.home}/system/conf/relying-party-system.xml</value>
-    </util:list>
-
     <util:list id ="shibboleth.NameIdentifierGenerationResources">
         <value>file:///${idp.home}/conf/saml-nameid.xml</value>
         <value>file:///${idp.home}/system/conf/saml-nameid-system.xml</value>