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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jun 17 22:01:53 2014
New Revision: 6097

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6097&view=rev
Log:
Add property defaults to allow for commenting them out.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.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=6097&r1=6096&r2=6097&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue Jun 17 22:01:53 2014
@@ -101,24 +101,24 @@
 idp.service.logging.checkInterval=PT5M
 
 # Relying Party resolver
-idp.service.relyingparty.failFast=false
+#idp.service.relyingparty.failFast=true
 idp.service.relyingparty.checkInterval=PT5M
 
 # Metadata resolver
-idp.service.metadata.failFast=false
-idp.service.metadata.checkInterval=0
+#idp.service.metadata.failFast=true
+#idp.service.metadata.checkInterval=PT15M
 
 # Attribute resolver
-idp.service.attribute.resolver.failFast=false
+#idp.service.attribute.resolver.failFast=true
 idp.service.attribute.resolver.checkInterval=PT5M
 
 # Attribute filter
 # Failing the filter fast leaves no filters enabled.
-idp.service.attribute.filter.failFast=false
+#idp.service.attribute.filter.failFast=true
 idp.service.attribute.filter.checkInterval=PT5M
 
 # NameID generation
-idp.service.nameidGeneration.failFast=false
+#idp.service.nameidGeneration.failFast=true
 idp.service.nameidGeneration.checkInterval=PT5M
 
 # LDAP attribute configuration, see attribute-resolver.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=6097&r1=6096&r2=6097&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 Jun 17 22:01:53 2014
@@ -26,32 +26,32 @@
         depends-on="shibboleth.VelocityEngine"
         c:claz="net.shibboleth.idp.attribute.filter.AttributeFilter"
         p:serviceConfigurations-ref="shibboleth.AttributeFilterResources"
-        p:failFast="${idp.service.attribute.filter.failFast}"
-        p:reloadCheckDelay="${idp.service.attribute.filter.checkInterval}"
+        p:failFast="${idp.service.attribute.filter.failFast:false}"
+        p:reloadCheckDelay="${idp.service.attribute.filter.checkInterval:0}"
         p:reloadTaskTimer="shibboleth.TaskTimer" />
 
     <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.idp.service.ReloadableSpringService" 
           init-method="start" destroy-method="stop" depends-on="shibboleth.VelocityEngine"
         c:claz="net.shibboleth.idp.attribute.resolver.AttributeResolver"
         p:serviceConfigurations-ref="shibboleth.AttributeResolverResources"
-        p:failFast="${idp.service.attribute.resolver.failFast}"
-        p:reloadCheckDelay="${idp.service.attribute.resolver.checkInterval}"
+        p:failFast="${idp.service.attribute.resolver.failFast:false}"
+        p:reloadCheckDelay="${idp.service.attribute.resolver.checkInterval:0}"
         p:reloadTaskTimer="shibboleth.TaskTimer" />
 
     <bean id="shibboleth.NameIdentifierGenerationService" class="net.shibboleth.idp.service.ReloadableSpringService" 
           init-method="start" destroy-method="stop"
         c:claz="net.shibboleth.idp.saml.nameid.NameIdentifierGenerationService"
         p:serviceConfigurations-ref="shibboleth.NameIdentifierGenerationResources"
-        p:failFast="${idp.service.nameidGeneration.failFast}"
-        p:reloadCheckDelay="${idp.service.nameidGeneration.checkInterval}"
+        p:failFast="${idp.service.nameidGeneration.failFast:false}"
+        p:reloadCheckDelay="${idp.service.nameidGeneration.checkInterval:0}"
         p:reloadTaskTimer="shibboleth.TaskTimer" />
 
     <bean id="shibboleth.RelyingPartyResolverService" class="net.shibboleth.idp.service.ReloadableSpringService"
         c:claz="net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver"
         c:servicableClaz="net.shibboleth.idp.relyingparty.impl.DefaultRelyingPartyConfigurationResolver"
         p:serviceConfigurations-ref="shibboleth.RelyingPartyResolverResources"
-        p:failFast="${idp.service.relyingparty.failFast}"
-        p:reloadCheckDelay="${idp.service.relyingparty.checkInterval}"
+        p:failFast="${idp.service.relyingparty.failFast:false}"
+        p:reloadCheckDelay="${idp.service.relyingparty.checkInterval:0}"
         p:reloadTaskTimer="shibboleth.TaskTimer" />
     
     <bean id="shibboleth.MetadataResolverService" class="net.shibboleth.idp.service.ReloadableSpringService"
@@ -59,8 +59,8 @@

[... 11 lines stripped ...]