[struts] 03/04: WW-5190 Uses proper order of servlets and filters

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-5190-match-action-proxy
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 8c37b1523ff22cbe6b5570a04b743493fc270127
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Wed Jun 22 07:58:12 2022 +0200

    WW-5190 Uses proper order of servlets and filters
---
 apps/showcase/src/main/resources/struts-dispatcher.xml |  4 ++--
 apps/showcase/src/main/webapp/WEB-INF/web.xml          | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/showcase/src/main/resources/struts-dispatcher.xml 
b/apps/showcase/src/main/resources/struts-dispatcher.xml
index 659b3f235..0a89502fe 100644
--- a/apps/showcase/src/main/resources/struts-dispatcher.xml
+++ b/apps/showcase/src/main/resources/struts-dispatcher.xml
@@ -20,8 +20,8 @@
  */
 -->
 <!DOCTYPE struts PUBLIC
-        "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
-        "http://struts.apache.org/dtds/struts-6.0.dtd";>
+        "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+        "http://struts.apache.org/dtds/struts-2.5.dtd";>
 
 <struts>
     <package name="dispatcher" extends="struts-default" 
namespace="/dispatcher">
diff --git a/apps/showcase/src/main/webapp/WEB-INF/web.xml 
b/apps/showcase/src/main/webapp/WEB-INF/web.xml
index 7be91e345..8350128df 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/web.xml
+++ b/apps/showcase/src/main/webapp/WEB-INF/web.xml
@@ -111,6 +111,13 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
 
+    <servlet>
+        <servlet-name>strutsServlet</servlet-name>
+        
<servlet-class>org.apache.struts2.dispatcher.servlet.StrutsServlet</servlet-class>
+        <load-on-startup>2</load-on-startup>
+        <async-supported>true</async-supported>
+    </servlet>
+
     <!-- Sitemesh Freemarker and Velocity Decorator Servlets. Shares 
configuration with Struts.-->
     <servlet>
         <servlet-name>sitemesh-freemarker</servlet-name>
@@ -119,7 +126,7 @@
             <param-name>default_encoding</param-name>
             <param-value>UTF-8</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
+        <load-on-startup>3</load-on-startup>
     </servlet>
 
     <servlet>
@@ -129,14 +136,7 @@
             <param-name>default_encoding</param-name>
             <param-value>UTF-8</param-value>
         </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>strutsServlet</servlet-name>
-        
<servlet-class>org.apache.struts2.dispatcher.servlet.StrutsServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-        <async-supported>true</async-supported>
+        <load-on-startup>4</load-on-startup>
     </servlet>
 
     <servlet-mapping>