[java-identity-provider COMMIT] in /trunk/idp-conf/src: main/resources/conf/cas-protocol.xml main/resources/conf/serv...

[noreply at shibboleth.net]

Author: serac
Date: Tue May 12 14:32:34 2015
New Revision: 7516

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7516&view=rev
Log:
IDP-615 Revert service config changes unrelated to CAS.

Modified:
    trunk/idp-conf/src/main/resources/conf/cas-protocol.xml
    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
    trunk/idp-conf/src/main/resources/system/flows/cas/common-beans.xml
    trunk/idp-conf/src/test/resources/test/test-cas-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/cas-protocol.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/cas-protocol.xml?rev=7516&r1=7515&r2=7516&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/cas-protocol.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/cas-protocol.xml	Tue May 12 14:32:34 2015
@@ -15,7 +15,7 @@
        |
        | This bean is reloaded periodically according to %{idp.home}/conf/services.properties.
        -->
-    <bean id="cas.ReloadingServiceRegistry"
+    <bean id="reloadableServiceRegistry"
           class="net.shibboleth.idp.cas.service.PatternServiceRegistry">
         <property name="definitions">
             <list>

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=7516&r1=7515&r2=7516&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/services.properties	Tue May 12 14:32:34 2015
@@ -36,7 +36,7 @@
 #idp.service.access.failFast = false
 idp.service.access.checkInterval = PT5M
 
-#idp.service.cas.registry.resources = cas.ServiceRegistryResources
+#idp.service.cas.registry.resources = shibboleth.CASServiceRegistryResources
 #idp.service.cas.registry.failFast = false
 idp.service.cas.registry.checkInterval = PT15M
 

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=7516&r1=7515&r2=7516&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml	Tue May 12 14:32:34 2015
@@ -92,12 +92,11 @@
     -->
 
     <!-- This set of resources supports a native Spring relying-party.xml file. -->
-    <!-- Uncomment the following to customize relying party resource locations.
     <util:list id="shibboleth.RelyingPartyResolverResources">
         <value>%{idp.home}/conf/relying-party.xml</value>
         <value>%{idp.home}/conf/credentials.xml</value>
         <value>%{idp.home}/system/conf/relying-party-system.xml</value>
-    </util:list>-->
+    </util:list>
 
     <!-- This set of resources supports a legacy 2.x relying-party.xml file. -->
     <util:list id="shibboleth.LegacyRelyingPartyResolverResources">
@@ -105,36 +104,31 @@
         <value>%{idp.home}/system/conf/legacy-relying-party-defaults.xml</value>
     </util:list>
 
-    <!-- Uncomment the following to customize metadata resource locations.
     <util:list id="shibboleth.MetadataResolverResources">
         <value>%{idp.home}/conf/metadata-providers.xml</value>
         <value>%{idp.home}/system/conf/metadata-providers-system.xml</value>
-    </util:list>-->
+    </util:list>
 
-    <!-- Uncomment the following to customize attribute resolver resource locations.
     <util:list id ="shibboleth.AttributeResolverResources">
         <value>%{idp.home}/conf/attribute-resolver.xml</value>
-    </util:list>-->
+    </util:list>
 
-    <!-- Uncomment the following to customize attribute filter resource locations.
     <util:list id ="shibboleth.AttributeFilterResources">
         <value>%{idp.home}/conf/attribute-filter.xml</value>
-    </util:list>-->
+    </util:list>
 
-    <!-- Uncomment the following to customize name ID generation resource locations.
     <util:list id ="shibboleth.NameIdentifierGenerationResources">
         <value>%{idp.home}/conf/saml-nameid.xml</value>
         <value>%{idp.home}/system/conf/saml-nameid-system.xml</value>
-    </util:list>-->
-
-    <!-- Uncomment the following to customize access control resource locations.
+    </util:list>
+    
     <util:list id="shibboleth.AccessControlResources">
         <value>%{idp.home}/conf/access-control.xml</value>
         <value>%{idp.home}/system/conf/access-control-system.xml</value>
-    </util:list>-->
+    </util:list>
 
-    <!-- Uncomment the following to customize CAS service registry resource locations.
-    <util:list id="cas.ServiceRegistryResources">
+    <!-- Uncomment this element to customize CAS service registry resources

[... 223 lines stripped ...]