[java-identity-provider] branch master updated: IDP-1406 - Expose more Velocity Engine options

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=32b53d1477467408c69223fa290d71d76cfd6cdf

The following commit(s) were added to refs/heads/master by this push:
       new  32b53d1   IDP-1406 - Expose more Velocity Engine options
32b53d1 is described below

commit 32b53d1477467408c69223fa290d71d76cfd6cdf
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Dec 19 09:11:46 2019 -0500

    IDP-1406 - Expose more Velocity Engine options
    
    https://issues.shibboleth.net/jira/browse/IDP-1406
---
 .../main/resources/system/conf/global-system.xml   | 31 +++++++++-------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/idp-conf/src/main/resources/system/conf/global-system.xml b/idp-conf/src/main/resources/system/conf/global-system.xml
index 48b309f..4c15895 100644
--- a/idp-conf/src/main/resources/system/conf/global-system.xml
+++ b/idp-conf/src/main/resources/system/conf/global-system.xml
@@ -88,26 +88,19 @@
         </property>
     </bean>
 
+    <util:map id="shibboleth.DefaultVelocityEngineProperties">
+        <entry key="parser.space_gobbling" value="%{idp.velocity.space.gobbling:bc}" />
+        <entry key="resource.loaders" value="file, classpath, string" />
+        <entry key="resource.loader.classpath.class" value="org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader" />
+        <entry key="resource.loader.string.class" value="org.apache.velocity.runtime.resource.loader.StringResourceLoader" />
+        <entry key="resource.loader.file.class" value="org.apache.velocity.runtime.resource.loader.FileResourceLoader" />
+        <entry key="resource.loader.file.path" value="#{'%{idp.views:%{idp.home}/views}'.trim()}" />
+        <entry key="resource.loader.file.cache" value="false" />
+    </util:map>
+
     <bean id="shibboleth.VelocityEngine" class="net.shibboleth.ext.spring.velocity.VelocityEngineFactoryBean"
-            depends-on="shibboleth.LoggingService">
-        <property name="velocityProperties">
-            <props>
-                <prop key="parser.space_gobbling">%{idp.velocity.space.gobbling:bc}</prop>
-                <prop key="resource.loaders">file, classpath, string</prop>
-                <prop key="resource.loader.classpath.class">
-                    org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
-                </prop>
-                <prop key="resource.loader.string.class">
-                    org.apache.velocity.runtime.resource.loader.StringResourceLoader
-                </prop>
-                <prop key="resource.loader.file.class">
-                    org.apache.velocity.runtime.resource.loader.FileResourceLoader
-                </prop>
-                <prop key="resource.loader.file.path">#{'%{idp.views:%{idp.home}/views}'.trim()}</prop>
-                <prop key="resource.loader.file.cache">false</prop>
-            </props>
-        </property>
-    </bean>
+        depends-on="shibboleth.LoggingService"
+        p:velocityPropertiesMap="#{getObject('shibboleth.VelocityEngineProperties') ?: getObject('shibboleth.DefaultVelocityEngineProperties')}" />
 
     <alias name="%{idp.xml.parserPool:shibboleth.DefaultParserPool}" alias="shibboleth.ParserPool"/>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.