[java-identity-provider COMMIT] /trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/...

[noreply at shibboleth.net]

Author: dfisher
Date: Thu Sep  5 00:03:14 2013
New Revision: 4750

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4750&view=rev
Log:
Resuse the velocity configuration in velocity.xml.

Modified:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring.xml

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring.xml?rev=4750&r1=4749&r2=4750&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring.xml Thu Sep  5 00:03:14 2013
@@ -76,21 +76,9 @@
         </bean>
         <bean class="net.shibboleth.idp.attribute.resolver.impl.dc.ldap.TemplatedExecutableSearchFilterBuilder"
               p:templateText="(uid=${recipientContext.principal})"
-              p:velocityEngine-ref="ldap.VelocityEngine"
+              p:velocityEngine-ref="shibboleth.VelocityEngine"
               init-method="initialize" />
-        <bean id="ldap.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
-	      <property name="velocityProperties">
-	        <props>
-	          <prop key="resource.loader">classpath, string</prop>
-	          <prop key="classpath.resource.loader.class">
-	            org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
-	          </prop>
-	          <prop key="string.resource.loader.class">
-	            org.apache.velocity.runtime.resource.loader.StringResourceLoader
-	          </prop>
-	        </props>
-	      </property>
-        </bean>
+        <import resource="classpath:/net/shibboleth/idp/attribute/resolver/spring/velocity.xml"/>
       </beans>
     </resolver:DataConnector>    
 </resolver:AttributeResolver>