Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 07:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "WN-5141"

Browse Source 
This reverts commit 4f9febb54d.
This commit is contained in:
jdyer1
2023-11-20 16:45:23 -06:00
committed by Lukasz Lenart
parent 3f2b8c526b
commit 8cd0dc9cc1
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/showcase/pom.xml
+1 -16
View File
@@ -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>
apps/showcase/src/main/webapp/WEB-INF/web.xml
+4 -4
View File
@@ -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>