(struts) branch feature/WW-5388-upload-servlet6 deleted (was e9e3c0a25)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5388-upload-servlet6 in repository https://gitbox.apache.org/repos/asf/struts.git was e9e3c0a25 WW-5388 Adds dedicated integration test to cover max size upload The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts) branch release/struts-7-0-x updated (77acd665e -> 84d350dac)
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%)
(struts) 01/01: Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-02-01
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch merge-master-to-7xx-2024-02-01
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 11d84a26c3c08078a1e28fa96359a7693edd79bc
Merge: 84d350dac eb469779f
Author: Lukasz Lenart
AuthorDate: Thu Feb 1 09:55:34 2024 +0100
Merge remote-tracking branch 'origin/master' into
merge-master-to-7xx-2024-02-01
# Conflicts:
# Jenkinsfile
#
core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java
# core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java
# pom.xml
.github/workflows/scorecards-analysis.yaml | 2 +-
.github/workflows/sonar.yml| 1 +
Jenkinsfile| 10 +-
SECURITY.md| 12 +-
.../org/apache/struts2/showcase/UITagExample.java | 24 +-
.../showcase/action/ParamsAnnotationAction.java| 133
.../struts2/showcase/action/SkillAction.java | 2 +
.../struts2/showcase/async/ChatRoomAction.java | 3 +
.../struts2/showcase/conversion/AddressAction.java | 4 +-
.../showcase/conversion/OperationsEnumAction.java | 2 +
.../struts2/showcase/conversion/PersonAction.java | 2 +
.../showcase/filedownload/FileDownloadAction.java | 2 +
.../showcase/fileupload/FileUploadAction.java | 2 +
.../PersonAction.java => model/MyDto.java} | 35 +--
.../validation/FieldValidatorsExampleAction.java | 11 +
.../struts2/showcase/wait/LongProcessAction.java | 2 +
.../struts-params-annotation.xml} | 43 +--
apps/showcase/src/main/resources/struts.xml| 14 +-
.../src/main/webapp/WEB-INF/paramsannotation.vm| 19 ++
.../struts2/showcase/StrutsParametersTest.java | 239 ++
.../xwork2/config/impl/DefaultConfiguration.java | 2 +
.../xwork2/ognl/SecurityMemberAccess.java | 10 +-
.../security/DefaultAcceptedPatternsChecker.java | 18 +-
.../java/org/apache/struts2/StrutsConstants.java | 3 +
.../struts2/components/IteratorComponent.java | 13 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 8 +
.../parameter/ParametersInterceptor.java | 204 +++-
.../interceptor/parameter/StrutsParameter.java | 44 +++
.../org/apache/struts2/ognl/ThreadAllowlist.java | 51 +++
.../struts2/views/jsp/ComponentTagSupport.java | 10 +-
.../apache/struts2/views/jsp/IteratorStatus.java | 20 +-
core/src/main/resources/struts-beans.xml | 1 +
.../xwork2/ognl/SecurityMemberAccessTest.java | 6 +-
.../java/com/opensymphony/xwork2/test/User.java| 6 +
.../test/java/org/apache/struts2/TestAction.java | 9 +
.../struts2/components/IteratorComponentTest.java | 208 +++-
.../parameter/StrutsParameterAnnotationTest.java | 348 +
.../apache/struts2/views/jsp/IteratorTagTest.java | 211 ++---
src/etc/project-suppression.xml| 21 +-
39 files changed, 1522 insertions(+), 233 deletions(-)
diff --cc Jenkinsfile
index ca830acf2,1d8aa072a..45cd77441
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@@ -117,13 -191,10 +117,13 @@@ pipeline
}
stage('Upload nightlies') {
when {
-branch 'master'
+anyOf {
+ branch 'master'
+ branch 'release/struts-7-0-x'
+}
}
steps {
- sh './mvnw -B package -DskipTests'
+ sh './mvnw -B package -DskipTests --no-transfer-progress'
sshPublisher(publishers: [
sshPublisherDesc(
configName: 'Nightlies',
diff --cc
apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
index be6f38669,279c1e928..a1381c08c
---
a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
+++
b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
@@@ -23,8 -23,8 +23,9 @@@ package org.apache.struts2.showcase.fil
import com.opensymphony.xwork2.ActionSupport;
import org.apache.struts2.action.UploadedFilesAware;
import org.apache.struts2.dispatcher.multipart.UploadedFile;
+ import org.apache.struts2.interceptor.parameter.StrutsParameter;
+import java.io.File;
import java.util.List;
/**
diff --cc
apps/showcase/src/test/java/it/org/apache/struts2/showcase/StrutsParametersTest.java
index 0,417909544..927f0d101
mode 00,100644..100644
---
a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/StrutsParametersTest.java
+++
b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/StrutsParametersTest.java
@@@ -1,0 -1,239 +1,239 @@@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed wi
(struts) branch merge-master-to-7xx-2024-02-01 created (now 11d84a26c)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch merge-master-to-7xx-2024-02-01 in repository https://gitbox.apache.org/repos/asf/struts.git at 11d84a26c Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-02-01 This branch includes the following new commits: new 11d84a26c Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-02-01 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.
(struts) branch merge-master-to-7xx-2024-02-01 deleted (was 11d84a26c)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch merge-master-to-7xx-2024-02-01 in repository https://gitbox.apache.org/repos/asf/struts.git was 11d84a26c Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-02-01 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts) branch release/struts-7-0-x updated (84d350dac -> 9a30a9f95)
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 84d350dac Merge pull request #861 from apache/feature/WW-5388-upload-servlet6 add 775febbdf Upgrade maven to 3.9.6 and wrapper to 3.2.0 add 1e56b7ce6 Merge pull request #853 from sepe81/feature/upgrade-maven-to-3.9.6 add cde86457a Bump actions/upload-artifact from 4.1.0 to 4.2.0 add ec18f0eef Merge pull request #855 from apache/dependabot/github_actions/actions/upload-artifact-4.2.0 add cf74a4450 Fixes excluding Plexus container in OWASP scan add 65c0427ea Merge pull request #858 from apache/fix/plexus-exclusion add 9f4b67a9a Drops JDK11 build and fixes duplicated steps add 2de30e72a Merge pull request #859 from apache/fix/sped-up-build add e7a13b963 Small spelling and MD fixes (IntelliJ assisted) add 644bd1f8c Mention just the maintenance branches for supported versions add 7843cd5e1 Merge pull request #854 from sepe81/feature/update-security-policy add 2513fcb29 Stops running sonar.yml on forks add 5057aeac8 Merge pull request #862 from apache/lukaszlenart-patch-1 add eca0666f0 WW-5352 Introduce StrutsParameter annotation add ad576f0fd WW-5352 Introduce ThreadAllowlist bean add 4255da3ee WW-5352 First draft implementation add bf3f407b5 WW-5352 Ensure allowlist is cleared if in unexpected state add 4c5f2b026 WW-5352 Add full unit test coverage add e9154b922 Merge branch 'master' into WW-5352-parameter-annotation-3 add 5d7930123 WW-5352 Fix missing curved bracket add 4c60f39c7 WW-5352 Enable annotations for showcase add b2c754226 WW-5352 Dispatcher should up thread allowlist add a57c2882e WW-5352 Reinstate manual allowlist for generic types add 0a71e2c3b WW-5352 Implement auto-allowlisting for Iterator component add 770d31110 WW-5352 Mild optimisation add 6df80041e WW-5352 Auto allowlist parameterized types! add f106b2098 WW-5352 Map-like type support add bf7737fa0 WW-5352 Add unit test coverage for generics add 56d8361b4 WW-5352 Implement transition mode add 49b9c0c78 WW-5352 Ensure superclasses and interfaces allowlisted add 728d695ce WW-5352 Add debug logging for parameter rejections add b50616942 WW-5352 Acceptance test coverage add 71d77df3f WW-5352 Normalise parameter name add bd783a0e1 Merge pull request #832 from apache/WW-5352-parameter-annotation-3 add a358db585 WW-5360 Introduces additional countStr & indexStr to allow to ignore conversion add b83607295 Merge pull request #852 from apache/fix/WW-5360-iterator add 372aad2c6 Bump actions/upload-artifact from 4.2.0 to 4.3.0 add eb469779f Merge pull request #864 from apache/dependabot/github_actions/actions/upload-artifact-4.3.0 add 11d84a26c Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-02-01 add 9a30a9f95 Merge pull request #866 from apache/merge-master-to-7xx-2024-02-01 No new revisions were added by this update. Summary of changes: .github/workflows/scorecards-analysis.yaml | 2 +- .github/workflows/sonar.yml| 1 + Jenkinsfile| 10 +- SECURITY.md| 12 +- .../org/apache/struts2/showcase/UITagExample.java | 24 +- .../showcase/action/ParamsAnnotationAction.java| 133 .../struts2/showcase/action/SkillAction.java | 2 + .../struts2/showcase/async/ChatRoomAction.java | 3 + .../struts2/showcase/conversion/AddressAction.java | 4 +- .../showcase/conversion/OperationsEnumAction.java | 2 + .../struts2/showcase/conversion/PersonAction.java | 2 + .../showcase/filedownload/FileDownloadAction.java | 2 + .../showcase/fileupload/FileUploadAction.java | 2 + .../org/apache/struts2/showcase/model/MyDto.java | 23 +- .../validation/FieldValidatorsExampleAction.java | 11 + .../struts2/showcase/wait/LongProcessAction.java | 2 + .../main/resources/struts-params-annotation.xml| 10 +- apps/showcase/src/main/resources/struts.xml| 14 +- .../includedPage.jsp => paramsannotation.vm} | 8 +- .../struts2/showcase/StrutsParametersTest.java | 239 ++ .../xwork2/config/impl/DefaultConfiguration.java | 2 + .../xwork2/ognl/SecurityMemberAccess.java | 10 +- .../security/DefaultAcceptedPatternsChecker.java | 18 +- .../java/org/apache/struts2/StrutsConstants.java | 3 + .../struts2/components/IteratorComponent.java | 13 +- .../org/apache/struts2/dispatcher/Dispatcher.java | 8 + .../parameter/ParametersInterceptor.java | 204 +++- .../interceptor/parameter/StrutsParameter.java | 96 +++--- .../apache/struts2/ognl/ThreadAllowlist.java} | 48 ++- .../struts2/views/jsp/Com
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare release STRUTS_7_0_0_M2
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new 6db4c5150 [maven-release-plugin] prepare release STRUTS_7_0_0_M2 6db4c5150 is described below commit 6db4c5150ed4ac6c8b2f67be7783794fa2060766 Author: Lukasz Lenart AuthorDate: Thu Feb 1 10:39:50 2024 +0100 [maven-release-plugin] prepare release STRUTS_7_0_0_M2 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 5 ++--- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 30 files changed, 37 insertions(+), 38 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 50ee4d2be..996bbfcf4 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M2-SNAPSHOT +7.0.0-M2 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index bfffcdc6f..42c6fa619 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M2-SNAPSHOT +7.0.0-M2 struts2-rest-showcase war -7.0.0-M2-SNAPSHOT +7.0.0-M2 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 6f0fd9596..a681fff23 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M2-SNAPSHOT +7.0.0-M2 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 4f5ff0955..ef09d4464 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M2-SNAPSHOT +7.0.0-M2 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 7ac1707a8..0b95c684f 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M2-SNAPSHOT +7.0.0-M2 struts2-bom -7.0.0-M2-SNAPSHOT +7.0.0-M2 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M2-SNAPSHOT +7.0.0-M2 true true @@ -165,7 +165,7 @@ -HEAD +STRUTS_7_0_0_M2 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index a52453c08..b53d013b3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -19,13 +19,12 @@ * under the License. */ --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 org.apache.struts struts2-parent -7.0.0-M2-SNAPSHOT +7.0.0-M2 struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index faed51f6e..d7f999268 100644 --- a/jakarta/freemarker-jaka
(struts) annotated tag STRUTS_7_0_0_M2 created (now 3cadaafda)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_7_0_0_M2 in repository https://gitbox.apache.org/repos/asf/struts.git at 3cadaafda (tag) tagging 6db4c5150ed4ac6c8b2f67be7783794fa2060766 (commit) replaces STRUTS_7_0_0_M1 by Lukasz Lenart on Thu Feb 1 10:39:54 2024 +0100 - Log - [maven-release-plugin] copy for tag STRUTS_7_0_0_M2 --- No new revisions were added by this update.
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new 737542a03 [maven-release-plugin] prepare for next development iteration 737542a03 is described below commit 737542a031bb989c0320e5fb8cc3681d3cf62e04 Author: Lukasz Lenart AuthorDate: Thu Feb 1 10:39:59 2024 +0100 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 30 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 996bbfcf4..f28402777 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M2 +7.0.0-M3-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 42c6fa619..ff1a088bd 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M2 +7.0.0-M3-SNAPSHOT struts2-rest-showcase war -7.0.0-M2 +7.0.0-M3-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index a681fff23..e27f82b6d 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M2 +7.0.0-M3-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index ef09d4464..8151e68e2 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M2 +7.0.0-M3-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 0b95c684f..c7e957cc4 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M2 +7.0.0-M3-SNAPSHOT struts2-bom -7.0.0-M2 +7.0.0-M3-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M2 +7.0.0-M3-SNAPSHOT true true @@ -165,7 +165,7 @@ -STRUTS_7_0_0_M2 +HEAD scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index b53d013b3..aca17ab1d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M2 +7.0.0-M3-SNAPSHOT struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index d7f999268..f30fe93da 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M2 +7.0.0-M3-SNAPSHOT struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 7e2b48d2b..70dd064c8 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -
(struts-site) branch WW-5352-struts-param-doc updated (687d6e6fd -> 6858691c7)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5352-struts-param-doc in repository https://gitbox.apache.org/repos/asf/struts-site.git discard 687d6e6fd WW-5352 Update documentation for @StrutsParameter add 6858691c7 WW-5352 Update documentation for @StrutsParameter This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (687d6e6fd) \ N -- N -- N refs/heads/WW-5352-struts-param-doc (6858691c7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: source/getting-started/processing-forms.md | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
(struts-site) branch WW-5352-struts-param-doc updated (6858691c7 -> 57427706c)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5352-struts-param-doc in repository https://gitbox.apache.org/repos/asf/struts-site.git from 6858691c7 WW-5352 Update documentation for @StrutsParameter add 57427706c WW-5352 Doc corrections No new revisions were added by this update. Summary of changes: source/security/index.md | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-)
(struts-site) branch WW-5352-struts-param-doc updated (57427706c -> bbe21db7b)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5352-struts-param-doc in repository https://gitbox.apache.org/repos/asf/struts-site.git from 57427706c WW-5352 Doc corrections add bbe21db7b WW-5352 Minor fixes No new revisions were added by this update. Summary of changes: source/security/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(struts-site) branch WW-5352-struts-param-doc updated (bbe21db7b -> 9fd861ccc)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5352-struts-param-doc in repository https://gitbox.apache.org/repos/asf/struts-site.git from bbe21db7b WW-5352 Minor fixes add 9fd861ccc WW-5352 Clarifications and corrections No new revisions were added by this update. Summary of changes: source/getting-started/processing-forms.md | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-)
(struts-site) branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 7df010d27 Updates stage by Jenkins 7df010d27 is described below commit 7df010d27df8fb06ebcdf5cb85b359802131a82c Author: jenkins AuthorDate: Thu Feb 1 16:52:35 2024 + Updates stage by Jenkins --- content/getting-started/processing-forms.html | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/getting-started/processing-forms.html b/content/getting-started/processing-forms.html index d572d5194..8569a2b6c 100644 --- a/content/getting-started/processing-forms.html +++ b/content/getting-started/processing-forms.html @@ -329,12 +329,12 @@ the Struts 2 framework. We need an Action class to process this form. If you rec In the Register class, note that we’ve declared an attribute named personBean of type Person, there are public getter and setter methods for this object, and the getter is annotated with @StrutsParameter(depth = 1). -In the previous Coding Struts 2 Actions tutorial, we annotated the username setter, -which took a simple String as its parameter type, with @StrutsParameter. In this example, we are using a “Bean” -object (sometimes referred to as a DTO or model object) to encapsulate the form data. When we choose to use a DTO -instead of a primitive, String, or other TypeConverter supported object, we must annotate the getter -method instead, and also assign a depth corresponding to how deep the DTO graph is. In this case, the Person object -does not have any further DTOs or collections within it, so a depth of 1 will suffice. +In the previous Coding Struts 2 Actions tutorial, we annotated the username setter, which took a +simple String as its parameter type, with @StrutsParameter. In this example, we are using a “Bean” object (sometimes +referred to as a DTO or model object) to encapsulate the form data. When we choose to use a DTO instead of a primitive, +String, or other TypeConverter supported object, we must annotate the getter method instead, and also assign a depth +corresponding to how deep the DTO graph is. In this case, the Person object does not have any further DTOs or +collections within it, so a depth of 1 will suffice. For more information on these annotations and their security implications, please refer to Security.
(struts-site) branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 3aec2dea4 Updates stage by Jenkins 3aec2dea4 is described below commit 3aec2dea433007894c5ecaec2df9fa622613159f Author: jenkins AuthorDate: Thu Feb 1 16:53:16 2024 + Updates stage by Jenkins --- content/getting-started/processing-forms.html | 13 +++-- content/security/index.html | 25 + 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/content/getting-started/processing-forms.html b/content/getting-started/processing-forms.html index 8569a2b6c..51e121188 100644 --- a/content/getting-started/processing-forms.html +++ b/content/getting-started/processing-forms.html @@ -345,12 +345,13 @@ the String constant SUCCESS -The personBean object of type Person declared in the Register Action class matches the personBean name we used in -the form’s textfields. When the form is submitted, the Struts 2 framework will inspect the Action class and look for -an object named personBean. It will create that object using the Person class’s default constructor. Then for each -form field that has a name value of personBean.someAttribute (e.g personBean.firstName) it will call the personBean’s -public set method for that attribute and pass it the form field’s value (the user input). This all happens before -the execute method occurs. +The personBean getter of return type Person declared in the Register Action class matches the personBean name we +used in the form’s textfields. When the form is submitted, the Struts 2 framework will inspect the Action class and look +for a getter for personBean. If it returns null and a matching setter exists, it will create that object using the +Person class’s default constructor and set it using the setter. Note that the setter can be omitted if your Action +initialises the field on construction. Then for each form field that has a name value of personBean.someAttribute +(e.g personBean.firstName) it will call the personBean’s public set method for that attribute and pass it the form +field’s value (the user input). This all happens before the execute method occurs. When Struts 2 runs the execute method of class Register, the personBean object in class Register now has values for its instance fields that are equal to the values the user entered into the corresponding form fields. diff --git a/content/security/index.html b/content/security/index.html index df53870e4..a3c6bb9b2 100644 --- a/content/security/index.html +++ b/content/security/index.html @@ -341,7 +341,7 @@ annotate should only ever return a DTO or a collection/hierarchy of DTOs. Do NOT references with your parameter injection methods and DTOs. Additionally, any database DTOs should be entirely separate from request parameter/form DTOs. -Do NOT under any circumstance, annotate a method that returns one of the following unsafe objects: +Do NOT, under any circumstance, annotate a method that returns one of the following unsafe objects: live Hibernate persistent objects container or Spring-managed beans, or any other live components/services @@ -363,7 +363,7 @@ as possible. Note: Only relevant if you are not using struts.parameters.requireAnnotations=true as per the previous section. -You should carefully design your actions without exposing anything via setters and getters, thus can leads to potential +You should carefully design your actions without exposing anything via setters and getters, this can lead to potential security vulnerabilities. Any action’s setter can be used to set incoming untrusted user’s value which can contain suspicious expression. Some Struts Results automatically populate params based on values in ValueStack (action in most cases is the root) which means incoming value will be evaluated as an expression during @@ -556,12 +556,14 @@ to the ActionContext from OGNL expressions entirely. Note that before disabling access to the ActionContext from OGNL expressions, you should ensure that your application does not rely on this capability. OGNL expressions may access the context directly using the # operator, or indirectly -using the OgnlValueStack’s fallback to context lookup capability. As of Struts 6.4.0, the Set and Action Struts -components require ActionContext access from OGNL expressions. +using the OgnlValueStack’s fallback to context lookup capability. As of Struts 6.4.0, the Set, Iterator and Action +Struts components require ActionContext access from OGNL expressions. To disable access to the ActionContext from OGNL expressions, set the following constants in your struts.xml or -struts.properties file. Please also refer to the documentation below for further details on these
(struts) branch WW-5391-velocity-ext-point created (now 9328ae7ec)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5391-velocity-ext-point in repository https://gitbox.apache.org/repos/asf/struts.git at 9328ae7ec WW-5391 Add interface for VelocityManager extension point This branch includes the following new commits: new 9328ae7ec WW-5391 Add interface for VelocityManager extension point 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.
(struts) 01/01: WW-5391 Add interface for VelocityManager extension point
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5391-velocity-ext-point
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 9328ae7ec10f23c5ad0fb2e8a4a1c555a2094a17
Author: Kusal Kithul-Godage
AuthorDate: Fri Feb 2 17:25:17 2024 +1100
WW-5391 Add interface for VelocityManager extension point
---
.../struts2/osgi/OsgiConfigurationProvider.java| 24 +-
.../portlet/result/PortletVelocityResult.java | 564 +++--
.../velocity/VelocityBeanSelectionProvider.java| 2 +-
.../struts2/views/velocity/VelocityManager.java| 5 +-
.../views/velocity/VelocityManagerInterface.java | 39 ++
.../views/velocity/result/VelocityResult.java | 37 +-
.../velocity/template/VelocityTemplateEngine.java | 17 +-
7 files changed, 399 insertions(+), 289 deletions(-)
diff --git
a/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java
b/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java
index 61b22c281..ba56b4e6d 100644
---
a/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java
+++
b/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java
@@ -24,15 +24,15 @@ import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.config.PackageProvider;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.finder.ClassLoaderInterface;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.osgi.host.OsgiHost;
import org.apache.struts2.osgi.loaders.VelocityBundleResourceLoader;
import org.apache.struts2.views.velocity.VelocityManager;
+import org.apache.struts2.views.velocity.VelocityManagerInterface;
import org.apache.velocity.app.Velocity;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -40,7 +40,6 @@ import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleListener;
import javax.servlet.ServletContext;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
@@ -255,9 +254,12 @@ public class OsgiConfigurationProvider implements
PackageProvider, BundleListene
}
@Inject
-public void setVelocityManager(VelocityManager vm) {
-LOG.trace("OSGi ConfigurationProvider - setVelocityManager() called -
VelocityManager: [{}]", vm);
-
+public void setVelocityManager(VelocityManagerInterface vmi) {
+LOG.trace("OSGi ConfigurationProvider - setVelocityManager() called -
VelocityManager: [{}]", vmi);
+if (!(vmi instanceof VelocityManager)) {
+return;
+}
+VelocityManager vm = (VelocityManager) vmi;
Properties props = new Properties();
props.setProperty("osgi.resource.loader.description", "OSGI bundle
loader");
props.setProperty("osgi.resource.loader.class",
VelocityBundleResourceLoader.class.getName());
@@ -265,6 +267,14 @@ public class OsgiConfigurationProvider implements
PackageProvider, BundleListene
vm.setVelocityProperties(props);
}
+/**
+ * @deprecated since 6.4.0
+ */
+@Deprecated
+public void setVelocityManager(VelocityManager mgr) {
+setVelocityManager((VelocityManagerInterface) mgr);
+}
+
@Inject
public void setServletContext(ServletContext servletContext) {
LOG.trace("OSGi ConfigurationProvider - setServletContext() called -
ServletContext: [{}]", servletContext);
diff --git
a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
index fcae67c45..d40ce9331 100644
---
a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
+++
b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
@@ -1,270 +1,294 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHO
(struts-site) branch WW-5352-struts-param-doc deleted (was 9fd861ccc)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5352-struts-param-doc in repository https://gitbox.apache.org/repos/asf/struts-site.git was 9fd861ccc WW-5352 Clarifications and corrections The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts-site) branch master updated (82a5de7a3 -> 24f8a1a25)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git from 82a5de7a3 Merge pull request #226 from apache/feature/WW-5360-status-ver add 6858691c7 WW-5352 Update documentation for @StrutsParameter add 57427706c WW-5352 Doc corrections add bbe21db7b WW-5352 Minor fixes add 9fd861ccc WW-5352 Clarifications and corrections new 24f8a1a25 Merge pull request #227 from apache/WW-5352-struts-param-doc 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: source/core-developers/basic-validation.md | 3 + source/core-developers/client-validation.md| 3 + source/core-developers/conversion-validator.md | 3 +- source/core-developers/file-upload-interceptor.md | 3 + source/core-developers/file-upload.md | 9 ++ .../core-developers/type-conversion-annotation.md | 4 + source/core-developers/type-conversion.md | 2 + .../core-developers/using-non-field-validators.md | 3 + .../using-visitor-field-validator.md | 1 + source/core-developers/validation-annotation.md| 1 + source/core-developers/validation.md | 1 + source/core-developers/wildcard-mappings.md| 2 + source/getting-started/coding-actions.md | 4 +- source/getting-started/processing-forms.md | 32 --- source/plugins/junit/index.md | 1 + .../plugins/portlet/struts-2-portlet-tutorial.md | 10 ++- source/security/index.md | 97 +++--- 17 files changed, 153 insertions(+), 26 deletions(-)
(struts-site) 01/01: Merge pull request #227 from apache/WW-5352-struts-param-doc
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git commit 24f8a1a25208652934b06f99e5358634b0d35661 Merge: 82a5de7a3 9fd861ccc Author: Kusal Kithul-Godage AuthorDate: Fri Feb 2 17:25:44 2024 +1100 Merge pull request #227 from apache/WW-5352-struts-param-doc WW-5352 Update documentation for @StrutsParameter source/core-developers/basic-validation.md | 3 + source/core-developers/client-validation.md| 3 + source/core-developers/conversion-validator.md | 3 +- source/core-developers/file-upload-interceptor.md | 3 + source/core-developers/file-upload.md | 9 ++ .../core-developers/type-conversion-annotation.md | 4 + source/core-developers/type-conversion.md | 2 + .../core-developers/using-non-field-validators.md | 3 + .../using-visitor-field-validator.md | 1 + source/core-developers/validation-annotation.md| 1 + source/core-developers/validation.md | 1 + source/core-developers/wildcard-mappings.md| 2 + source/getting-started/coding-actions.md | 4 +- source/getting-started/processing-forms.md | 32 --- source/plugins/junit/index.md | 1 + .../plugins/portlet/struts-2-portlet-tutorial.md | 10 ++- source/security/index.md | 97 +++--- 17 files changed, 153 insertions(+), 26 deletions(-)
(struts-site) branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 1249738b0 Automatic Site Publish by Buildbot
1249738b0 is described below
commit 1249738b03e662b6913f6160be60b39ea781786b
Author: buildbot
AuthorDate: Fri Feb 2 06:26:24 2024 +
Automatic Site Publish by Buildbot
---
output/core-developers/basic-validation.html | 3 +
output/core-developers/client-validation.html | 3 +
output/core-developers/conversion-validator.html | 3 +-
.../core-developers/file-upload-interceptor.html | 3 +
output/core-developers/file-upload.html| 9 ++
.../type-conversion-annotation.html| 4 +
output/core-developers/type-conversion.html| 2 +
.../using-non-field-validators.html| 3 +
.../using-visitor-field-validator.html | 1 +
output/core-developers/validation-annotation.html | 1 +
output/core-developers/validation.html | 1 +
output/core-developers/wildcard-mappings.html | 2 +
output/getting-started/coding-actions.html | 4 +-
output/getting-started/processing-forms.html | 32 +--
output/plugins/junit/index.html| 1 +
.../plugins/portlet/struts-2-portlet-tutorial.html | 10 +-
output/security/index.html | 102 ++---
17 files changed, 158 insertions(+), 26 deletions(-)
diff --git a/output/core-developers/basic-validation.html
b/output/core-developers/basic-validation.html
index 8df18d572..1da220948 100644
--- a/output/core-developers/basic-validation.html
+++ b/output/core-developers/basic-validation.html
@@ -215,6 +215,7 @@
return name;
}
+ @StrutsParameter
public void setName(String
name) {
this.name = name;
}
@@ -223,6 +224,7 @@
return age;
}
+ @StrutsParameter
public void setAge(int
age) {
this.age = age;
}
@@ -231,6 +233,7 @@
return answer;
}
+ @StrutsParameter
public void setAnswer(String answer)
{
this.answer = answer;
}
diff --git a/output/core-developers/client-validation.html
b/output/core-developers/client-validation.html
index c922bc167..6b770499f 100644
--- a/output/core-developers/client-validation.html
+++ b/output/core-developers/client-validation.html
@@ -212,6 +212,7 @@
return name;
}
+ @StrutsParameter
public void setName(String
name) {
this.name = name;
}
@@ -220,6 +221,7 @@
return age;
}
+ @StrutsParameter
public void setAge(int
age) {
this.age = age;
}
@@ -228,6 +230,7 @@
return answer;
}
+ @StrutsParameter
public void setAnswer(String answer)
{
this.answer = answer;
}
diff --git a/output/core-developers/conversion-validator.html
b/output/core-developers/conversion-validator.html
index 2769f41f2..3c07fa73d 100644
--- a/output/core-developers/conversion-validator.html
+++ b/output/core-developers/conversion-validator.html
@@ -228,7 +228,8 @@ property set to true, it will, meaning the textfield will
have ‘one’ as its
public Integer getMyIntegerField() {
return this.myIntegerField;
}
-
+
+@StrutsParameter
public void setMyIntegerField(Integer myIntegerField) {
this.myIntegerField = myIntegerField;
}
diff --git a/output/core-developers/file-upload-interceptor.html
b/output/core-developers/file-upload-interceptor.html
index 514c6ede1..7aa55be6a 100644
--- a/output/core-developers/file-upload-interceptor.html
+++ b/output/core-developers/file-upload-interceptor.html
@@ -239,14 +239,17 @@ and which are not.
private String contentType;
private String filename;
+ @StrutsParameter
public void setUpload(File
file) {
this.file = file;
}
+ @StrutsParameter
public void setUploadContentType(String contentType) {
this.contentType = contentType;
}
+ @StrutsParameter
public void setUploadFileName(String filename) {
this.filename = filename;
}
diff --git a/output/core-developers/file-upload.html
b/output/core-developers/file-upload.html
index c9d2e8274..124b60edf 100644
--- a/output/core-developers/file-upload.html
+++ b/output/core-developers/file-upload.html
@@ -264,14 +264,17 @@ class. For a form field named private String contentType;
private String filename;
+@StrutsParameter
public void setUpload(File
file) {
this.file = file;
}
+@StrutsParameter
public void setUploadContentType(String contentType)
(struts-site) branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new d9cd5e9de Updates stage by Jenkins d9cd5e9de is described below commit d9cd5e9ded39663f9d1b5b4c03b6c6640ab29030 Author: jenkins AuthorDate: Fri Feb 2 06:29:54 2024 + Updates stage by Jenkins
(struts) branch WW-5391-velocity-ext-point updated (9328ae7ec -> ace6a713c)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5391-velocity-ext-point in repository https://gitbox.apache.org/repos/asf/struts.git from 9328ae7ec WW-5391 Add interface for VelocityManager extension point add ace6a713c WW-5391 Fix VelocityDecoratorServlet No new revisions were added by this update. Summary of changes: .../struts2/sitemesh/VelocityDecoratorServlet.java | 389 +++-- 1 file changed, 196 insertions(+), 193 deletions(-)
(struts) branch WW-5391-velocity-ext-point updated (ace6a713c -> b5fca66ad)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5391-velocity-ext-point in repository https://gitbox.apache.org/repos/asf/struts.git from ace6a713c WW-5391 Fix VelocityDecoratorServlet add b5fca66ad WW-5391 Migrate other usages No new revisions were added by this update. Summary of changes: .../struts2/config_browser/ShowBeansAction.java| 4 +- .../OldDecorator2NewStrutsVelocityDecorator.java | 211 +++-- .../struts2/sitemesh/VelocityPageFilter.java | 24 ++- 3 files changed, 128 insertions(+), 111 deletions(-)
(struts) branch WW-5391-velocity-ext-point updated (b5fca66ad -> 93f0a5116)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5391-velocity-ext-point in repository https://gitbox.apache.org/repos/asf/struts.git from b5fca66ad WW-5391 Migrate other usages add 93f0a5116 WW-5391 Fix bean definition No new revisions were added by this update. Summary of changes: plugins/velocity/src/main/resources/struts-plugin.xml | 4 1 file changed, 4 insertions(+)
