This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
from 3a08c1094 Merge pull request #1067 from
apache/feature/WW-5465-attributes
add ce71dab1d WW-5472 Removes Struts Sitemesh plugin
add 954453b66 Merge pull request #1077 from
apache/feature/WW-5472-remove-sitemesh
No new revisions were added by this update.
Summary of changes:
apps/showcase/pom.xml | 28 +-
.../src/main/webapp/WEB-INF/decorators.xml | 36 ---
.../src/main/webapp/WEB-INF/decorators/main.jsp | 9 +-
.../src/main/webapp/WEB-INF/sitemesh-decorator.tld | 99 ------
.../src/main/webapp/WEB-INF/sitemesh-page.tld | 115 -------
apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml | 75 -----
.../showcase/src/main/webapp/WEB-INF/sitemesh3.xml | 10 +-
apps/showcase/src/main/webapp/WEB-INF/web.xml | 11 +-
assembly/pom.xml | 5 +-
assembly/src/main/assembly/all.xml | 11 -
assembly/src/main/assembly/apps.xml | 7 -
assembly/src/main/assembly/docs.xml | 4 -
assembly/src/main/assembly/lib.xml | 7 -
bom/pom.xml | 5 -
jakarta/pom.xml | 1 -
jakarta/sitemesh2-jakarta/README.md | 4 -
jakarta/sitemesh2-jakarta/pom.xml | 69 -----
plugins/pom.xml | 1 -
plugins/sitemesh/README.md | 2 -
plugins/sitemesh/pom.xml | 62 ----
.../sitemesh/FreemarkerDecoratorServlet.java | 333 ---------------------
.../FreemarkerMapper2DecoratorSelector.java | 56 ----
.../struts2/sitemesh/FreemarkerPageFilter.java | 65 ----
.../struts2/sitemesh/NoneDecoratorMapper.java | 39 ---
.../sitemesh/OldDecorator2NewStrutsDecorator.java | 204 -------------
.../OldDecorator2NewStrutsFreemarkerDecorator.java | 101 -------
.../OldDecorator2NewStrutsVelocityDecorator.java | 101 -------
.../struts2/sitemesh/StrutsSiteMeshFactory.java | 55 ----
.../struts2/sitemesh/VelocityDecoratorServlet.java | 196 ------------
.../sitemesh/VelocityMapper2DecoratorSelector.java | 58 ----
.../struts2/sitemesh/VelocityPageFilter.java | 55 ----
plugins/sitemesh/src/main/resources/LICENSE.txt | 174 -----------
plugins/sitemesh/src/main/resources/NOTICE.txt | 8 -
.../src/main/resources/SITEMESH-LICENSE.txt | 51 ----
.../sitemesh/src/main/resources/struts-plugin.xml | 30 --
plugins/sitemesh/src/site/site.xml | 56 ----
pom.xml | 14 +-
37 files changed, 36 insertions(+), 2121 deletions(-)
delete mode 100644 apps/showcase/src/main/webapp/WEB-INF/decorators.xml
delete mode 100644 apps/showcase/src/main/webapp/WEB-INF/sitemesh-decorator.tld
delete mode 100644 apps/showcase/src/main/webapp/WEB-INF/sitemesh-page.tld
delete mode 100644 apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml
copy core/src/main/resources/author.dtd =>
apps/showcase/src/main/webapp/WEB-INF/sitemesh3.xml (70%)
delete mode 100644 jakarta/sitemesh2-jakarta/README.md
delete mode 100644 jakarta/sitemesh2-jakarta/pom.xml
delete mode 100644 plugins/sitemesh/README.md
delete mode 100644 plugins/sitemesh/pom.xml
delete mode 100644
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java
delete mode 100644
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerMapper2DecoratorSelector.java
delete mode 100644
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java
delete mode 100644
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java
delete mode 100644
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java
delete mode 100644
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java
delete mode 100644
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
delete mode 100644
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/StrutsSiteMeshFactory.java
delete mode 100644
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
delete mode 100644
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityMapper2DecoratorSelector.java
delete mode 100644
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
delete mode 100644 plugins/sitemesh/src/main/resources/LICENSE.txt
delete mode 100644 plugins/sitemesh/src/main/resources/NOTICE.txt
delete mode 100644 plugins/sitemesh/src/main/resources/SITEMESH-LICENSE.txt
delete mode 100644 plugins/sitemesh/src/main/resources/struts-plugin.xml
delete mode 100644 plugins/sitemesh/src/site/site.xml
