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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov 12 19:43:17 2015
New Revision: 7987

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7987&view=rev
Log:
IDP-852 - Global fail-fast setting for services

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/services.properties
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=7987&r1=7986&r2=7987&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties	Thu Nov 12 19:43:17 2015
@@ -19,6 +19,10 @@
 
 # Set the location of Velocity view templates
 #idp.views = %{idp.home}/views
+
+# Global default for fail-fast behavior of most subsystems
+# with individual override possible via services.properties
+#idp.service.failFast = false
 
 # Settings for internal AES encryption key
 #idp.sealer.storeType = JCEKS

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=7987&r1=7986&r2=7987&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/services.properties	Thu Nov 12 19:43:17 2015
@@ -5,7 +5,7 @@
 # checkInterval = PT0S means never reload (this is the default)
 
 #idp.service.logging.resource = %{idp.home}/conf/logback.xml
-#idp.service.logging.failFast = false
+#idp.service.logging.failFast = true
 idp.service.logging.checkInterval = PT5M
 
 # Set to shibboleth.LegacyRelyingPartyResolverResources with legacy V2 relying-party.xml

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=7987&r1=7986&r2=7987&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	Thu Nov 12 19:43:17 2015
@@ -23,12 +23,12 @@
         class="%{idp.service.logging.class:net.shibboleth.idp.log.LogbackLoggingService}"
         p:loggingConfiguration="%{idp.service.logging.resource:%{idp.home}/conf/logback.xml}"
         p:reloadCheckDelay="%{idp.service.logging.checkInterval:PT0S}"
-        p:failFast="%{idp.service.logging.failFast:true}" />
+        p:failFast="%{idp.service.logging.failFast:%{idp.service.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}'.trim()}"
-            p:failFast="%{idp.service.attribute.filter.failFast:false}"
+            p:failFast="%{idp.service.attribute.filter.failFast:%{idp.service.failFast:false}}"
             p:reloadCheckDelay="%{idp.service.attribute.filter.checkInterval:PT0S}"
             p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer">
         <constructor-arg name="claz" value="net.shibboleth.idp.attribute.filter.AttributeFilter" />
@@ -41,7 +41,7 @@
     <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService" 
             depends-on="shibboleth.VelocityEngine"
             p:serviceConfigurations-ref="#{'%{idp.service.attribute.resolver.resources:shibboleth.AttributeResolverResources}'.trim()}"
-            p:failFast="%{idp.service.attribute.resolver.failFast:false}"
+            p:failFast="%{idp.service.attribute.resolver.failFast:%{idp.service.failFast:false}}"
             p:reloadCheckDelay="%{idp.service.attribute.resolver.checkInterval:PT0S}"
             p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer">
         <constructor-arg name="claz" value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
@@ -54,14 +54,14 @@
     <bean id="shibboleth.NameIdentifierGenerationService" class="net.shibboleth.ext.spring.service.ReloadableSpringService" 
         c:claz="net.shibboleth.idp.saml.nameid.NameIdentifierGenerationService"
         p:serviceConfigurations-ref="#{'%{idp.service.nameidGeneration.resources:shibboleth.NameIdentifierGenerationResources}'.trim()}"
-        p:failFast="%{idp.service.nameidGeneration.failFast:false}"
+        p:failFast="%{idp.service.nameidGeneration.failFast:%{idp.service.failFast:false}}"
         p:reloadCheckDelay="%{idp.service.nameidGeneration.checkInterval:PT0S}"

[... 38 lines stripped ...]