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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 14 16:14:58 2014
New Revision: 6694

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6694&view=rev
Log:
IDP-485 - add property to swap two sets of resources to load into relying party service

Modified:
    trunk/idp-conf/src/main/resources/conf/services.properties
    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.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.properties?rev=6694&r1=6693&r2=6694&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/services.properties Tue Oct 14 16:14:58 2014
@@ -7,6 +7,7 @@
 #idp.service.logging.checkInterval=PT5M
 
 # Relying Party resolver
+#idp.service.relyingparty.legacy=false
 #idp.service.relyingparty.failFast=false
 idp.service.relyingparty.checkInterval=PT5M
 

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=6694&r1=6693&r2=6694&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Tue Oct 14 16:14:58 2014
@@ -65,14 +65,14 @@
         <value>%{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>%{idp.home}/conf/relying-party-legacy.xml</value>
+    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/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>

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=6694&r1=6693&r2=6694&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 16:14:58 2014
@@ -61,7 +61,7 @@
         p:reloadTaskTimer-ref="shibboleth.TaskTimer" />
 
     <bean id="shibboleth.RelyingPartyResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
-        p:serviceConfigurations-ref="shibboleth.RelyingPartyResolverResources"
+        p:serviceConfigurations-ref="#{ %{idp.service.relyingparty.legacy:false} ? 'shibboleth.LegacyRelyingPartyResolverResources' :  'shibboleth.RelyingPartyResolverResources' }"
         p:failFast="%{idp.service.relyingparty.failFast:false}"
         p:reloadCheckDelay="%{idp.service.relyingparty.checkInterval:0}"
         p:reloadTaskTimer-ref="shibboleth.TaskTimer">