You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2024/11/14 12:23:23 UTC
(struts-examples) branch master updated (41778a9 -> f6dcf44)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
from 41778a9 Merge pull request #376 from apache/dependabot/maven/rest-angular/org.springframework-spring-web-6.1.12
add 93a874c Adds simple example with Sitemesh3 integration
new f6dcf44 Merge pull request #377 from apache/feature/sitemesh3
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 1 +
sitemesh3/README.md | 6 +++
{tiles => sitemesh3}/pom.xml | 10 ++---
.../src/main/resources/DefaultMessages.properties | 0
.../main/resources/DefaultMessages_es.properties | 0
{tiles => sitemesh3}/src/main/resources/log4j2.xml | 0
sitemesh3/src/main/resources/struts.xml | 22 +++++++++++
.../main/webapp/WEB-INF/decorators/decorator.html | 9 +++++
.../src/main/webapp/WEB-INF/hello.jsp | 17 ++++++---
sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml | 3 ++
sitemesh3/src/main/webapp/WEB-INF/web.xml | 44 ++++++++++++++++++++++
{blank => sitemesh3}/src/main/webapp/index.html | 0
12 files changed, 101 insertions(+), 11 deletions(-)
create mode 100644 sitemesh3/README.md
copy {tiles => sitemesh3}/pom.xml (89%)
copy tiles/src/main/resources/org/demo/example/package.properties => sitemesh3/src/main/resources/DefaultMessages.properties (100%)
copy tiles/src/main/resources/org/demo/example/package_es.properties => sitemesh3/src/main/resources/DefaultMessages_es.properties (100%)
copy {tiles => sitemesh3}/src/main/resources/log4j2.xml (100%)
create mode 100644 sitemesh3/src/main/resources/struts.xml
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/decorators/decorator.html
copy tiles/src/main/webapp/example/HelloWorld.jsp => sitemesh3/src/main/webapp/WEB-INF/hello.jsp (61%)
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/web.xml
copy {blank => sitemesh3}/src/main/webapp/index.html (100%)
(struts-examples) 01/01: Merge pull request #377 from apache/feature/sitemesh3
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
commit f6dcf446119a28739760d91b6810266a516d55fd
Merge: 41778a9 93a874c
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Thu Nov 14 13:23:17 2024 +0100
Merge pull request #377 from apache/feature/sitemesh3
Adds simple example with Sitemesh3 integration
pom.xml | 1 +
sitemesh3/README.md | 6 ++
sitemesh3/pom.xml | 69 ++++++++++++++++++++++
.../src/main/resources/DefaultMessages.properties | 5 ++
.../main/resources/DefaultMessages_es.properties | 5 ++
sitemesh3/src/main/resources/log4j2.xml | 14 +++++
sitemesh3/src/main/resources/struts.xml | 22 +++++++
.../main/webapp/WEB-INF/decorators/decorator.html | 9 +++
sitemesh3/src/main/webapp/WEB-INF/hello.jsp | 27 +++++++++
sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml | 3 +
sitemesh3/src/main/webapp/WEB-INF/web.xml | 44 ++++++++++++++
sitemesh3/src/main/webapp/index.html | 10 ++++
12 files changed, 215 insertions(+)