This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
from b2ed942 Merge pull request #405 from apache/feature/struts7
add 30033a6 Extends example with Sitemesh 3 to support multiple decorators
new 6889ad2 Merge pull request #389 from
apache/feature/multiple-decorators
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:
.../struts/examples/sitemesh3/HelloAction.java | 43 ++++++++++++++++++++++
sitemesh3/src/main/resources/struts.xml | 14 ++++---
.../main/webapp/WEB-INF/decorators/decorator.html | 3 +-
.../decorators/{decorator.html => decorator1.html} | 3 +-
.../decorators/{decorator.html => decorator2.html} | 3 +-
sitemesh3/src/main/webapp/WEB-INF/error.jsp | 16 ++++++++
sitemesh3/src/main/webapp/WEB-INF/hello.jsp | 27 --------------
sitemesh3/src/main/webapp/WEB-INF/hello1.jsp | 18 +++++++++
sitemesh3/src/main/webapp/WEB-INF/hello2.jsp | 18 +++++++++
sitemesh3/src/main/webapp/WEB-INF/index.jsp | 14 +++++++
sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml | 5 ++-
sitemesh3/src/main/webapp/index.html | 2 +-
12 files changed, 128 insertions(+), 38 deletions(-)
create mode 100644
sitemesh3/src/main/java/org/apache/struts/examples/sitemesh3/HelloAction.java
copy sitemesh3/src/main/webapp/WEB-INF/decorators/{decorator.html =>
decorator1.html} (84%)
copy sitemesh3/src/main/webapp/WEB-INF/decorators/{decorator.html =>
decorator2.html} (84%)
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/error.jsp
delete mode 100644 sitemesh3/src/main/webapp/WEB-INF/hello.jsp
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/hello1.jsp
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/hello2.jsp
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/index.jsp
