Keep velocity from writting log files wherever the application starts up

Simplify velocity engine configuration in IdP

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2388 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/resources/conf/internal.xml b/resources/conf/internal.xml
index 9c1cab3..61f9da0 100644 (file)
--- a/resources/conf/internal.xml
+++ b/resources/conf/internal.xml
@@ -21,19 +21,7 @@
         <constructor-arg value="SHA1PRNG" />
     </bean>
 
-    <bean id="shibboleth.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>
+    <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean" />
 
     <bean id="shibboleth.TemplateEngine"
         class="edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.TemplateEngine">

diff --git a/test/data/conf1/internal.xml b/test/data/conf1/internal.xml
index 09fe940..2978b1f 100644 (file)
--- a/test/data/conf1/internal.xml
+++ b/test/data/conf1/internal.xml
@@ -21,20 +21,8 @@
         <constructor-arg value="SHA1PRNG" />
     </bean>
 
-    <bean id="shibboleth.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>
-
+    <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean" />
+    
     <bean id="shibboleth.TemplateEngine"
         class="edu.internet2.middleware.shibboleth.common.attribute.resolver.provider.dataConnector.TemplateEngine">
         <constructor-arg ref="shibboleth.VelocityEngine" />