[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 07:18:32 2013
New Revision: 73

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=73&view=rev
Log:
IDP-330 Synch test bed.  Attribute Filter is now configured as a  ReloadableSpringService.  failFast and reload schedule go into properties

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=73&r1=72&r2=73&view=diff
==============================================================================
--- trunk/src/main/config/conf/idp.properties (original)
+++ trunk/src/main/config/conf/idp.properties Tue Dec 10 07:18:32 2013
@@ -74,3 +74,6 @@
 idp.service.logging.checkInterval=PT5M
 idp.service.attribute.resolver.failFast=false
 idp.service.attribute.resolver.checkInterval=PT5M
+# Failing the filter fast leaves no filters enabled.
+idp.service.attribute.filter.failFast=false
+idp.service.attribute.filter.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=73&r1=72&r2=73&view=diff
==============================================================================
--- trunk/src/main/config/system/conf/global-system.xml (original)
+++ trunk/src/main/config/system/conf/global-system.xml Tue Dec 10 07:18:32 2013
@@ -125,20 +125,23 @@
     <bean id="shibboleth.ReplayCache" class="org.opensaml.storage.ReplayCache" depends-on="shibboleth.LogbackLogging"
         p:storage-ref="shibboleth.StorageService" p:strict="true" />
 
-    <bean id="shibboleth.AttributeFilterService" class="net.shibboleth.idp.attribute.filter.spring.AttributeFilterService" init-method="start" destroy-method="stop">
+    <bean id="shibboleth.AttributeFilterService" class="net.shibboleth.idp.service.ReloadableSpringService"> 
+        <constructor-arg value="net.shibboleth.idp.attribute.filter.AttributeFilter"/>
+
         <property name="id" value="shibboleth.AttributeFilterService" />
-        <property name="configurations">
+        <property name="serviceConfigurations">
             <util:list>
                 <value>file://${idp.home}/conf/attribute-filter.xml</value>
             </util:list>
         </property>
+        <property name="failFast" value="${idp.service.attribute.filter.failFast}" />
+        <property name="reloadCheckDelay" value="${idp.service.attribute.filter.checkInterval}" />
+        <property name="reloadTaskTimer" ref="shibboleth.TaskTimer" />
     </bean>
-
-    <bean id="shibboleth.AttributeFilter" factory-bean="shibboleth.AttributeFilterService" factory-method="getAttributeFilter" />
 
     <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>
+        <constructor-arg value="net.shibboleth.idp.attribute.resolver.AttributeResolver"/>
         <property name="id" value="shibboleth.AttributeResolverService" />
         <property name="serviceConfigurations">
             <util:list>

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=73&r1=72&r2=73&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 07:18:32 2013
@@ -165,7 +165,7 @@
     </bean>
     
     <bean id="FilterAttributes" class="net.shibboleth.idp.profile.impl.FilterAttributes" >
-       <constructor-arg ref="shibboleth.AttributeFilter"/>
+       <constructor-arg ref="shibboleth.AttributeFilterService"/>
     </bean>
 
     <!-- TODO replace responderId "https://idp.example.org" with something else -->