Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WW-5472 Removes Struts Sitemesh plugin #1077

Merged
merged 1 commit into from
Oct 20, 2024
Merged

WW-5472 Removes Struts Sitemesh plugin #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions apps/showcase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@
<artifactId>struts2-config-browser-plugin</artifactId>
</dependency>

<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-sitemesh-plugin</artifactId>
</dependency>

<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-tiles-plugin</artifactId>
Expand Down Expand Up @@ -126,9 +121,9 @@
</dependency>

<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-sitemesh2-jakarta</artifactId>
<version>${project.version}</version>
<groupId>org.sitemesh</groupId>
<artifactId>sitemesh</artifactId>
<version>3.2.1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -156,6 +151,17 @@
<version>${hibernate-validator.version}</version>
</dependency>

<!--
Nashorn (the built-in JDK javascript engine) was deprecated in JDK 11 and removed in JDK 15
As a result attempting to use @ScriptAssert on JDK 17 leads to the exception
See more details
https://stackoverflow.com/questions/78008950/resolve-org-hibernate-validator-spi-scripting-scriptevaluatornotfoundexception
-->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-jsr223</artifactId>
<version>3.0.22</version>
</dependency>
</dependencies>

<build>
Expand All @@ -174,11 +180,6 @@
<configuration>
<outputDirectory>${project.build.directory}/extraclasspath</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.struts</groupId>
<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>
Expand Down Expand Up @@ -244,7 +245,6 @@
<webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
<webApp>
<extraClasspath>
${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>
Expand Down
9 changes: 3 additions & 6 deletions apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@
sourceUrl += "?page=" + request.getServletPath();
}
%>
<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %>
<%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %>
<%@taglib prefix="s" uri="/struts-tags" %>

<html lang="en">
Expand All @@ -61,7 +59,7 @@
<meta name="description" content="Struts2 Showcase for Apache Struts Project">
<meta name="author" content="The Apache Software Foundation">

<title><decorator:title default="Struts2 Showcase"/></title>
<title><sitemesh:write property="title"/></title>

<s:url var="bootstrapCss" value='/styles/bootstrap.css' encode='false' includeParams='none'/>
<s:link href="%{bootstrapCss}" rel="stylesheet" type="text/css" media="all"/>
Expand Down Expand Up @@ -94,7 +92,7 @@
<s:script>
jQuery(document).ready(function() { prettyPrint(); } );
</s:script>
<decorator:head/>
<sitemesh:write property="head"/>
</head>

<body id="page-home">
Expand Down Expand Up @@ -286,8 +284,7 @@
</div>
</nav>

<decorator:body/>

<sitemesh:write property="body"/>

<hr>

Expand Down
99 changes: 0 additions & 99 deletions apps/showcase/src/main/webapp/WEB-INF/sitemesh-decorator.tld
View file
Open in desktop

This file was deleted.

115 changes: 0 additions & 115 deletions apps/showcase/src/main/webapp/WEB-INF/sitemesh-page.tld
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml
View file
Open in desktop

This file was deleted.

Loading
Loading