[java-idp-testbed COMMIT] /trunk/src/main/config/system/conf/global-system.xml

[noreply at shibboleth.net]

Author: rdw
Date: Sun Nov 24 09:08:01 2013
New Revision: 58

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=58&view=rev
Log:
IdP-298 Synch  testbed with IdP config.  Pass Resources as a List<String> rather than a List<Object> to the service.

Modified:
    trunk/src/main/config/system/conf/global-system.xml

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=58&r1=57&r2=58&view=diff
==============================================================================
--- trunk/src/main/config/system/conf/global-system.xml (original)
+++ trunk/src/main/config/system/conf/global-system.xml Sun Nov 24 09:08:01 2013
@@ -126,11 +126,9 @@
 
     <bean id="shibboleth.AttributeFilterService" class="net.shibboleth.idp.attribute.filter.spring.AttributeFilterService" init-method="start" destroy-method="stop">
         <property name="id" value="shibboleth.AttributeFilterService" />
-        <property name="serviceConfigurations">
+        <property name="configurations">
             <util:list>
-                <bean id="shibboleth.AttributeFilterConfigurationResource" class="idp.SpringResource">
-                    <constructor-arg value="file://${idp.home}/conf/attribute-filter.xml" />
-                </bean>
+                <value>file://${idp.home}/conf/attribute-filter.xml</value>
             </util:list>
         </property>
     </bean>
@@ -140,11 +138,9 @@
     <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.idp.attribute.resolver.spring.AttributeResolverService" init-method="start" destroy-method="stop"
         depends-on="shibboleth.VelocityEngine">
         <property name="id" value="shibboleth.AttributeResolverService" />
-        <property name="serviceConfigurations">
+        <property name="configurations">
             <util:list>
-                <bean id="shibboleth.AttributeResolverConfigurationResource" class="idp.SpringResource">
-                    <constructor-arg value="file://${idp.home}/conf/attribute-resolver.xml" />
-                </bean>
+                <value>file://${idp.home}/conf/attribute-resolver.xml</value>
             </util:list>
         </property>
     </bean>