This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
from 77acd665e Merge pull request #851 from
sepe81/feature/upgrade-maven-to-3.9.6
add 8c161f431 WW-5388 Uses the latest JakartaEE FileUpload Servlet 6
package Also refactors the Jakarta based parsers as they have a lot in common
add b68b6ab7c WW-5388 Updates tests to match new logic
add ac9b9ad89 WW-5388 Simplifies code
add c37a6edb6 WW-5388 Avoids unconditional invocations of method in logs
add 3294ed08d WW-5388 Adds tests per each Jakarta parser
add d07792a40 WW-5388 Drops unused defaultLocale
add 51bf8de71 WW-5388 Uses temp directory to avoid problems on Jenkins
add e635b5973 WW-5388 Test multi-files and fields
add e2215c852 WW-5388 Introduces new constant to allow control max number
of files
add d024ccdd5 WW-5388 Extracts method to read charset
add e9e3c0a25 WW-5388 Adds dedicated integration test to cover max size
upload
add 84d350dac Merge pull request #861 from
apache/feature/WW-5388-upload-servlet6
No new revisions were added by this update.
Summary of changes:
.../showcase/fileupload/FileUploadAction.java | 5 +-
.../src/main/resources/struts-fileupload.xml | 3 +
.../webapp/WEB-INF/fileupload/upload-success.jsp | 3 +-
.../apache/struts2/showcase/FileUploadTest.java | 45 +-
core/pom.xml | 6 +-
.../java/org/apache/struts2/StrutsConstants.java | 19 +-
.../apache/struts2/action/UploadedFilesAware.java | 3 +-
.../struts2/config/entities/ConstantConfig.java | 10 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 19 +-
.../multipart/AbstractMultiPartRequest.java | 284 ++++++++++--
.../multipart/JakartaMultiPartRequest.java | 389 +++-------------
.../multipart/JakartaStreamMultiPartRequest.java | 505 ++++++---------------
.../dispatcher/multipart/MultiPartRequest.java | 4 +-
.../multipart/MultiPartRequestWrapper.java | 4 +-
.../dispatcher/multipart/StrutsUploadedFile.java | 11 +-
.../struts2/dispatcher/multipart/UploadedFile.java | 30 +-
.../interceptor/ActionFileUploadInterceptor.java | 7 +-
.../org/apache/struts2/config/SettingsTest.java | 4 +-
.../multipart/AbstractMultiPartRequestTest.java | 485 ++++++++++++++++++++
.../multipart/JakartaMultiPartRequestTest.java} | 12 +-
.../JakartaStreamMultiPartRequestTest.java | 83 ++--
.../ActionFileUploadInterceptorTest.java | 129 +++---
.../interceptor/FileUploadInterceptorTest.java | 148 +++---
core/src/test/resources/log4j2.xml | 1 +
pom.xml | 4 +-
25 files changed, 1254 insertions(+), 959 deletions(-)
create mode 100644
core/src/test/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequestTest.java
copy
core/src/{main/java/com/opensymphony/xwork2/DefaultLocaleProviderFactory.java
=>
test/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequestTest.java}
(75%)
