[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jul  9 20:41:14 2014
New Revision: 6265

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6265&view=rev
Log:
IDP-436: switch to a syntax that enables the Spring Velocity resource loader, which handles classpath:/views

Modified:
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml?rev=6265&r1=6264&r2=6265&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml Wed Jul  9 20:41:14 2014
@@ -49,15 +49,12 @@
     <!-- ViewResolvers -->
     
     <bean id="shibboleth.VelocityConfig" class="org.springframework.web.servlet.view.velocity.VelocityConfigurer">
+        <property name="resourceLoaderPath" value="%{idp.home}/views" />
         <property name="velocityProperties">
             <props>
                 <prop key="runtime.log.logsystem.class">net.shibboleth.utilities.java.support.velocity.SLF4JLogChute</prop>
                 <prop key="input.encoding">UTF-8</prop>
                 <prop key="output.encoding">UTF-8</prop>
-                <prop key="resource.loader">file</prop>
-                <prop key="file.resource.loader.class">org.apache.velocity.runtime.resource.loader.FileResourceLoader</prop>
-                <prop key="file.resource.loader.path">%{idp.home}/views</prop>
-                <prop key="file.resource.loader.cache">false</prop>
             </props>
         </property>
     </bean>