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 4e78fd7 Merge pull request #491 from
apache/dependabot/maven/org.jfree-jfreechart-1.5.6
add 5f006c1 Integrates upload example with Sitemesh 3
new 5f2495d Merge pull request #461 from apache/feature/sitemesh3-upload
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:
sitemesh3/pom.xml | 21 ++++++---------------
.../struts/examples/sitemesh3}/UploadAction.java | 4 +---
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 +-
.../{decorator.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 +
.../src/main/webapp/WEB-INF/upload.jsp | 8 ++++----
sitemesh3/src/main/webapp/WEB-INF/web.xml | 4 ++--
sitemesh3/src/main/webapp/index.html | 10 ----------
17 files changed, 33 insertions(+), 44 deletions(-)
copy {file-upload/src/main/java/org/apache/struts/example =>
sitemesh3/src/main/java/org/apache/struts/examples/sitemesh3}/UploadAction.java
(95%)
copy sitemesh3/src/main/webapp/WEB-INF/decorators/{decorator.html =>
upload-decorator.html} (79%)
copy {file-upload => sitemesh3}/src/main/webapp/WEB-INF/upload.jsp (80%)
delete mode 100644 sitemesh3/src/main/webapp/index.html
