[java-idp-testbed COMMIT] in /trunk/src/main/config: conf/attribute-filter-service.xml conf/attribute-resolver-servic...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Nov 14 17:25:06 2013
New Revision: 53

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=53&view=rev
Log:
Move attribute filter and resolver wiring to global-system.xml.

Modified:
    trunk/src/main/config/conf/attribute-filter-service.xml
    trunk/src/main/config/conf/attribute-resolver-service.xml
    trunk/src/main/config/conf/global-user.xml
    trunk/src/main/config/system/conf/global-system.xml

Modified: trunk/src/main/config/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/conf/global-user.xml?rev=53&r1=52&r2=53&view=diff
==============================================================================
--- trunk/src/main/config/conf/global-user.xml (original)
+++ trunk/src/main/config/conf/global-user.xml Thu Nov 14 17:25:06 2013
@@ -16,7 +16,5 @@
 
     <import resource="authn-comparison.xml" />
     <import resource="authn-flow-descriptors.xml" />
-    <import resource="attribute-resolver-service.xml" />
-    <import resource="attribute-filter-service.xml" />
      
 </beans>

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=53&r1=52&r2=53&view=diff
==============================================================================
--- trunk/src/main/config/system/conf/global-system.xml (original)
+++ trunk/src/main/config/system/conf/global-system.xml Thu Nov 14 17:25:06 2013
@@ -123,5 +123,32 @@
     
     <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">
+        <property name="id" value="shibboleth.AttributeFilterService" />
+        <property name="serviceConfigurations">
+            <util:list>
+                <bean id="shibboleth.AttributeFilterConfigurationResource" class="idp.SpringResource">
+                    <constructor-arg value="file://${idp.home}/conf/attribute-filter.xml" />
+                </bean>
+            </util:list>
+        </property>
+    </bean>
+
+    <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"
+        depends-on="shibboleth.VelocityEngine">
+        <property name="id" value="shibboleth.AttributeResolverService" />
+        <property name="serviceConfigurations">
+            <util:list>
+                <bean id="shibboleth.AttributeResolverConfigurationResource" class="idp.SpringResource">
+                    <constructor-arg value="file://${idp.home}/conf/attribute-resolver.xml" />
+                </bean>
+            </util:list>
+        </property>
+    </bean>
+
+    <bean id="shibboleth.AttributeResolver" factory-bean="shibboleth.AttributeResolverService" factory-method="getAttributeResolver" />
     
 </beans>