(struts-site) 01/01: Replaces references to fileUpload interceptor with actionFileUpload instead
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/file-upload
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 2c8c18fc45fe169ae6243eb2bba4c6767d412c67
Author: Lukasz Lenart
AuthorDate: Sat Nov 9 09:52:36 2024 +0100
Replaces references to fileUpload interceptor with actionFileUpload instead
---
.../action-file-upload-interceptor.md | 2 +-
source/core-developers/action-file-upload.md | 4 +-
source/core-developers/exception-configuration.md | 2 +-
source/core-developers/file-upload-interceptor.md | 3 +
source/core-developers/file-upload.md | 4 +-
source/core-developers/interceptors.md | 82 +++---
source/core-developers/validations-annotation.md | 2 +-
7 files changed, 51 insertions(+), 48 deletions(-)
diff --git a/source/core-developers/action-file-upload-interceptor.md
b/source/core-developers/action-file-upload-interceptor.md
index aa3a89d73..06a67c55d 100644
--- a/source/core-developers/action-file-upload-interceptor.md
+++ b/source/core-developers/action-file-upload-interceptor.md
@@ -107,7 +107,7 @@ public class UploadAction extends ActionSupport implements
UploadedFilesAware {
**Setting parameters example:**
```xml
-
+
image/png,image/gif,image/jpeg
diff --git a/source/core-developers/action-file-upload.md
b/source/core-developers/action-file-upload.md
index 511cd440c..2510a5c37 100644
--- a/source/core-developers/action-file-upload.md
+++ b/source/core-developers/action-file-upload.md
@@ -204,7 +204,7 @@ Notice the locations of these settings in the following
example:
-
+
50
@@ -247,7 +247,7 @@ example:
```xml
-
+
image/jpeg,image/gif
diff --git a/source/core-developers/exception-configuration.md
b/source/core-developers/exception-configuration.md
index 1cd6e1385..5785546a6 100644
--- a/source/core-developers/exception-configuration.md
+++ b/source/core-developers/exception-configuration.md
@@ -33,7 +33,7 @@ Below is a snippet from `struts-default.xml` which has the
exception mapping alr
-
+
diff --git a/source/core-developers/file-upload-interceptor.md
b/source/core-developers/file-upload-interceptor.md
index fbc6c9c77..7983b699d 100644
--- a/source/core-developers/file-upload-interceptor.md
+++ b/source/core-developers/file-upload-interceptor.md
@@ -15,6 +15,9 @@ parent:
Since Struts 6.4.0 this interceptor is deprecated, please use [Action File
Upload Interceptor](action-file-upload-interceptor) instead!
{:.alert .alert-warning}
+This interceptor has benn removed in Struts 7.0.0!
+{:.alert .alert-danger}
+
See [this page](file-upload) for more examples and advanced configuration.
Interceptor that is based off of `MultiPartRequestWrapper`, which is
automatically applied for any request that includes
diff --git a/source/core-developers/file-upload.md
b/source/core-developers/file-upload.md
index aa2223ea2..9045f202b 100644
--- a/source/core-developers/file-upload.md
+++ b/source/core-developers/file-upload.md
@@ -306,7 +306,7 @@ Notice the locations of these settings in the following
example:
-
+
50
@@ -349,7 +349,7 @@ example:
```xml
-
+
image/jpeg,image/gif
diff --git a/source/core-developers/interceptors.md
b/source/core-developers/interceptors.md
index 4145c99f3..201a662b7 100644
--- a/source/core-developers/interceptors.md
+++ b/source/core-developers/interceptors.md
@@ -111,47 +111,47 @@ specified below come specified in
[struts-default.xml](struts-default-xml). If y
package, then you can use the names below. Otherwise, they must be defined in
your package with a name-class pair
specified in the `` tag.
-| Interceptor
| Name | Description
|
-||---|---|
-| [Action File Upload Interceptor](action-file-upload-interceptor)
| actionFileUpload | Available since Struts 6.4.0: an
Interceptor that adds easy access to file upload support.
(struts-site) branch feature/file-upload created (now 2c8c18fc4)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/file-upload in repository https://gitbox.apache.org/repos/asf/struts-site.git at 2c8c18fc4 Replaces references to fileUpload interceptor with actionFileUpload instead This branch includes the following new commits: new 2c8c18fc4 Replaces references to fileUpload interceptor with actionFileUpload instead 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-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 0702eba6c Updates stage by Jenkins 0702eba6c is described below commit 0702eba6cf10e56464a8d04a5ceaffdeda0effdc Author: jenkins AuthorDate: Sat Nov 9 08:59:42 2024 + Updates stage by Jenkins --- content/core-developers/action-file-upload-interceptor.html | 2 +- content/core-developers/action-file-upload.html | 4 ++-- content/core-developers/exception-configuration.html| 2 +- content/core-developers/file-upload-interceptor.html| 2 ++ content/core-developers/file-upload.html| 4 ++-- content/core-developers/interceptors.html | 4 ++-- content/core-developers/validations-annotation.html | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/content/core-developers/action-file-upload-interceptor.html b/content/core-developers/action-file-upload-interceptor.html index 642d6fc24..e45e56559 100644 --- a/content/core-developers/action-file-upload-interceptor.html +++ b/content/core-developers/action-file-upload-interceptor.html @@ -253,7 +253,7 @@ and which are not. Setting parameters example: -+ image/png,image/gif,image/jpeg diff --git a/content/core-developers/action-file-upload.html b/content/core-developers/action-file-upload.html index 27b07bb1f..0cdca564e 100644 --- a/content/core-developers/action-file-upload.html +++ b/content/core-developers/action-file-upload.html @@ -359,7 +359,7 @@ precedence over this interceptor setting. - + 50 @@ -399,7 +399,7 @@ example: - + image/jpeg,image/gif diff --git a/content/core-developers/exception-configuration.html b/content/core-developers/exception-configuration.html index 1614ca623..2184a95f6 100644 --- a/content/core-developers/exception-configuration.html +++ b/content/core-developers/exception-configuration.html @@ -178,7 +178,7 @@ Below is a snippet from strut - + diff --git a/content/core-developers/file-upload-interceptor.html b/content/core-developers/file-upload-interceptor.html index 8f605de92..8f45bd235 100644 --- a/content/core-developers/file-upload-interceptor.html +++ b/content/core-developers/file-upload-interceptor.html @@ -161,6 +161,8 @@ Since Struts 6.4.0 this interceptor is deprecated, please use Action File Upload Interceptor instead! +This interceptor has benn removed in Struts 7.0.0! + See this page for more examples and advanced configuration. Interceptor that is based off of MultiPartRequestWrapper, which is automatically applied for any request that includes diff --git a/content/core-developers/file-upload.html b/content/core-developers/file-upload.html index 995e367c3..9adb5e640 100644 --- a/content/core-developers/file-upload.html +++ b/content/core-developers/file-upload.html @@ -480,7 +480,7 @@ precedence over this interceptor setting. - + 50 @@ -520,7 +520,7 @@ example: - + image/jpeg,image/gif diff --git a/content/core-developers/interceptors.html b/content/core-developers/interceptors.html index 978d990d2..53b5a9932 100644 --- a/content/core-develo
(struts-site) branch master updated (94f05e199 -> d93960194)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git from 94f05e199 Merge pull request #253 from apache/release/struts-6-6-1 add 2c8c18fc4 Replaces references to fileUpload interceptor with actionFileUpload instead new d93960194 Merge pull request #254 from apache/feature/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: .../action-file-upload-interceptor.md | 2 +- source/core-developers/action-file-upload.md | 4 +- source/core-developers/exception-configuration.md | 2 +- source/core-developers/file-upload-interceptor.md | 3 + source/core-developers/file-upload.md | 4 +- source/core-developers/interceptors.md | 82 +++--- source/core-developers/validations-annotation.md | 2 +- 7 files changed, 51 insertions(+), 48 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 d0a17cd1b Automatic Site Publish by Buildbot d0a17cd1b is described below commit d0a17cd1bc90c6788985e6bc29b11bcba73ae31a Author: buildbot AuthorDate: Sat Nov 9 09:44:48 2024 + Automatic Site Publish by Buildbot --- output/core-developers/action-file-upload-interceptor.html | 2 +- output/core-developers/action-file-upload.html | 4 ++-- output/core-developers/exception-configuration.html| 2 +- output/core-developers/file-upload-interceptor.html| 2 ++ output/core-developers/file-upload.html| 4 ++-- output/core-developers/interceptors.html | 4 ++-- output/core-developers/validations-annotation.html | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/output/core-developers/action-file-upload-interceptor.html b/output/core-developers/action-file-upload-interceptor.html index 642d6fc24..e45e56559 100644 --- a/output/core-developers/action-file-upload-interceptor.html +++ b/output/core-developers/action-file-upload-interceptor.html @@ -253,7 +253,7 @@ and which are not. Setting parameters example: -+ image/png,image/gif,image/jpeg diff --git a/output/core-developers/action-file-upload.html b/output/core-developers/action-file-upload.html index 27b07bb1f..0cdca564e 100644 --- a/output/core-developers/action-file-upload.html +++ b/output/core-developers/action-file-upload.html @@ -359,7 +359,7 @@ precedence over this interceptor setting. - + 50 @@ -399,7 +399,7 @@ example: - + image/jpeg,image/gif diff --git a/output/core-developers/exception-configuration.html b/output/core-developers/exception-configuration.html index 1614ca623..2184a95f6 100644 --- a/output/core-developers/exception-configuration.html +++ b/output/core-developers/exception-configuration.html @@ -178,7 +178,7 @@ Below is a snippet from strut - + diff --git a/output/core-developers/file-upload-interceptor.html b/output/core-developers/file-upload-interceptor.html index 8f605de92..8f45bd235 100644 --- a/output/core-developers/file-upload-interceptor.html +++ b/output/core-developers/file-upload-interceptor.html @@ -161,6 +161,8 @@ Since Struts 6.4.0 this interceptor is deprecated, please use Action File Upload Interceptor instead! +This interceptor has benn removed in Struts 7.0.0! + See this page for more examples and advanced configuration. Interceptor that is based off of MultiPartRequestWrapper, which is automatically applied for any request that includes diff --git a/output/core-developers/file-upload.html b/output/core-developers/file-upload.html index 995e367c3..9adb5e640 100644 --- a/output/core-developers/file-upload.html +++ b/output/core-developers/file-upload.html @@ -480,7 +480,7 @@ precedence over this interceptor setting. - + 50 @@ -520,7 +520,7 @@ example: - + image/jpeg,image/gif diff --git a/output/core-developers/interceptors.html b/output/core-developers/interceptors.html index 978d990d2..53b5a9932 100644 --- a/output/core-developers/intercepto
(struts-site) 01/01: Merge pull request #254 from apache/feature/file-upload
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git commit d93960194539a162561c04e980f146e73ca35449 Merge: 94f05e199 2c8c18fc4 Author: Lukasz Lenart AuthorDate: Sat Nov 9 10:44:10 2024 +0100 Merge pull request #254 from apache/feature/file-upload Replaces references to fileUpload interceptor with actionFileUpload instead .../action-file-upload-interceptor.md | 2 +- source/core-developers/action-file-upload.md | 4 +- source/core-developers/exception-configuration.md | 2 +- source/core-developers/file-upload-interceptor.md | 3 + source/core-developers/file-upload.md | 4 +- source/core-developers/interceptors.md | 82 +++--- source/core-developers/validations-annotation.md | 2 +- 7 files changed, 51 insertions(+), 48 deletions(-)
(struts-site) branch feature/file-upload deleted (was 2c8c18fc4)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/file-upload in repository https://gitbox.apache.org/repos/asf/struts-site.git was 2c8c18fc4 Replaces references to fileUpload interceptor with actionFileUpload instead 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) 01/01: WW-5486 Fixes exposing params added by ServletDispatcherResult
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/WW-5486-request-params
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 24e60416f69e972579d8f17563a41814af15fba5
Author: Lukasz Lenart
AuthorDate: Sat Nov 9 10:48:02 2024 +0100
WW-5486 Fixes exposing params added by ServletDispatcherResult
---
.../java/org/apache/struts2/ActionContext.java | 2 ++
.../org/apache/struts2/dispatcher/Dispatcher.java | 1 -
.../result/ServletDispatcherResultTest.java| 28 +-
3 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/ActionContext.java
b/core/src/main/java/org/apache/struts2/ActionContext.java
index febedd04f..bad8f6705 100644
--- a/core/src/main/java/org/apache/struts2/ActionContext.java
+++ b/core/src/main/java/org/apache/struts2/ActionContext.java
@@ -24,6 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.jsp.PageContext;
import org.apache.struts2.action.Action;
import org.apache.struts2.conversion.impl.ConversionData;
+import org.apache.struts2.dispatcher.DispatcherConstants;
import org.apache.struts2.dispatcher.HttpParameters;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.inject.Container;
@@ -316,6 +317,7 @@ public class ActionContext implements Serializable {
*/
public ActionContext withParameters(HttpParameters parameters) {
put(PARAMETERS, parameters);
+put(DispatcherConstants.PARAMETERS, parameters);
return this;
}
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index deab70ce1..cb85639d1 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -851,7 +851,6 @@ public class Dispatcher {
.with(DispatcherConstants.REQUEST, requestMap)
.with(DispatcherConstants.SESSION, sessionMap)
.with(DispatcherConstants.APPLICATION, applicationMap)
-.with(DispatcherConstants.PARAMETERS, parameters)
.getContextMap();
AttributeMap attrMap = new AttributeMap(extraContext);
diff --git
a/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java
b/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java
index 219f3d218..22a6312ea 100644
---
a/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java
+++
b/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java
@@ -20,16 +20,19 @@ package org.apache.struts2.result;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.ActionContext;
-import org.apache.struts2.mock.MockActionInvocation;
-import org.apache.struts2.util.ValueStackFactory;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsInternalTestCase;
import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.dispatcher.DispatcherConstants;
+import org.apache.struts2.dispatcher.Parameter;
+import org.apache.struts2.mock.MockActionInvocation;
+import org.apache.struts2.util.ValueStackFactory;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import java.util.Map;
public class ServletDispatcherResultTest extends StrutsInternalTestCase
implements StrutsStatics {
@@ -53,8 +56,7 @@ public class ServletDispatcherResultTest extends
StrutsInternalTestCase implemen
try {
view.execute(null);
} catch (Exception e) {
-e.printStackTrace();
-fail();
+fail(e.getMessage());
}
dispatcherMock.verify();
@@ -86,8 +88,7 @@ public class ServletDispatcherResultTest extends
StrutsInternalTestCase implemen
try {
view.execute(null);
} catch (Exception e) {
-e.printStackTrace();
-fail();
+fail(e.getMessage());
}
dispatcherMock.verify();
@@ -123,12 +124,17 @@ public class ServletDispatcherResultTest extends
StrutsInternalTestCase implemen
try {
view.execute(mockActionInvocation);
} catch (Exception e) {
-e.printStackTrace();
-fail();
+fail(e.getMessage());
}
assertTrue(mockActionInvocation.getInvocationContext().getParameters().contains("bar"));
assertEquals("1",
mockActionInvocation.getInvocationContext().getParameters().get("bar").getValue());
+
+// See https://issues.apache.org/jira/browse/WW-5486
+Map co
(struts) branch fix/WW-5486-request-params created (now 24e60416f)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5486-request-params in repository https://gitbox.apache.org/repos/asf/struts.git at 24e60416f WW-5486 Fixes exposing params added by ServletDispatcherResult This branch includes the following new commits: new 24e60416f WW-5486 Fixes exposing params added by ServletDispatcherResult 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.
