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

noreply at shibboleth.net noreply at shibboleth.net
Thu Mar 26 08:25:23 EDT 2015


Author: rdw
Date: Thu Mar 26 08:25:23 2015
New Revision: 7448

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7448&view=rev
Log:
IDP-637 Log an INFO level message if people ever specify an integer where they should have specified a duration.  Fix the (system) configuration files where this happens and the comments in the properties files where the defaults have therefore changed from 0 to PT0S.  Default configuration remains unchanged in function

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
    trunk/idp-conf/src/main/resources/system/conf/session-manager-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=7448&r1=7447&r2=7448&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Thu Mar 26 08:25:23 2015
@@ -81,7 +81,7 @@
 # Inactivity timeout
 #idp.session.timeout = PT60M
 # Extra time to store sessions for logout
-#idp.session.slop = 0
+#idp.session.slop = PT0S
 # Tolerate storage-related errors
 #idp.session.maskStorageFailure = false
 # Track information about SPs logged into

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=7448&r1=7447&r2=7448&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/services.properties Thu Mar 26 08:25:23 2015
@@ -2,7 +2,7 @@
 # and the settings for failure handling and auto-reload.
 
 # failFast=true prevents IdP startup if a configuration is bad
-# checkInterval = 0 means never reload (this is the default)
+# checkInterval = PT0S means never reload (this is the default)
 
 #idp.service.logging.resource = %{idp.home}/conf/logback.xml
 #idp.service.logging.failFast = false
@@ -15,7 +15,7 @@
 
 #idp.service.metadata.resources = shibboleth.MetadataResolverResources
 #idp.service.metadata.failFast = false
-#idp.service.metadata.checkInterval = 0
+#idp.service.metadata.checkInterval = PT0S
 
 #idp.service.attribute.resolver.resources = shibboleth.AttributeResolverResources
 #idp.service.attribute.resolver.failFast = false

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=7448&r1=7447&r2=7448&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 Mar 26 08:25:23 2015
@@ -21,14 +21,14 @@
 
     <bean id="shibboleth.LoggingService" 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:0}"
+        p:reloadCheckDelay="%{idp.service.logging.checkInterval:PT0S}"
         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:0}"
+            p:reloadCheckDelay="%{idp.service.attribute.filter.checkInterval:PT0S}"
             p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer">
         <constructor-arg name="claz" value="net.shibboleth.idp.attribute.filter.AttributeFilter" />
         <constructor-arg name="strategy">
@@ -41,7 +41,7 @@
             depends-on="shibboleth.VelocityEngine"
             p:serviceConfigurations-ref="%{idp.service.attribute.resolver.resources:shibboleth.AttributeResolverResources}"
             p:failFast="%{idp.service.attribute.resolver.failFast:false}"
-            p:reloadCheckDelay="%{idp.service.attribute.resolver.checkInterval:0}"
+            p:reloadCheckDelay="%{idp.service.attribute.resolver.checkInterval:PT0S}"
             p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer">
         <constructor-arg name="claz" value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
         <constructor-arg name="strategy">
@@ -54,14 +54,14 @@

[... 69 lines stripped ...]


More information about the commits mailing list