[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/global-user.xml system/conf/global-system...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jan 16 09:09:08 2014
New Revision: 5206

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5206&view=rev
Log:
IDP-298 Allow the user to overwrite default resolver and filter locations with injected beans

Modified:
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-user.xml?rev=5206&r1=5205&r2=5206&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Thu Jan 16 09:09:08 2014
@@ -1,20 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.2.xsd
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.2.xsd
                            http://www.springframework.org/schema/context classpath:/org/springframework/context/config/spring-context-3.2.xsd
                            http://www.springframework.org/schema/util classpath:/org/springframework/beans/factory/xml/spring-util-3.2.xsd"
 
-       default-init-method="initialize"
-       default-destroy-method="destroy">
+	default-init-method="initialize" default-destroy-method="destroy">
 
-    <context:property-placeholder location="file://${idp.home}/conf/idp.properties" />
+	<context:property-placeholder location="file://${idp.home}/conf/idp.properties" />
 
-    <import resource="authn-comparison.xml" />
-    <import resource="authn-flow-descriptors.xml" />
-     
+	<import resource="authn-comparison.xml" />
+	<import resource="authn-flow-descriptors.xml" />
+
+	<!-- Advance Configuration  
+	
+	   Attribute Resolver and Filter definitions from SVN 
+	   
+	   
+	   To use an SVN resource you need to construct it and then inject it into 
+	   The appropriate bean. To use property replacement you will need a separate 
+	   resource pointing to the replacement phrase. 
+		
+	   For example: 
+		
+	<bean id="AuthnMgr" class="org.tmatesoft.svn.core.auth.BasicAuthenticationManager">
+		<constructor-arg>
+			<null />
+		</constructor-arg>
+	</bean>
+	<bean id="ClientMgr" factory-method="newInstance"
+		class="org.tmatesoft.svn.core.wc.SVNClientManager"
+		p:authenticationManager-ref="AuthnMgr" />
+	<bean id="TheSVNURL" factory-method="create"
+		class="org.tmatesoft.svn.core.SVNURL">
+		<constructor-arg value="https" />
+		<constructor-arg>
+			<null />
+		</constructor-arg>
+		<constructor-arg value="svn.shibboleth.net" />
+		<constructor-arg value="-1" />
+		<constructor-arg
+			value="/utilities/spring-extensions/trunk/src/test/resources/data/" />
+		<constructor-arg value="false" />
+	</bean>
+	<bean id="TheSVNResource" class="net.shibboleth.ext.spring.resource.SVNResource">
+		<constructor-arg ref="ClientMgr" />
+		<constructor-arg ref="TheSVNURL" />
+		<constructor-arg value="D:/testdir/dir" />
+		<constructor-arg value="-1" />
+		<constructor-arg value="TestResource.txt" />
+	</bean>
+	
+	<util:list id="shibboleth.AttributeResolverResources">
+	   <ref bean="TheSVNResource"/>
+	   <value>path_to_properties_specifyingBean_file</value>
+	</util:list>
+	
+	 see also http://svnkit.com/javadoc/org/tmatesoft/svn/core/auth/BasicAuthenticationManager.html#constructor_detail 
+	          http://svnkit.com/javadoc/org/tmatesoft/svn/core/SVNURL.html 
+    -->
+
+	<bean id="shibboleth.AttributeResolverResources" class="java.util.Collections"
+		factory-method="singleton" c:_0="file://${idp.home}/conf/attribute-resolver.xml" /> 
+
+    <bean id="shibboleth.AttributeFilterResources" class="java.util.Collections"
+        factory-method="singleton" c:_0="file://${idp.home}/conf/attribute-filter.xml" /> 
+
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=5206&r1=5205&r2=5206&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)

[... 50 lines stripped ...]