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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jul 18 12:40:06 2014
New Revision: 6307

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6307&view=rev
Log:
IDP-70: put file loading support back into the velocity bean used by message encoders

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

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=6307&r1=6306&r2=6307&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Fri Jul 18 12:40:06 2014
@@ -60,13 +60,18 @@
                 </prop>
                 <prop key="input.encoding">UTF-8</prop>
                 <prop key="output.encoding">UTF-8</prop>
-                <prop key="resource.loader">classpath, string</prop>
+                <prop key="resource.loader">file, 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>
+                <prop key="file.resource.loader.class">
+                    org.apache.velocity.runtime.resource.loader.FileResourceLoader
+                </prop>
+                <prop key="file.resource.loader.path">%{idp.home}</prop>
+                <prop key="file.resource.loader.cache">false</prop>
             </props>
         </property>
     </bean>