[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 20:14:37 2014
New Revision: 6702

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6702&view=rev
Log:
Legacy use of relying-party.xml for metadata needs profile default beans to work.

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=6702&r1=6701&r2=6702&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Tue Oct 14 20:14:37 2014
@@ -65,18 +65,29 @@
         <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
+    This set of resources loads a legacy 2.x relying-party.xml file
+    when idp.service.relyingparty.legacy=true
     -->
     <util:list id="shibboleth.LegacyRelyingPartyResolverResources">
-        <value>%{idp.home}/conf/relying-part.xml</value>
+        <value>%{idp.home}/conf/relying-party.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.MetadataResolverResources">
+    <!--
+    This allows a legacy relying-party.xml file to be used for metadata
+    when idp.service.relyingparty.legacy=true
+    -->
+    <util:list id="shibboleth.LegacyMetadataResolverResources">
         <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=6702&r1=6701&r2=6702&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 20:14:37 2014
@@ -75,7 +75,7 @@
 
     <bean id="shibboleth.MetadataResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
         depends-on="shibboleth.AttributeResolverService" 
-        p:serviceConfigurations-ref="shibboleth.MetadataResolverResources"
+        p:serviceConfigurations-ref="#{ %{idp.service.relyingparty.legacy:false} ? 'shibboleth.LegacyMetadataResolverResources' :  'shibboleth.MetadataResolverResources' }"
         p:failFast="%{idp.service.metadata.failFast:false}"
         p:reloadCheckDelay="%{idp.service.metadata.checkInterval:0}"
         p:reloadTaskTimer-ref="shibboleth.TaskTimer">