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

[noreply at shibboleth.net]

Author: scantor
Date: Fri May 29 20:33:00 2015
New Revision: 7539

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7539&view=rev
Log:
IDP-730 - add trim to view location

Modified:
    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/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=7539&r1=7538&r2=7539&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 May 29 20:33:00 2015
@@ -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.views:%{idp.home}/views}</prop>
+                <prop key="file.resource.loader.path">#{ '%{idp.views:%{idp.home}/views}'.trim() }</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=7539&r1=7538&r2=7539&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	Fri May 29 20:33:00 2015
@@ -49,7 +49,7 @@
     <!-- ViewResolvers -->
     
     <bean id="shibboleth.VelocityConfig" class="org.springframework.web.servlet.view.velocity.VelocityConfigurer">
-        <property name="resourceLoaderPath" value="%{idp.views:%{idp.home}/views},%{idp.home}/system/views" />
+        <property name="resourceLoaderPath" value="#{'%{idp.views:%{idp.home}/views}'.trim()},%{idp.home}/system/views" />
         <property name="velocityProperties">
             <props>
                 <prop key="runtime.log.logsystem.class">net.shibboleth.utilities.java.support.velocity.SLF4JLogChute</prop>