[java-idp-testbed COMMIT] in /trunk/src/main/config: conf/idp.properties system/conf/global-system.xml system/flows/s...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Dec 10 04:56:31 2013
New Revision: 72

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=72&view=rev
Log:
IDP-330 Configure the Attribute Resolver via the Attribute Resolver service which is a ReloadableSpringService.  Bring the fail fast and reload check interval up into idp properties for the Attribute Resolver and the Logback service

Modified:
    trunk/src/main/config/conf/idp.properties
    trunk/src/main/config/system/conf/global-system.xml
    trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml

Modified: trunk/src/main/config/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/conf/idp.properties?rev=72&r1=71&r2=72&view=diff
==============================================================================
--- trunk/src/main/config/conf/idp.properties (original)
+++ trunk/src/main/config/conf/idp.properties Tue Dec 10 04:56:31 2013
@@ -67,3 +67,10 @@
 idp.authn.ldap.baseDn = ou=people,dc=shibboleth,dc=net
 idp.authn.ldap.subtreeSearch = false
 idp.authn.ldap.userFilter = (uid={user})
+
+# Reload "failfast" (stop the IdP if a configuration is bad)
+# and reload check interval (0 == never reload). Specified in milliseconds
+idp.service.logging.failFast=true
+idp.service.logging.checkInterval=PT5M
+idp.service.attribute.resolver.failFast=false
+idp.service.attribute.resolver.checkInterval=PT5M

Modified: trunk/src/main/config/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/system/conf/global-system.xml?rev=72&r1=71&r2=72&view=diff
==============================================================================
--- trunk/src/main/config/system/conf/global-system.xml (original)
+++ trunk/src/main/config/system/conf/global-system.xml Tue Dec 10 04:56:31 2013
@@ -26,11 +26,14 @@
 
     <import resource="session-manager.xml" />
     
-    <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="start" destroy-method="stop">
-        <property name="id" value="shibboleth.LogbackLogging" />
-        <property name="loggingConfiguration" value="file:${idp.home}/conf/logback.xml" />
-        <property name="reloadCheckDelay" value="0" />
-    </bean>
+    <bean id="shibboleth.TaskTimer" class="java.util.Timer" destroy-method="cancel"/> <!--  only needed if you do reloading -->
+    
+    <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="start" destroy-method="stop"
+          p:id="shibboleth.LogbackLogging"
+          p:loggingConfiguration="file:${idp.home}/conf/logback.xml"
+          p:reloadCheckDelay="${idp.service.logging.checkInterval}"
+          p:reloadTaskTimer-ref="shibboleth.TaskTimer"
+          p:failFast="${idp.service.logging.failFast}"/>
     
     <bean id="shibboleth.OpensamlConfig" class="common.OpensamlConfigBean"
         depends-on="shibboleth.LogbackLogging" p:parserPool-ref="shibboleth.ParserPool" />
@@ -133,16 +136,18 @@
 
     <bean id="shibboleth.AttributeFilter" factory-bean="shibboleth.AttributeFilterService" factory-method="getAttributeFilter" />
 
-    <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.idp.attribute.resolver.spring.AttributeResolverService" init-method="start" destroy-method="stop"
+    <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.idp.service.ReloadableSpringService" init-method="start" destroy-method="stop"
         depends-on="shibboleth.VelocityEngine">
+        <constructor-arg><value>net.shibboleth.idp.attribute.resolver.AttributeResolver</value></constructor-arg>
         <property name="id" value="shibboleth.AttributeResolverService" />
-        <property name="configurations">
+        <property name="serviceConfigurations">
             <util:list>
                 <value>file://${idp.home}/conf/attribute-resolver.xml</value>
             </util:list>
         </property>
+        <property name="failFast" value="${idp.service.attribute.resolver.failFast}" />
+        <property name="reloadCheckDelay" value="${idp.service.attribute.resolver.checkInterval}" />
+        <property name="reloadTaskTimer" ref="shibboleth.TaskTimer" />
     </bean>
 
-    <bean id="shibboleth.AttributeResolver" factory-bean="shibboleth.AttributeResolverService" factory-method="getAttributeResolver" />
-
  </beans>

Modified: trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml?rev=72&r1=71&r2=72&view=diff
==============================================================================
--- trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml (original)
+++ trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml Tue Dec 10 04:56:31 2013
@@ -161,7 +161,7 @@
     <bean id="InitializeRelyingPartyContextBasedOnInboundMessageIssuer" class="net.shibboleth.idp.saml.impl.profile.InitializeRelyingPartyContextBasedOnInboundMessageIssuer" />
     

[... 7 lines stripped ...]