This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
commit 6889ad2e99fc2429bffe0328ae6352a82c8a6e80
Merge: b2ed942 30033a6
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Fri Dec 20 06:58:28 2024 +0100
Merge pull request #389 from apache/feature/multiple-decorators
Sitemesh 3: multiple decorators
.../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(-)
