From 8cd0dc9cc165a239db73c06c42785b9a96ddda97 Mon Sep 17 00:00:00 2001
From: jdyer1 <jdyer@apache.org>
Date: Mon, 20 Nov 2023 16:45:23 -0600
Subject: [PATCH] Revert "WN-5141"

This reverts commit 4f9febb54dcdc2dd21556f8fc14fa35bbb1641f5.
---
 apps/showcase/pom.xml                         | 17 +----------------
 apps/showcase/src/main/webapp/WEB-INF/web.xml |  8 ++++----
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 93ef94077..29a675705 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -170,16 +170,6 @@
                         <artifactId>struts2-sitemesh2-jakarta</artifactId>
                         <destFileName>struts2-sitemesh2-jakarta.jar</destFileName>
                       </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-velocity-tools-view-jakarta</artifactId>
-                        <destFileName>struts2-velocity-tools-view-jakarta.jar</destFileName>
-                      </artifactItem>
-                      <artifactItem>
-                        <groupId>org.apache.struts</groupId>
-                        <artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
-                        <destFileName>struts2-velocity-tools-jsp-jakarta.jar</destFileName>
-                      </artifactItem>
                     </artifactItems>
                     <overWriteReleases>false</overWriteReleases>
                     <overWriteSnapshots>false</overWriteSnapshots>
@@ -234,12 +224,7 @@
                     <scanIntervalSeconds>10</scanIntervalSeconds>
                     <webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
                     <webApp>                      
-                      <extraClasspath>
-                        ${project.build.directory}/extraclasspath/struts2-freemarker-jakarta.jar,
-                        ${project.build.directory}/extraclasspath/struts2-sitemesh2-jakarta.jar,
-                        ${project.build.directory}/extraclasspath/struts2-velocity-tools-view-jakarta.jar,
-                        ${project.build.directory}/extraclasspath/struts2-velocity-tools-jsp-jakarta
-                      </extraClasspath>
+                      <extraClasspath>${project.build.directory}/extraclasspath/struts2-freemarker-jakarta.jar,${project.build.directory}/extraclasspath/struts2-sitemesh2-jakarta.jar</extraClasspath>
                       <contextPath>/struts2-showcase</contextPath>
                       <descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
                     </webApp>
diff --git a/apps/showcase/src/main/webapp/WEB-INF/web.xml b/apps/showcase/src/main/webapp/WEB-INF/web.xml
index c9181525c..f57fa4682 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/web.xml
+++ b/apps/showcase/src/main/webapp/WEB-INF/web.xml
@@ -122,7 +122,7 @@
         <load-on-startup>3</load-on-startup>
     </servlet>
 
-    <servlet>
+    <!-- servlet>
         <servlet-name>sitemesh-velocity</servlet-name>
         <servlet-class>org.apache.struts2.sitemesh.VelocityDecoratorServlet</servlet-class>
         <init-param>
@@ -130,7 +130,7 @@
             <param-value>UTF-8</param-value>
         </init-param>
         <load-on-startup>4</load-on-startup>
-    </servlet>
+    </servlet-->
 
     <servlet>
         <servlet-name>testServlet</servlet-name>
@@ -142,10 +142,10 @@
         <url-pattern>*.ftl</url-pattern>
     </servlet-mapping>
 
-    <servlet-mapping>
+    <!-- servlet-mapping>
         <servlet-name>sitemesh-velocity</servlet-name>
         <url-pattern>*.vm</url-pattern>
-    </servlet-mapping>
+    </servlet-mapping-->
 
     <servlet-mapping>
         <servlet-name>strutsServlet</servlet-name>