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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov  3 19:15:49 2015
New Revision: 7926

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7926&view=rev
Log:
IDP-817 - New ViewResolver configuration

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

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=7926&r1=7925&r2=7926&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	Tue Nov  3 19:15:49 2015
@@ -57,7 +57,27 @@
             
     <!-- ViewResolvers -->
     
-    <bean id="shibboleth.VelocityConfig" class="org.springframework.web.servlet.view.velocity.VelocityConfigurer">
+    <bean class="org.springframework.web.servlet.view.BeanNameViewResolver">
+        <property name="order" value="1" />
+    </bean>
+            
+    <bean id="shibboleth.VelocityViewResolver" class="org.springframework.web.servlet.view.velocity.VelocityViewResolver">
+        <property name="order" value="2" />
+        <property name="cache" value="true"/>
+        <property name="prefix" value=""/>
+        <property name="suffix" value=".vm"/>
+        <property name="contentType" value="text/html;charset=utf-8" />
+    </bean>
+
+    <bean id="shibboleth.InternalViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="order" value="3" />
+        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
+        <property name="prefix" value="/WEB-INF/jsp/"/>
+        <property name="suffix" value=".jsp"/>
+        <property name="contentType" value="text/html;charset=utf-8" />
+    </bean>
+
+    <bean class="org.springframework.web.servlet.view.velocity.VelocityConfigurer">
         <property name="resourceLoaderPath" value="#{'%{idp.views:%{idp.home}/views}'.trim()},%{idp.home}/system/views" />
         <property name="velocityProperties">
             <props>
@@ -67,20 +87,6 @@
             </props>
         </property>
     </bean>
-    
-    <bean id="shibboleth.VelocityViewResolver" class="org.springframework.web.servlet.view.velocity.VelocityViewResolver">
-        <property name="cache" value="true"/>
-        <property name="prefix" value=""/>
-        <property name="suffix" value=".vm"/>
-        <property name="contentType" value="text/html;charset=utf-8" />
-    </bean>
-
-    <bean id="shibboleth.InternalViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
-        <property name="prefix" value="/WEB-INF/jsp/"/>
-        <property name="suffix" value=".jsp"/>
-        <property name="contentType" value="text/html;charset=utf-8" />
-    </bean>
 
     <!-- Import any user defined beans or overrides for the MVC config. -->
     <import resource="../../conf/mvc-beans.xml" />