From b372ac9e9aaa173fe1391f52d8cd516e05a434dc Mon Sep 17 00:00:00 2001
From: jdyer1 <jdyer@apache.org>
Date: Mon, 20 Nov 2023 16:56:38 -0600
Subject: [PATCH] WN-5141

- velocity and struts showcase
---
 apps/showcase/pom.xml                         | 17 ++++++++++++++++-
 apps/showcase/src/main/webapp/WEB-INF/web.xml |  8 ++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 29a675705..93ef94077 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -170,6 +170,16 @@
                         <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>
@@ -224,7 +234,12 @@
                     <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</extraClasspath>
+                      <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>
                       <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 f57fa4682..c9181525c 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>