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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug  4 11:09:22 2014
New Revision: 6387

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6387&view=rev
Log:
Add property for Velocity view location.

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

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6387&r1=6386&r2=6387&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Aug  4 11:09:22 2014
@@ -5,6 +5,9 @@
 
 # Set the entityID of the IdP
 idp.entityID = https://idp.example.org
+
+# Set the location of Velocity view templates
+#idp.views = %{idp.home}/views
 
 # Settings for internal AES encryption key
 #idp.sealer.storeType = JCEKS

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=6387&r1=6386&r2=6387&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 Mon Aug  4 11:09:22 2014
@@ -72,7 +72,7 @@
                 <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.path">%{idp.views:%{idp.home}/views}</prop>
                 <prop key="file.resource.loader.cache">false</prop>
             </props>
         </property>

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=6387&r1=6386&r2=6387&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 Mon Aug  4 11:09:22 2014
@@ -49,7 +49,7 @@
     <!-- ViewResolvers -->
     
     <bean id="shibboleth.VelocityConfig" class="org.springframework.web.servlet.view.velocity.VelocityConfigurer">
-        <property name="resourceLoaderPath" value="%{idp.home}/views" />
+        <property name="resourceLoaderPath" value="%{idp.views:%{idp.home}/views}" />
         <property name="velocityProperties">
             <props>
                 <prop key="runtime.log.logsystem.class">net.shibboleth.utilities.java.support.velocity.SLF4JLogChute</prop>