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 5f2495d7dded43a5b3776c2081c10adae0ca710f Merge: 4e78fd7 5f006c1 Author: Lukasz Lenart <[email protected]> AuthorDate: Sat Oct 4 10:58:32 2025 +0200 Merge pull request #461 from apache/feature/sitemesh3-upload Integrates upload example with Sitemesh 3 sitemesh3/pom.xml | 21 +++----- .../struts/examples/sitemesh3/UploadAction.java | 60 ++++++++++++++++++++++ sitemesh3/src/main/resources/log4j2.xml | 4 +- sitemesh3/src/main/resources/struts.xml | 3 ++ sitemesh3/src/main/webapp/WEB-INF/admin/hello.jsp | 3 +- sitemesh3/src/main/webapp/WEB-INF/admin/index.jsp | 3 +- .../main/webapp/WEB-INF/decorators/decorator.html | 2 +- .../main/webapp/WEB-INF/decorators/decorator1.html | 2 +- .../main/webapp/WEB-INF/decorators/decorator2.html | 2 +- .../{decorator2.html => upload-decorator.html} | 4 +- sitemesh3/src/main/webapp/WEB-INF/hello1.jsp | 1 + sitemesh3/src/main/webapp/WEB-INF/hello2.jsp | 3 +- sitemesh3/src/main/webapp/WEB-INF/index.jsp | 2 + sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml | 1 + sitemesh3/src/main/webapp/WEB-INF/upload.jsp | 30 +++++++++++ sitemesh3/src/main/webapp/WEB-INF/web.xml | 4 +- sitemesh3/src/main/webapp/index.html | 10 ---- 17 files changed, 118 insertions(+), 37 deletions(-)
