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

[noreply at shibboleth.net]

Author: serac
Date: Mon May 11 14:10:51 2015
New Revision: 7510

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7510&view=rev
Log:
IDP-615 Define default service resources in system conf.

Allow overriding with properties/user-space config as before.

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=7510&r1=7509&r2=7510&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml	Mon May 11 14:10:51 2015
@@ -92,11 +92,12 @@
     -->
 
     <!-- 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">
@@ -104,32 +105,38 @@
         <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>
-    
+    </util:list>-->
+
+    <!-- Uncomment the following to customize access control resource locations.
     <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">
         <value>%{idp.home}/conf/cas-protocol.xml</value>
-    </util:list>
+    </util:list>-->
 
     <!--
     This collection of resources differs slightly in that it should not include the file extension.

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=7510&r1=7509&r2=7510&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	Mon May 11 14:10:51 2015
@@ -15,8 +15,8 @@
     <import resource="../../conf/services.xml" />
 
     <!--
-    These are beans that define reloadable services. The actual Spring resources that configure the
-    services are generally defined in the services.xml file edited by deployers.
+    These are beans that define reloadable services.
+    Default resources are configured here but may be overridden in services.xml by deployers.
     -->
 
     <bean id="shibboleth.LoggingService" class="%{idp.service.logging.class:net.shibboleth.idp.log.LogbackLoggingService}"
@@ -25,58 +25,88 @@
         p:failFast="%{idp.service.logging.failFast:true}" />
     
     <bean id="shibboleth.AttributeFilterService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
-            depends-on="shibboleth.VelocityEngine"
-            p:serviceConfigurations-ref="%{idp.service.attribute.filter.resources:shibboleth.AttributeFilterResources}"
-            p:failFast="%{idp.service.attribute.filter.failFast:false}"
-            p:reloadCheckDelay="%{idp.service.attribute.filter.checkInterval:PT0S}"
-            p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer">

[... 149 lines stripped ...]