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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 12 17:57:28 2014
New Revision: 7082

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7082&view=rev
Log:
IDP-539 - Fix AbstractReloadableService to create its own Timer, and pull dependency on TaskTimer bean.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/services-system.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=7082&r1=7081&r2=7082&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 Fri Dec 12 17:57:28 2014
@@ -22,7 +22,6 @@
     <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService"
         p:loggingConfiguration="%{idp.home}/conf/logback.xml"
         p:reloadCheckDelay="%{idp.service.logging.checkInterval:PT5M}"
-        p:reloadTaskTimer-ref="shibboleth.TaskTimer"
         p:failFast="%{idp.service.logging.failFast:true}" />
     
     <bean id="shibboleth.AttributeFilterService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
@@ -30,7 +29,6 @@
             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:reloadTaskTimer-ref="shibboleth.TaskTimer"
             p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer">
         <constructor-arg name="claz" value="net.shibboleth.idp.attribute.filter.AttributeFilter" />
         <constructor-arg name="strategy">
@@ -44,7 +42,6 @@
             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:reloadTaskTimer-ref="shibboleth.TaskTimer"
             p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer">
         <constructor-arg name="claz" value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
         <constructor-arg name="strategy">
@@ -58,7 +55,6 @@
         p:serviceConfigurations-ref="%{idp.service.nameidGeneration.resources:shibboleth.NameIdentifierGenerationResources}"
         p:failFast="%{idp.service.nameidGeneration.failFast:false}"
         p:reloadCheckDelay="%{idp.service.nameidGeneration.checkInterval:0}"
-        p:reloadTaskTimer-ref="shibboleth.TaskTimer"
         p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
         p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer" />
 
@@ -66,7 +62,6 @@
             p:serviceConfigurations-ref="%{idp.service.relyingparty.resources:shibboleth.RelyingPartyResolverResources}"
             p:failFast="%{idp.service.relyingparty.failFast:false}"
             p:reloadCheckDelay="%{idp.service.relyingparty.checkInterval:0}"
-            p:reloadTaskTimer-ref="shibboleth.TaskTimer"
             p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
             p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer">
         <constructor-arg name="claz" value="net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver" />
@@ -81,7 +76,6 @@
             p:serviceConfigurations-ref="%{idp.service.metadata.resources:shibboleth.MetadataResolverResources}"
             p:failFast="%{idp.service.metadata.failFast:false}"
             p:reloadCheckDelay="%{idp.service.metadata.checkInterval:0}"
-            p:reloadTaskTimer-ref="shibboleth.TaskTimer"
             p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer">
         <constructor-arg name="claz" value="org.opensaml.saml.metadata.resolver.MetadataResolver" />
         <constructor-arg name="strategy">
@@ -98,7 +92,6 @@
         p:serviceConfigurations-ref="%{idp.service.access.resources:shibboleth.AccessControlResources}"
         p:failFast="%{idp.service.access.failFast:true}"
         p:reloadCheckDelay="%{idp.service.access.checkInterval:0}"
-        p:reloadTaskTimer-ref="shibboleth.TaskTimer"
         p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
         p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer" />