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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 14 22:05:50 2014
New Revision: 6707

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6707&view=rev
Log:
Revert metadata change, creates a circular ref.

Modified:
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/main/resources/system/conf/services-system.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=6707&r1=6706&r2=6707&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Tue Oct 14 22:05:50 2014
@@ -65,11 +65,6 @@
         <value>%{idp.home}/system/conf/relying-party-system.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>
-    </util:list>
-
     <!--
     This set of resources loads a legacy 2.x relying-party.xml file
     when idp.service.relyingparty.legacy=true
@@ -80,14 +75,9 @@
         <value>%{idp.home}/system/conf/legacy-relying-party-defaults.xml</value>
     </util:list>
 
-    <!--
-    This allows a legacy relying-party.xml file to be used for metadata
-    when idp.service.relyingparty.legacy=true
-    -->
-    <util:list id="shibboleth.LegacyMetadataResolverResources">
+    <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/legacy-relying-party-defaults.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.AttributeResolverResources">

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=6707&r1=6706&r2=6707&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 Tue Oct 14 22:05:50 2014
@@ -75,7 +75,7 @@
 
     <bean id="shibboleth.MetadataResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
         depends-on="shibboleth.AttributeResolverService" 
-        p:serviceConfigurations-ref="#{ %{idp.service.relyingparty.legacy:false} ? 'shibboleth.LegacyMetadataResolverResources' :  'shibboleth.MetadataResolverResources' }"
+        p:serviceConfigurations-ref="shibboleth.MetadataResolverResources"
         p:failFast="%{idp.service.metadata.failFast:false}"
         p:reloadCheckDelay="%{idp.service.metadata.checkInterval:0}"
         p:reloadTaskTimer-ref="shibboleth.TaskTimer">