[java-identity-provider] 02/51: IDP-2239 - Property-based control of view resolver order and activation

[Rod Widdowson]

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

rdw pushed a commit to branch dev/IDP-2147
in repository java-identity-provider.

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

commit 05b48389cefc9d04ab8487654042cd0bf2e4c287
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Feb 5 11:57:06 2024 -0500

    IDP-2239 - Property-based control of view resolver order and activation
    
    https://shibboleth.atlassian.net/browse/IDP-2239
    
    Add wiring for activation of Velocity view resolver.
    Add properties for ordering of Velocity and JSP.
---
 .../src/main/resources/net/shibboleth/idp/conf/mvc-beans.xml       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/mvc-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/mvc-beans.xml
index d29e2533a..7221301b1 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/mvc-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/mvc-beans.xml
@@ -83,8 +83,9 @@
         <property name="order" value="1" />
     </bean>
             
-    <bean id="shibboleth.VelocityViewResolver" class="net.shibboleth.shared.spring.velocity.VelocityViewResolver">
-        <property name="order" value="2" />
+    <bean id="shibboleth.VelocityViewResolver" class="net.shibboleth.shared.spring.velocity.VelocityViewResolver"
+            c:_0-ref="#{'%{idp.views.velocity.activationCondition:shibboleth.Conditions.TRUE}'.trim()}">
+        <property name="order" value="%{idp.views.velocity.order:2}" />
         <property name="cache" value="true"/>
         <property name="prefix" value=""/>
         <property name="suffix" value=".vm"/>
@@ -92,7 +93,7 @@
     </bean>
 
     <bean id="shibboleth.InternalViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-        <property name="order" value="3" />
+        <property name="order" value="%{idp.views.jsp.order:3}" />
         <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
         <property name="prefix" value="/WEB-INF/jsp/"/>
         <property name="suffix" value=".jsp"/>

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