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 df87211 Merge pull request #447 from fp024/dev-2025-04-17-a
add ad0de21 Adjusts file upload example to action based upload
new 3780310 Merge pull request #456 from apache/fix/file-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:
file-upload/pom.xml | 4 +---
.../example/{Upload.java => UploadAction.java} | 26 +++++++++++++---------
file-upload/src/main/resources/struts.xml | 13 +++++++----
.../main/webapp/WEB-INF/{upload.jsp => input.jsp} | 12 ++--------
file-upload/src/main/webapp/WEB-INF/upload.jsp | 13 +++++------
file-upload/src/main/webapp/WEB-INF/web.xml | 8 ++++---
file-upload/src/main/webapp/index.html | 10 ---------
sitemesh3/pom.xml | 4 ++++
sitemesh3/src/main/resources/struts.xml | 12 +++++++++-
.../webapp/WEB-INF/{error.jsp => admin/hello.jsp} | 10 ++++-----
.../src/main/webapp/WEB-INF/{ => admin}/index.jsp | 6 ++---
11 files changed, 60 insertions(+), 58 deletions(-)
rename file-upload/src/main/java/org/apache/struts/example/{Upload.java =>
UploadAction.java} (65%)
copy file-upload/src/main/webapp/WEB-INF/{upload.jsp => input.jsp} (51%)
delete mode 100644 file-upload/src/main/webapp/index.html
copy sitemesh3/src/main/webapp/WEB-INF/{error.jsp => admin/hello.jsp} (56%)
copy sitemesh3/src/main/webapp/WEB-INF/{ => admin}/index.jsp (56%)
