(struts) branch release/struts-7-0-x updated (99434d99b -> 0e6008d63)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 99434d99b Merge pull request #1036 from apache/feature/WW-3714-rename add 7cdcd84b8 Merge pull request #1072 from apache/fix/WW-5468-modeldriven-2 add a0dc19c4b Merge pull request #1104 from apache/WW-5468-modeldriven-strutsparameter-fix add fe46ad9f4 WW-5478 Deprecate DefaultResultFactory add c17639092 WW-5478 Fix ActionContext equals/hashCode contract add 1908cbab8 Merge pull request #1105 from apache/WW-5476-defaultresultfactory add a43f8a523 Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-11-02 add ecad4a576 Replace com.opensymphony.xwork2 mentions add 0e6008d63 Merge pull request #1106 from apache/7.0.x/merge-master-2024-11-02 No new revisions were added by this update. Summary of changes: .../java/org/apache/struts2/ActionContext.java | 5 .../main/java/org/apache/struts2/ModelDriven.java | 3 ++ .../struts2/config/entities/ResultConfig.java | 6 ++-- .../struts2/config/impl/DefaultConfiguration.java | 4 +-- .../struts2/factory/DefaultResultFactory.java | 3 ++ .../interceptor/ActionFileUploadInterceptor.java | 2 +- .../parameter/ParametersInterceptor.java | 32 +++--- .../ChainingInterceptorWithConfigTest.java | 7 +++-- .../PackageBasedActionConfigBuilderTest.java | 4 +-- .../struts2/rest/RestActionInvocationTest.java | 14 -- 10 files changed, 45 insertions(+), 35 deletions(-)
(struts) branch 7.0.x/merge-master-2024-11-02 deleted (was ecad4a576)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/merge-master-2024-11-02 in repository https://gitbox.apache.org/repos/asf/struts.git was ecad4a576 Replace com.opensymphony.xwork2 mentions 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 (0e6008d63 -> 46251a11f)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 0e6008d63 Merge pull request #1106 from apache/7.0.x/merge-master-2024-11-02 add 0d0560370 WW-5478 Delete deprecated DefaultResultFactory add 46251a11f Merge pull request #1107 from apache/7.0.x/WW-5478-delete-result No new revisions were added by this update. Summary of changes: .../struts2/factory/DefaultResultFactory.java | 81 -- 1 file changed, 81 deletions(-) delete mode 100644 core/src/main/java/org/apache/struts2/factory/DefaultResultFactory.java
(struts) branch master updated (1908cbab8 -> 22036174c)
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.git from 1908cbab8 Merge pull request #1105 from apache/WW-5476-defaultresultfactory add ced44650e WW-5480 Warn against potential templating bug add 22036174c Merge pull request #1108 from apache/WW-5480-templating-warning No new revisions were added by this update. Summary of changes: .../java/org/apache/struts2/components/UIBean.java | 9 +++- .../org/apache/struts2/components/UIBeanTest.java | 48 ++ 2 files changed, 47 insertions(+), 10 deletions(-)
(struts) branch WW-5480-templating-warning deleted (was ced44650e)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5480-templating-warning in repository https://gitbox.apache.org/repos/asf/struts.git was ced44650e WW-5480 Warn against potential templating bug 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 7.0.x/WW-5478-delete-result deleted (was 0d0560370)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5478-delete-result in repository https://gitbox.apache.org/repos/asf/struts.git was 0d0560370 WW-5478 Delete deprecated DefaultResultFactory 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 WW-3714-result-repackage created (now d351843ec)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-3714-result-repackage in repository https://gitbox.apache.org/repos/asf/struts.git at d351843ec WW-3714 Move new Result class into result package This branch includes the following new commits: new d351843ec WW-3714 Move new Result class into result package 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-3714 Move new Result class into result package
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-3714-result-repackage
in repository https://gitbox.apache.org/repos/asf/struts.git
commit d351843ecd0a41207198cb64b801df7af6d945ff
Author: Kusal Kithul-Godage
AuthorDate: Sat Nov 2 23:01:07 2024 +1100
WW-3714 Move new Result class into result package
---
core/src/main/java/com/opensymphony/xwork2/Result.java | 10 +-
.../com/opensymphony/xwork2/factory/DefaultResultFactory.java | 4 ++--
core/src/main/java/org/apache/struts2/ActionInvocation.java| 1 +
.../java/org/apache/struts2/factory/StrutsResultFactory.java | 4 ++--
.../org/apache/struts2/interceptor/ChainingInterceptor.java| 2 +-
core/src/main/java/org/apache/struts2/{ => result}/Result.java | 5 -
.../providers/ConfigurationProviderOgnlAllowlistTest.java | 6 +++---
7 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/core/src/main/java/com/opensymphony/xwork2/Result.java
b/core/src/main/java/com/opensymphony/xwork2/Result.java
index 36a93438a..f2e74d034 100644
--- a/core/src/main/java/com/opensymphony/xwork2/Result.java
+++ b/core/src/main/java/com/opensymphony/xwork2/Result.java
@@ -21,10 +21,10 @@ package com.opensymphony.xwork2;
/**
* {@inheritDoc}
*
- * @deprecated since 6.7.0, use {@link org.apache.struts2.Result} instead.
+ * @deprecated since 6.7.0, use {@link org.apache.struts2.result.Result}
instead.
*/
@Deprecated
-public interface Result extends org.apache.struts2.Result {
+public interface Result extends org.apache.struts2.result.Result {
@Override
default void execute(org.apache.struts2.ActionInvocation invocation)
throws Exception {
@@ -33,7 +33,7 @@ public interface Result extends org.apache.struts2.Result {
void execute(ActionInvocation invocation) throws Exception;
-static Result adapt(org.apache.struts2.Result actualResult) {
+static Result adapt(org.apache.struts2.result.Result actualResult) {
if (actualResult instanceof Result) {
return (Result) actualResult;
}
@@ -42,9 +42,9 @@ public interface Result extends org.apache.struts2.Result {
class LegacyAdapter implements Result {
-private final org.apache.struts2.Result adaptee;
+private final org.apache.struts2.result.Result adaptee;
-private LegacyAdapter(org.apache.struts2.Result adaptee) {
+private LegacyAdapter(org.apache.struts2.result.Result adaptee) {
this.adaptee = adaptee;
}
diff --git
a/core/src/main/java/com/opensymphony/xwork2/factory/DefaultResultFactory.java
b/core/src/main/java/com/opensymphony/xwork2/factory/DefaultResultFactory.java
index b4e312bfd..f4b673dd3 100644
---
a/core/src/main/java/com/opensymphony/xwork2/factory/DefaultResultFactory.java
+++
b/core/src/main/java/com/opensymphony/xwork2/factory/DefaultResultFactory.java
@@ -73,8 +73,8 @@ public class DefaultResultFactory implements ResultFactory {
if (o instanceof Result) {
result = (Result) o;
-} else if (o instanceof org.apache.struts2.Result) {
-result = Result.adapt((org.apache.struts2.Result) o);
+} else if (o instanceof org.apache.struts2.result.Result) {
+result = Result.adapt((org.apache.struts2.result.Result) o);
}
if (result == null) {
throw new ConfigurationException("Class [" + resultClassName +
"] does not implement Result", resultConfig);
diff --git a/core/src/main/java/org/apache/struts2/ActionInvocation.java
b/core/src/main/java/org/apache/struts2/ActionInvocation.java
index 5fcbc75ec..2a90a06b4 100644
--- a/core/src/main/java/org/apache/struts2/ActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java
@@ -20,6 +20,7 @@ package org.apache.struts2;
import com.opensymphony.xwork2.ActionChainResult;
import org.apache.struts2.interceptor.PreResultListener;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.ValueStack;
/**
diff --git
a/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java
b/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java
index 8a653bdaf..79a5ff169 100644
--- a/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java
+++ b/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java
@@ -61,8 +61,8 @@ public class StrutsResultFactory implements ResultFactory {
}
if (o instanceof Result) {
result = (Result) o;
-} else if (o instanceof org.apache.struts2.Result) {
-result = Result.adapt((org.apache.struts2.Result) o);
+} else if (o instanceof org.apache.struts2.result.Result) {
+result = Result.adapt((org.apache.struts2.result.Result) o);
}
if (result == null) {
throw new Configuratio
(struts) branch 7.0.x/merge-master-2024-11-03 created (now 5e4000293)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/merge-master-2024-11-03 in repository https://gitbox.apache.org/repos/asf/struts.git at 5e4000293 Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03 This branch includes the following new commits: new 99a9bc72a Merge branch 'master' into 7.0.x/merge-master-2024-11-03 new 761892cad WW-3714 Move new Result class into result package new 5e4000293 Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03 The 3 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) 03/03: Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch 7.0.x/merge-master-2024-11-03 in repository https://gitbox.apache.org/repos/asf/struts.git commit 5e40002937aefd6812c44772ab7351a2c8d2b30d Merge: 761892cad d351843ec Author: Kusal Kithul-Godage AuthorDate: Sat Nov 2 23:04:47 2024 +1100 Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03
(struts) 02/03: WW-3714 Move new Result class into result package
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch 7.0.x/merge-master-2024-11-03
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 761892cadf52b7071bad4de97850610304a1a714
Author: Kusal Kithul-Godage
AuthorDate: Sat Nov 2 23:04:02 2024 +1100
WW-3714 Move new Result class into result package
---
.../java/org/apache/struts2/ActionChainResult.java | 5 +-
.../java/org/apache/struts2/ActionInvocation.java | 1 +
.../apache/struts2/DefaultActionInvocation.java| 1 +
.../struts2/DefaultUnknownHandlerManager.java | 1 +
.../java/org/apache/struts2/ObjectFactory.java | 15 +++---
.../java/org/apache/struts2/UnknownHandler.java| 1 +
.../org/apache/struts2/UnknownHandlerManager.java | 1 +
.../java/org/apache/struts2/config/NullResult.java | 2 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 56 +++---
.../struts2/dispatcher/mapper/ActionMapping.java | 2 +-
.../org/apache/struts2/factory/ResultFactory.java | 4 +-
.../struts2/factory/StrutsResultFactory.java | 2 +-
.../struts2/interceptor/ChainingInterceptor.java | 2 +-
.../interceptor/MessageStoreInterceptor.java | 7 ++-
.../struts2/interceptor/PreResultListener.java | 5 +-
.../interceptor/TokenSessionStoreInterceptor.java | 8 ++--
.../apache/struts2/mock/MockActionInvocation.java | 2 +-
.../java/org/apache/struts2/mock/MockResult.java | 2 +-
.../apache/struts2/result/HttpHeaderResult.java| 7 ++-
.../struts2/result/ParamNameAwareResult.java | 2 +-
.../org/apache/struts2/result/PlainResult.java | 8 ++--
.../org/apache/struts2/{ => result}/Result.java| 5 +-
.../result/ServletActionRedirectResult.java| 4 +-
.../apache/struts2/result/StrutsResultSupport.java | 5 +-
.../org/apache/struts2/ActionChainResultTest.java | 3 +-
.../org/apache/struts2/ActionInvocationTest.java | 6 +--
.../struts2/DefaultActionInvocationTest.java | 5 +-
.../test/java/org/apache/struts2/SimpleAction.java | 1 +
.../org/apache/struts2/TestActionTagResult.java| 3 +-
.../test/java/org/apache/struts2/TestResult.java | 8 ++--
.../test/java/org/apache/struts2/VoidResult.java | 2 +
.../ConfigurationProviderOgnlAllowlistTest.java| 6 +--
.../config/providers/SomeUnknownHandler.java | 4 +-
.../struts2/factory/StrutsResultFactoryTest.java | 4 +-
.../org/apache/struts2/result/PlainResultTest.java | 3 +-
.../apache/struts2/result/PostbackResultTest.java | 3 +-
.../struts2/result/ServletRedirectResultTest.java | 13 +++--
.../apache/struts/beanvalidation/VoidResult.java | 2 +-
.../convention/ConventionUnknownHandler.java | 25 ++
.../PackageBasedActionConfigBuilderTest.java | 24 +-
.../java/org/apache/struts2/json/JSONResult.java | 18 +++
.../org/apache/struts2/json/JSONResultTest.java| 8 ++--
.../apache/struts2/rest/RestActionInvocation.java | 20
.../test/java/org/apache/struts2/SimpleAction.java | 10 +++-
.../struts2/spring/SpringObjectFactoryTest.java| 4 +-
.../org/apache/struts2/spring/SpringResult.java| 2 +-
.../spring/interceptor/TestActionInvocation.java | 6 ++-
.../org/apache/struts2/result/xslt/XSLTResult.java | 12 ++---
.../apache/struts2/result/xslt/XSLTResultTest.java | 8 ++--
49 files changed, 188 insertions(+), 160 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/ActionChainResult.java
b/core/src/main/java/org/apache/struts2/ActionChainResult.java
index 447601b42..30f59b1a6 100644
--- a/core/src/main/java/org/apache/struts2/ActionChainResult.java
+++ b/core/src/main/java/org/apache/struts2/ActionChainResult.java
@@ -18,10 +18,11 @@
*/
package org.apache.struts2;
-import org.apache.struts2.inject.Inject;
-import org.apache.struts2.util.TextParseUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.struts2.inject.Inject;
+import org.apache.struts2.result.Result;
+import org.apache.struts2.util.TextParseUtil;
import java.util.HashSet;
import java.util.LinkedList;
diff --git a/core/src/main/java/org/apache/struts2/ActionInvocation.java
b/core/src/main/java/org/apache/struts2/ActionInvocation.java
index 71e2c8330..f203cc777 100644
--- a/core/src/main/java/org/apache/struts2/ActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java
@@ -19,6 +19,7 @@
package org.apache.struts2;
import org.apache.struts2.interceptor.PreResultListener;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.ValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
index 079b7e17f..b146b7c74 100644
--- a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
@@ -33
(struts) 01/03: Merge branch 'master' into 7.0.x/merge-master-2024-11-03
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch 7.0.x/merge-master-2024-11-03 in repository https://gitbox.apache.org/repos/asf/struts.git commit 99a9bc72a090dd9b2962494349dbeb628fbc22af Merge: 46251a11f 22036174c Author: Kusal Kithul-Godage AuthorDate: Sat Nov 2 23:02:21 2024 +1100 Merge branch 'master' into 7.0.x/merge-master-2024-11-03 .../java/org/apache/struts2/components/UIBean.java | 9 +++- .../org/apache/struts2/components/UIBeanTest.java | 48 ++ 2 files changed, 47 insertions(+), 10 deletions(-)
(struts) 01/01: WW-3714 Move new Result class into result package
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch 7.0.x/WW-3714-result-repkg
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 87df4a229d4d642a244b0ff06b8fc09169bc3c1a
Author: Kusal Kithul-Godage
AuthorDate: Sat Nov 2 23:04:02 2024 +1100
WW-3714 Move new Result class into result package
---
.../java/org/apache/struts2/ActionChainResult.java | 5 +-
.../java/org/apache/struts2/ActionInvocation.java | 1 +
.../apache/struts2/DefaultActionInvocation.java| 1 +
.../struts2/DefaultUnknownHandlerManager.java | 1 +
.../java/org/apache/struts2/ObjectFactory.java | 15 +++---
.../java/org/apache/struts2/UnknownHandler.java| 1 +
.../org/apache/struts2/UnknownHandlerManager.java | 1 +
.../java/org/apache/struts2/config/NullResult.java | 2 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 56 +++---
.../struts2/dispatcher/mapper/ActionMapping.java | 2 +-
.../org/apache/struts2/factory/ResultFactory.java | 4 +-
.../struts2/factory/StrutsResultFactory.java | 2 +-
.../struts2/interceptor/ChainingInterceptor.java | 2 +-
.../interceptor/MessageStoreInterceptor.java | 7 ++-
.../struts2/interceptor/PreResultListener.java | 5 +-
.../interceptor/TokenSessionStoreInterceptor.java | 8 ++--
.../apache/struts2/mock/MockActionInvocation.java | 2 +-
.../java/org/apache/struts2/mock/MockResult.java | 2 +-
.../apache/struts2/result/HttpHeaderResult.java| 7 ++-
.../struts2/result/ParamNameAwareResult.java | 2 +-
.../org/apache/struts2/result/PlainResult.java | 8 ++--
.../org/apache/struts2/{ => result}/Result.java| 5 +-
.../result/ServletActionRedirectResult.java| 4 +-
.../apache/struts2/result/StrutsResultSupport.java | 5 +-
.../org/apache/struts2/ActionChainResultTest.java | 3 +-
.../org/apache/struts2/ActionInvocationTest.java | 6 +--
.../struts2/DefaultActionInvocationTest.java | 5 +-
.../test/java/org/apache/struts2/SimpleAction.java | 1 +
.../org/apache/struts2/TestActionTagResult.java| 3 +-
.../test/java/org/apache/struts2/TestResult.java | 8 ++--
.../test/java/org/apache/struts2/VoidResult.java | 2 +
.../ConfigurationProviderOgnlAllowlistTest.java| 6 +--
.../config/providers/SomeUnknownHandler.java | 4 +-
.../struts2/factory/StrutsResultFactoryTest.java | 4 +-
.../org/apache/struts2/result/PlainResultTest.java | 3 +-
.../apache/struts2/result/PostbackResultTest.java | 3 +-
.../struts2/result/ServletRedirectResultTest.java | 13 +++--
.../apache/struts/beanvalidation/VoidResult.java | 2 +-
.../convention/ConventionUnknownHandler.java | 25 ++
.../PackageBasedActionConfigBuilderTest.java | 24 +-
.../java/org/apache/struts2/json/JSONResult.java | 18 +++
.../org/apache/struts2/json/JSONResultTest.java| 8 ++--
.../apache/struts2/rest/RestActionInvocation.java | 20
.../test/java/org/apache/struts2/SimpleAction.java | 10 +++-
.../struts2/spring/SpringObjectFactoryTest.java| 4 +-
.../org/apache/struts2/spring/SpringResult.java| 2 +-
.../spring/interceptor/TestActionInvocation.java | 6 ++-
.../org/apache/struts2/result/xslt/XSLTResult.java | 12 ++---
.../apache/struts2/result/xslt/XSLTResultTest.java | 8 ++--
49 files changed, 188 insertions(+), 160 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/ActionChainResult.java
b/core/src/main/java/org/apache/struts2/ActionChainResult.java
index 447601b42..30f59b1a6 100644
--- a/core/src/main/java/org/apache/struts2/ActionChainResult.java
+++ b/core/src/main/java/org/apache/struts2/ActionChainResult.java
@@ -18,10 +18,11 @@
*/
package org.apache.struts2;
-import org.apache.struts2.inject.Inject;
-import org.apache.struts2.util.TextParseUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.struts2.inject.Inject;
+import org.apache.struts2.result.Result;
+import org.apache.struts2.util.TextParseUtil;
import java.util.HashSet;
import java.util.LinkedList;
diff --git a/core/src/main/java/org/apache/struts2/ActionInvocation.java
b/core/src/main/java/org/apache/struts2/ActionInvocation.java
index 71e2c8330..f203cc777 100644
--- a/core/src/main/java/org/apache/struts2/ActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java
@@ -19,6 +19,7 @@
package org.apache.struts2;
import org.apache.struts2.interceptor.PreResultListener;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.ValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
index 079b7e17f..b146b7c74 100644
--- a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
@@ -33,6
(struts) branch 7.0.x/WW-3714-result-repkg created (now 87df4a229)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-3714-result-repkg in repository https://gitbox.apache.org/repos/asf/struts.git at 87df4a229 WW-3714 Move new Result class into result package This branch includes the following new commits: new 87df4a229 WW-3714 Move new Result class into result package 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 7.0.x/merge-master-2024-11-03 updated (5e4000293 -> 01d953b1e)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/merge-master-2024-11-03 in repository https://gitbox.apache.org/repos/asf/struts.git omit 5e4000293 Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03 omit 761892cad WW-3714 Move new Result class into result package omit 99a9bc72a Merge branch 'master' into 7.0.x/merge-master-2024-11-03 add 87df4a229 WW-3714 Move new Result class into result package add 01d953b1e Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03 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 (5e4000293) \ N -- N -- N refs/heads/7.0.x/merge-master-2024-11-03 (01d953b1e) 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:
(struts) 01/02: Merge remote-tracking branch 'origin/feature/WW-5459-restructure' into 7.0.x/merge-master-2024-11-03-v2
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch 7.0.x/merge-master-2024-11-03-v2
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 3a27b2a0059bc475082d7feef042d7068e6fb491
Merge: b0f2f0a8b b835e8978
Author: Kusal Kithul-Godage
AuthorDate: Sun Nov 3 12:04:25 2024 +1100
Merge remote-tracking branch 'origin/feature/WW-5459-restructure' into
7.0.x/merge-master-2024-11-03-v2
.../apache/struts2/showcase/action/JSPEvalAction.java | 2 +-
.../apache/struts2/showcase/ajax/AjaxTestAction.java | 2 +-
.../showcase/chat/ChatAuthenticationInterceptor.java | 2 +-
.../apache/struts2/showcase/chat/ChatInterceptor.java | 2 +-
.../showcase/filedownload/FileDownloadAction.java | 2 +-
.../main/java/org/apache/struts2/ActionContext.java| 1 +
.../main/java/org/apache/struts2/ActionInvocation.java | 2 ++
.../main/java/org/apache/struts2/ActionSupport.java| 1 +
.../org/apache/struts2/DefaultActionInvocation.java| 2 ++
.../java/org/apache/struts2/{ => action}/Action.java | 2 +-
.../config/providers/XmlDocConfigurationProvider.java | 2 +-
.../struts2/interceptor/ChainingInterceptor.java | 2 +-
.../interceptor/DefaultWorkflowInterceptor.java| 2 +-
.../struts2/interceptor/ExecuteAndWaitInterceptor.java | 3 +--
.../org/apache/struts2/interceptor/Interceptor.java| 5 +++--
.../apache/struts2/interceptor/PreResultListener.java | 4 ++--
.../struts2/interceptor/annotations/InputConfig.java | 2 +-
.../struts2/interceptor/parameter/StrutsParameter.java | 4 +++-
.../apache/struts2/{ => result}/ActionChainResult.java | 12
.../main/java/org/apache/struts2/result/Result.java| 2 +-
.../org/apache/struts2/util/AppendIteratorFilter.java | 2 +-
.../org/apache/struts2/util/IteratorGenerator.java | 2 +-
.../org/apache/struts2/util/MergeIteratorFilter.java | 2 +-
.../org/apache/struts2/util/SortIteratorFilter.java| 2 +-
.../org/apache/struts2/util/SubsetIteratorFilter.java | 2 +-
core/src/main/resources/struts-default.xml | 2 +-
core/src/main/resources/xwork-default.xml | 2 +-
.../java/org/apache/struts2/ActionChainResultTest.java | 1 +
.../java/org/apache/struts2/ActionNestingTest.java | 1 +
.../java/org/apache/struts2/ActionSupportTest.java | 1 +
.../test/java/org/apache/struts2/ChainResultTest.java | 2 +-
.../apache/struts2/DefaultActionInvocationTest.java| 1 +
.../org/apache/struts2/ExternalReferenceAction.java| 2 ++
.../src/test/java/org/apache/struts2/NestedAction.java | 1 +
.../test/java/org/apache/struts2/SimpleFooAction.java | 2 ++
core/src/test/java/org/apache/struts2/TestAction.java | 3 +--
.../org/apache/struts2/TestConfigurationProvider.java | 5 +
.../java/org/apache/struts2/components/FormTest.java | 2 +-
.../java/org/apache/struts2/config/SettingsTest.java | 2 +-
.../ConfigurationProviderOgnlAllowlistTest.java| 10 +-
.../config/providers/MockConfigurationProvider.java| 4 ++--
.../config/providers/NoNoArgsConstructorAction.java| 2 +-
.../config/providers/PrivateConstructorAction.java | 2 +-
.../XmlConfigurationProviderExceptionMappingsTest.java | 2 +-
.../XmlConfigurationProviderMultilevelTest.java| 2 +-
.../providers/XmlConfigurationProviderResultsTest.java | 4 ++--
.../XmlConfigurationProviderWildCardIncludeTest.java | 4 ++--
.../struts2/conversion/ConversionTestAction.java | 2 +-
.../struts2/interceptor/AliasInterceptorTest.java | 2 +-
.../struts2/interceptor/ChainingInterceptorTest.java | 4 ++--
.../interceptor/ChainingInterceptorWithConfigTest.java | 4 ++--
.../interceptor/ConversionErrorInterceptorTest.java| 2 +-
.../struts2/interceptor/CookieInterceptorTest.java | 2 +-
.../interceptor/DefaultWorkflowInterceptorTest.java| 2 +-
.../interceptor/ExceptionMappingInterceptorTest.java | 2 +-
.../struts2/interceptor/ExecuteAndWaitDelayAction.java | 2 +-
.../interceptor/ExecuteAndWaitInterceptorTest.java | 2 +-
.../struts2/interceptor/I18nInterceptorTest.java | 2 +-
.../interceptor/MessageStoreInterceptorTest.java | 3 +--
.../interceptor/MessageStorePreResultListenerTest.java | 2 +-
.../interceptor/ModelDrivenInterceptorTest.java| 2 +-
.../struts2/interceptor/PreResultListenerTest.java | 2 +-
.../struts2/interceptor/PrepareInterceptorTest.java| 2 +-
.../interceptor/ScopedModelDrivenInterceptorTest.java | 2 +-
.../interceptor/ServletConfigInterceptorTest.java | 2 +-
.../StrutsConversionErrorInterceptorTest.java | 2 +-
.../struts2/interceptor/TokenInterceptorTest.java | 2 +-
.../interceptor/TokenSessionStoreInterceptorTest.java | 2 +-
.../struts2/interceptor/ValidationErrorAwareTest.java | 2 +-
...alidationInterceptorPre
(struts) branch 7.0.x/merge-master-2024-11-03-v2 created (now 93e4f2718)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/merge-master-2024-11-03-v2 in repository https://gitbox.apache.org/repos/asf/struts.git at 93e4f2718 Merge remote-tracking branch 'origin/WW-3714-overriding-behaviour' into 7.0.x/merge-master-2024-11-03-v2 This branch includes the following new commits: new 3a27b2a00 Merge remote-tracking branch 'origin/feature/WW-5459-restructure' into 7.0.x/merge-master-2024-11-03-v2 new 93e4f2718 Merge remote-tracking branch 'origin/WW-3714-overriding-behaviour' into 7.0.x/merge-master-2024-11-03-v2 The 2 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) 02/02: Merge remote-tracking branch 'origin/WW-3714-overriding-behaviour' into 7.0.x/merge-master-2024-11-03-v2
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch 7.0.x/merge-master-2024-11-03-v2 in repository https://gitbox.apache.org/repos/asf/struts.git commit 93e4f27188b6855d097b777345e3c32105df14fc Merge: 3a27b2a00 be82a7240 Author: Kusal Kithul-Godage AuthorDate: Sun Nov 3 12:05:44 2024 +1100 Merge remote-tracking branch 'origin/WW-3714-overriding-behaviour' into 7.0.x/merge-master-2024-11-03-v2
(struts) 01/01: Merge pull request #1109 from apache/WW-3714-result-repackage
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.git
commit 2beac8eba4ad6a4422926598ca8cabd79e80e420
Merge: 22036174c d351843ec
Author: Kusal Kithul-Godage
AuthorDate: Sun Nov 3 10:46:42 2024 +1100
Merge pull request #1109 from apache/WW-3714-result-repackage
WW-3714 Move new Result class into result package
core/src/main/java/com/opensymphony/xwork2/Result.java | 10 +-
.../com/opensymphony/xwork2/factory/DefaultResultFactory.java | 4 ++--
core/src/main/java/org/apache/struts2/ActionInvocation.java| 1 +
.../java/org/apache/struts2/factory/StrutsResultFactory.java | 4 ++--
.../org/apache/struts2/interceptor/ChainingInterceptor.java| 2 +-
core/src/main/java/org/apache/struts2/{ => result}/Result.java | 5 -
.../providers/ConfigurationProviderOgnlAllowlistTest.java | 6 +++---
7 files changed, 18 insertions(+), 14 deletions(-)
(struts) branch WW-3714-result-repackage deleted (was d351843ec)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-3714-result-repackage in repository https://gitbox.apache.org/repos/asf/struts.git was d351843ec WW-3714 Move new Result class into result package 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 master updated (22036174c -> 2beac8eba)
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.git
from 22036174c Merge pull request #1108 from
apache/WW-5480-templating-warning
add d351843ec WW-3714 Move new Result class into result package
new 2beac8eba Merge pull request #1109 from apache/WW-3714-result-repackage
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:
core/src/main/java/com/opensymphony/xwork2/Result.java | 10 +-
.../com/opensymphony/xwork2/factory/DefaultResultFactory.java | 4 ++--
core/src/main/java/org/apache/struts2/ActionInvocation.java| 1 +
.../java/org/apache/struts2/factory/StrutsResultFactory.java | 4 ++--
.../org/apache/struts2/interceptor/ChainingInterceptor.java| 2 +-
core/src/main/java/org/apache/struts2/{ => result}/Result.java | 5 -
.../providers/ConfigurationProviderOgnlAllowlistTest.java | 6 +++---
7 files changed, 18 insertions(+), 14 deletions(-)
rename core/src/main/java/org/apache/struts2/{ => result}/Result.java (93%)
(struts) branch release/struts-7-0-x updated (3931968b1 -> b0f2f0a8b)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 3931968b1 Merge pull request # from apache/7.0.x/WW-3714-result-repkg add ced44650e WW-5480 Warn against potential templating bug add 22036174c Merge pull request #1108 from apache/WW-5480-templating-warning add d351843ec WW-3714 Move new Result class into result package add 01d953b1e Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03 add b0f2f0a8b Merge pull request #1110 from apache/7.0.x/merge-master-2024-11-03 No new revisions were added by this update. Summary of changes: .../java/org/apache/struts2/components/UIBean.java | 9 +++- .../org/apache/struts2/components/UIBeanTest.java | 48 ++ 2 files changed, 47 insertions(+), 10 deletions(-)
(struts) 01/01: WW-5459 Move new Action class into action package
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5459-repkg-action-chain
in repository https://gitbox.apache.org/repos/asf/struts.git
commit b001c61f8994050ca9656072eb8ba505e398b463
Author: Kusal Kithul-Godage
AuthorDate: Sun Nov 3 10:49:36 2024 +1100
WW-5459 Move new Action class into action package
---
core/src/main/java/com/opensymphony/xwork2/Action.java | 4 ++--
core/src/main/java/org/apache/struts2/ActionContext.java| 1 +
core/src/main/java/org/apache/struts2/ActionInvocation.java | 1 +
core/src/main/java/org/apache/struts2/ActionSupport.java| 1 +
core/src/main/java/org/apache/struts2/{ => action}/Action.java | 2 +-
core/src/main/java/org/apache/struts2/result/Result.java| 2 +-
.../config/providers/ConfigurationProviderOgnlAllowlistTest.java| 6 +++---
7 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/core/src/main/java/com/opensymphony/xwork2/Action.java
b/core/src/main/java/com/opensymphony/xwork2/Action.java
index 57d767834..4fa03a7b3 100644
--- a/core/src/main/java/com/opensymphony/xwork2/Action.java
+++ b/core/src/main/java/com/opensymphony/xwork2/Action.java
@@ -21,8 +21,8 @@ package com.opensymphony.xwork2;
/**
* {@inheritDoc}
*
- * @deprecated since 6.7.0, use {@link org.apache.struts2.Action} instead.
+ * @deprecated since 6.7.0, use {@link org.apache.struts2.action.Action}
instead.
*/
@Deprecated
-public interface Action extends org.apache.struts2.Action {
+public interface Action extends org.apache.struts2.action.Action {
}
diff --git a/core/src/main/java/org/apache/struts2/ActionContext.java
b/core/src/main/java/org/apache/struts2/ActionContext.java
index 335c24e95..0bd28253b 100644
--- a/core/src/main/java/org/apache/struts2/ActionContext.java
+++ b/core/src/main/java/org/apache/struts2/ActionContext.java
@@ -20,6 +20,7 @@ package org.apache.struts2;
import com.opensymphony.xwork2.conversion.impl.ConversionData;
import com.opensymphony.xwork2.inject.Container;
+import org.apache.struts2.action.Action;
import org.apache.struts2.dispatcher.HttpParameters;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.util.ValueStack;
diff --git a/core/src/main/java/org/apache/struts2/ActionInvocation.java
b/core/src/main/java/org/apache/struts2/ActionInvocation.java
index 2a90a06b4..97acc6cb1 100644
--- a/core/src/main/java/org/apache/struts2/ActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java
@@ -19,6 +19,7 @@
package org.apache.struts2;
import com.opensymphony.xwork2.ActionChainResult;
+import org.apache.struts2.action.Action;
import org.apache.struts2.interceptor.PreResultListener;
import org.apache.struts2.result.Result;
import org.apache.struts2.util.ValueStack;
diff --git a/core/src/main/java/org/apache/struts2/ActionSupport.java
b/core/src/main/java/org/apache/struts2/ActionSupport.java
index 04c513f3a..894dc9ed4 100644
--- a/core/src/main/java/org/apache/struts2/ActionSupport.java
+++ b/core/src/main/java/org/apache/struts2/ActionSupport.java
@@ -29,6 +29,7 @@ import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.struts2.action.Action;
import org.apache.struts2.interceptor.ValidationAware;
import java.io.Serializable;
diff --git a/core/src/main/java/org/apache/struts2/Action.java
b/core/src/main/java/org/apache/struts2/action/Action.java
similarity index 98%
rename from core/src/main/java/org/apache/struts2/Action.java
rename to core/src/main/java/org/apache/struts2/action/Action.java
index cc3fb83ac..11064054b 100644
--- a/core/src/main/java/org/apache/struts2/Action.java
+++ b/core/src/main/java/org/apache/struts2/action/Action.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2;
+package org.apache.struts2.action;
/**
* All actions may implement this interface, which exposes the
execute() method.
diff --git a/core/src/main/java/org/apache/struts2/result/Result.java
b/core/src/main/java/org/apache/struts2/result/Result.java
index c30083d86..beb82b696 100644
--- a/core/src/main/java/org/apache/struts2/result/Result.java
+++ b/core/src/main/java/org/apache/struts2/result/Result.java
@@ -18,8 +18,8 @@
*/
package org.apache.struts2.result;
-import org.apache.struts2.Action;
import org.apache.struts2.ActionInvocation;
+import org.apache.struts2.action.Action;
import java.io.Serializable;
diff --git
a/core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
b/core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
index 6b31360a2..1c86c917b 100644
---
a/core/src/test/java/com/opensymphony/xwork2/config/prov
(struts) branch WW-5459-repkg-action-chain created (now b001c61f8)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5459-repkg-action-chain in repository https://gitbox.apache.org/repos/asf/struts.git at b001c61f8 WW-5459 Move new Action class into action package This branch includes the following new commits: new b001c61f8 WW-5459 Move new Action class into action package 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 7.0.x/merge-master-2024-11-03 deleted (was 01d953b1e)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/merge-master-2024-11-03 in repository https://gitbox.apache.org/repos/asf/struts.git was 01d953b1e Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03 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 WW-3714-overriding-behaviour updated (57e08fb37 -> be82a7240)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-3714-overriding-behaviour in repository https://gitbox.apache.org/repos/asf/struts.git discard 57e08fb37 WW-3714 Ensure correct delegation of new Interceptor API add be82a7240 WW-3714 Ensure correct delegation of new Interceptor API 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 (57e08fb37) \ N -- N -- N refs/heads/WW-3714-overriding-behaviour (be82a7240) 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: .../com/opensymphony/xwork2/interceptor/AbstractInterceptor.java | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-)
(struts) branch feature/WW-5481-text created (now 026c992c0)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5481-text in repository https://gitbox.apache.org/repos/asf/struts.git at 026c992c0 WW-5481 Extracts duplicated code This branch includes the following new commits: new dc62488bc WW-5481 Moves text related classes into org.apache.struts2.text new 026c992c0 WW-5481 Extracts duplicated code The 2 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/02: WW-5481 Moves text related classes into org.apache.struts2.text
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5481-text
in repository https://gitbox.apache.org/repos/asf/struts.git
commit dc62488bc01c5bcdd5bfc0503001b39b281da52c
Author: Lukasz Lenart
AuthorDate: Sat Nov 2 23:31:07 2024 +0100
WW-5481 Moves text related classes into org.apache.struts2.text
---
.../java/org/apache/struts2/ActionSupport.java | 2 +
.../org/apache/struts2/DefaultActionProxy.java | 1 +
.../java/org/apache/struts2/LocaleProvider.java| 5 +-
.../java/org/apache/struts2/components/Date.java | 2 +-
.../java/org/apache/struts2/components/I18n.java | 6 +-
.../config/StrutsBeanSelectionProvider.java| 6 +-
.../struts2/config/impl/DefaultConfiguration.java | 12 +--
.../struts2/conversion/impl/DateConverter.java | 2 +-
.../struts2/conversion/impl/XWorkConverter.java| 2 +-
.../interceptor/AbstractFileUploadInterceptor.java | 6 +-
.../struts2/interceptor/AliasInterceptor.java | 2 +-
.../interceptor/StaticParametersInterceptor.java | 2 +-
.../struts2/interceptor/TokenInterceptor.java | 6 +-
.../org/apache/struts2/ognl/OgnlValueStack.java| 2 +-
.../apache/struts2/ognl/OgnlValueStackFactory.java | 2 +-
.../AbstractLocalizedTextProvider.java | 89 +
.../struts2/{ => text}/CompositeTextProvider.java | 2 +-
.../struts2/{ => text}/DefaultTextProvider.java| 4 +-
.../GlobalLocalizedTextProvider.java | 13 +--
.../struts2/{ => text}/LocalizedTextProvider.java | 8 +-
.../{ => text}/ResourceBundleTextProvider.java | 6 +-
.../StrutsLocalizedTextProvider.java | 15 +--
.../{ => text}/StrutsTextProviderFactory.java | 5 +-
.../apache/struts2/{ => text}/TextProvider.java| 8 +-
.../struts2/{ => text}/TextProviderFactory.java| 4 +-
.../struts2/{ => text}/TextProviderSupport.java| 66 ++--
.../java/org/apache/struts2/util/DebugUtils.java | 2 +-
.../apache/struts2/util/TextProviderHelper.java| 3 +-
.../java/org/apache/struts2/util/TokenHelper.java | 2 +-
.../validator/DefaultActionValidatorManager.java | 2 +-
.../validator/DelegatingValidatorContext.java | 6 +-
.../apache/struts2/validator/ValidatorContext.java | 2 +-
.../validator/validators/ValidatorSupport.java | 2 +-
.../validators/VisitorFieldValidator.java | 4 +-
core/src/main/resources/struts-beans.xml | 14 +--
.../java/org/apache/struts2/ActionSupportTest.java | 1 +
.../java/org/apache/struts2/LocaleAwareTest.java | 1 +
.../java/org/apache/struts2/ModelDrivenAction.java | 2 +-
.../java/org/apache/struts2/ObjectFactoryTest.java | 1 +
.../apache/struts2/components/ComponentTest.java | 2 +-
.../org/apache/struts2/config/SettingsTest.java| 2 +-
.../config/StrutsBeanSelectionProviderTest.java| 3 +-
.../ConfigurationProviderOgnlAllowlistTest.java| 6 +-
.../struts2/conversion/impl/DateConverterTest.java | 2 +-
.../conversion/impl/XWorkBasicConverterTest.java | 2 +-
.../conversion/impl/XWorkConverterTest.java| 4 +-
.../apache/struts2/dispatcher/DispatcherTest.java | 2 +-
.../parameter/ParametersInterceptorTest.java | 2 +-
.../org/apache/struts2/mock/DummyTextProvider.java | 2 +-
.../org/apache/struts2/mock/InjectableAction.java | 2 +-
.../java/org/apache/struts2/ognl/OgnlUtilTest.java | 2 +-
.../apache/struts2/ognl/OgnlValueStackTest.java| 2 +-
.../apache/struts2/test/ModelDrivenAction2.java| 1 -
.../{ => text}/CompositeTextProviderTest.java | 46 +
.../{ => text}/DefaultTextProviderTest.java| 32 +++---
.../StrutsLocalizedTextProviderTest.java | 111 ++---
.../struts2/{ => text}/StubTextProvider.java | 2 +-
.../{ => text}/TextProviderSupportTest.java| 33 +++---
.../AnnotationActionValidatorManagerTest.java | 2 +-
.../ConversionErrorFieldValidatorTest.java | 2 +-
.../validator/DoubleRangeFieldValidatorTest.java | 2 +-
.../struts2/validator/DummyValidatorContext.java | 2 +-
.../struts2/validator/EmailValidatorTest.java | 2 +-
.../struts2/validator/ExpressionValidatorTest.java | 2 +-
.../struts2/validator/RegexFieldValidatorTest.java | 3 +-
...teConversionErrorFieldValidatorSupportTest.java | 2 +-
.../validator/SimpleActionValidationTest.java | 4 +-
.../validator/StringLengthFieldValidatorTest.java | 2 +-
.../struts2/validator/StringValidatorTest.java | 2 +-
.../apache/struts2/validator/URLValidatorTest.java | 2 +-
.../validators/AppendingValidatorContextTest.java | 6 +-
.../validators/CreditCardValidatorTest.java| 2 +-
.../validators/DateRangeFieldValidatorTest.java| 2 +-
.../validators/IntRangeFieldValidatorTest.java | 2 +-
.../validators/LongRangeFieldValidatorTest.java
(struts) 02/02: WW-5481 Extracts duplicated code
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5481-text
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 026c992c083e21382121780760d48fd8ab20a6d5
Author: Lukasz Lenart
AuthorDate: Sat Nov 2 23:53:02 2024 +0100
WW-5481 Extracts duplicated code
---
.../text/AbstractLocalizedTextProvider.java| 131 +---
.../struts2/text/GlobalLocalizedTextProvider.java | 170 ++-
.../apache/struts2/text/LocalizedTextProvider.java | 164 ++-
.../struts2/text/StrutsLocalizedTextProvider.java | 234 +++--
4 files changed, 253 insertions(+), 446 deletions(-)
diff --git
a/core/src/main/java/org/apache/struts2/text/AbstractLocalizedTextProvider.java
b/core/src/main/java/org/apache/struts2/text/AbstractLocalizedTextProvider.java
index e7683cd6c..6185552c1 100644
---
a/core/src/main/java/org/apache/struts2/text/AbstractLocalizedTextProvider.java
+++
b/core/src/main/java/org/apache/struts2/text/AbstractLocalizedTextProvider.java
@@ -67,24 +67,18 @@ abstract class AbstractLocalizedTextProvider implements
LocalizedTextProvider {
private final Set missingBundles = ConcurrentHashMap.newKeySet();
private final ConcurrentMap delegatedClassLoaderMap
= new ConcurrentHashMap<>();
-/**
- * Adds the bundle to the internal list of default bundles.
- * If the bundle already exists in the list it will be re-added.
- *
- * @param resourceBundleName the name of the bundle to add.
- */
@Override
-public void addDefaultResourceBundle(String resourceBundleName) {
+public void addDefaultResourceBundle(String bundleName) {
//make sure this doesn't get added more than once
final ClassLoader ccl = getCurrentThreadContextClassLoader();
synchronized (XWORK_MESSAGES_BUNDLE) {
List bundles =
classLoaderMap.computeIfAbsent(ccl.hashCode(), k -> new
CopyOnWriteArrayList<>());
-bundles.remove(resourceBundleName);
-bundles.add(0, resourceBundleName);
+bundles.remove(bundleName);
+bundles.add(0, bundleName);
}
if (LOG.isDebugEnabled()) {
-LOG.debug("Added default resource bundle '{}' to default resource
bundles for the following classloader '{}'", resourceBundleName,
ccl.toString());
+LOG.debug("Added default resource bundle '{}' to default resource
bundles for the following classloader '{}'", bundleName, ccl.toString());
}
}
@@ -113,16 +107,8 @@ abstract class AbstractLocalizedTextProvider implements
LocalizedTextProvider {
}
}
-/**
- * Returns a localized message for the specified key, aTextName. Neither
the key nor the
- * message is evaluated.
- *
- * @param aTextName the message key
- * @param localethe locale the message should be for
- * @return a localized message based on the specified key, or null if no
localized message can be found for it
- */
@Override
-public String findDefaultText(String aTextName, Locale locale) {
+public String findDefaultText(String textKey, Locale locale) {
List localList = getCurrentBundleNames();
for (String bundleName : localList) {
@@ -130,7 +116,7 @@ abstract class AbstractLocalizedTextProvider implements
LocalizedTextProvider {
if (bundle != null) {
reloadBundles();
try {
-return bundle.getString(aTextName);
+return bundle.getString(textKey);
} catch (MissingResourceException e) {
// will be logged when not found in any bundle
}
@@ -138,26 +124,17 @@ abstract class AbstractLocalizedTextProvider implements
LocalizedTextProvider {
}
if (devMode) {
-LOG.warn("Missing key [{}] in bundles [{}]!", aTextName,
localList);
+LOG.warn("Missing key [{}] in bundles [{}]!", textKey, localList);
} else {
-LOG.debug("Missing key [{}] in bundles [{}]!", aTextName,
localList);
+LOG.debug("Missing key [{}] in bundles [{}]!", textKey, localList);
}
return null;
}
-/**
- * Returns a localized message for the specified key, aTextName,
substituting variables from the
- * array of params into the message. Neither the key nor the message is
evaluated.
- *
- * @param aTextName the message key
- * @param localethe locale the message should be for
- * @param paramsan array of objects to be substituted into the message
text
- * @return A formatted message based on the specified key, or null if no
localized message can be found for it
- */
@Override
-public String findDefaultText(String aTextName, Locale locale, Object[]
params) {
-String defaultText = findDefaultText(aTextName, locale);
+publ
(struts) 01/01: WW-5482 Moves locale related code into org.apache.struts2.locale
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5482-locale
in repository https://gitbox.apache.org/repos/asf/struts.git
commit f7b6bc23a45526042ee344a02a77732cebcdf52b
Author: Lukasz Lenart
AuthorDate: Sun Nov 3 00:05:49 2024 +0100
WW-5482 Moves locale related code into org.apache.struts2.locale
---
.../java/org/apache/struts2/ActionSupport.java | 2 +
.../java/org/apache/struts2/StrutsConstants.java | 383 +++--
.../java/org/apache/struts2/components/I18n.java | 4 +-
.../config/StrutsBeanSelectionProvider.java| 2 +-
.../struts2/config/impl/DefaultConfiguration.java | 4 +-
.../conversion/impl/DefaultTypeConverter.java | 2 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 2 +-
.../multipart/MultiPartRequestWrapper.java | 2 +-
.../interceptor/AbstractFileUploadInterceptor.java | 4 +-
.../struts2/interceptor/I18nInterceptor.java | 5 +-
.../{ => locale}/DefaultLocaleProvider.java| 3 +-
.../{ => locale}/DefaultLocaleProviderFactory.java | 2 +-
.../struts2/{ => locale}/LocaleProvider.java | 9 +-
.../{ => locale}/LocaleProviderFactory.java| 4 +-
.../struts2/text/ResourceBundleTextProvider.java | 2 +-
.../struts2/text/StrutsTextProviderFactory.java| 2 +-
.../java/org/apache/struts2/text/TextProvider.java | 7 +-
.../apache/struts2/text/TextProviderSupport.java | 4 +-
.../validator/DelegatingValidatorContext.java | 4 +-
.../apache/struts2/validator/ValidatorContext.java | 2 +-
.../struts2/views/freemarker/FreemarkerResult.java | 2 +-
core/src/main/resources/struts-beans.xml | 4 +-
.../org/apache/struts2/LocaleProviderTest.java | 1 +
.../ConfigurationProviderOgnlAllowlistTest.java| 6 +-
.../ActionFileUploadInterceptorTest.java | 2 +-
.../struts2/interceptor/I18nInterceptorTest.java | 2 +-
.../{ => locale}/DefaultLocaleProviderTest.java| 3 +-
.../struts2/text/TextProviderSupportTest.java | 2 +-
.../struts2/tiles/StrutsTilesLocaleResolver.java | 2 +-
29 files changed, 333 insertions(+), 140 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/ActionSupport.java
b/core/src/main/java/org/apache/struts2/ActionSupport.java
index 6da71ae39..578da0167 100644
--- a/core/src/main/java/org/apache/struts2/ActionSupport.java
+++ b/core/src/main/java/org/apache/struts2/ActionSupport.java
@@ -25,6 +25,8 @@ import org.apache.struts2.conversion.impl.ConversionData;
import org.apache.struts2.inject.Container;
import org.apache.struts2.inject.Inject;
import org.apache.struts2.interceptor.ValidationAware;
+import org.apache.struts2.locale.LocaleProvider;
+import org.apache.struts2.locale.LocaleProviderFactory;
import org.apache.struts2.text.TextProvider;
import org.apache.struts2.text.TextProviderFactory;
import org.apache.struts2.util.ValueStack;
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java
b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index 85064e702..ae722ae4d 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -19,8 +19,6 @@
package org.apache.struts2;
import org.apache.struts2.components.date.DateFormatter;
-import org.apache.struts2.conversion.impl.XWorkBasicConverter;
-import org.apache.struts2.dispatcher.mapper.CompositeActionMapper;
/**
* This class provides a central location for framework configuration keys
@@ -28,13 +26,19 @@ import
org.apache.struts2.dispatcher.mapper.CompositeActionMapper;
*/
public final class StrutsConstants {
-/** Whether Struts is in development mode or not */
+/**
+ * Whether Struts is in development mode or not
+ */
public static final String STRUTS_DEVMODE = "struts.devMode";
-/** Whether the localization messages should automatically be reloaded */
+/**
+ * Whether the localization messages should automatically be reloaded
+ */
public static final String STRUTS_I18N_RELOAD = "struts.i18n.reload";
-/** The encoding to use for localization messages */
+/**
+ * The encoding to use for localization messages
+ */
public static final String STRUTS_I18N_ENCODING = "struts.i18n.encoding";
/**
@@ -48,33 +52,51 @@ public final class StrutsConstants {
*/
public static final String STRUTS_I18N_SEARCH_DEFAULTBUNDLES_FIRST =
"struts.i18n.search.defaultbundles.first";
-/** Whether to reload the XML configuration or not */
+/**
+ * Whether to reload the XML configuration or not
+ */
public static final String STRUTS_CONFIGURATION_XML_RELOAD =
"struts.configuration.xml.reload";
-/** The URL extension to use to determine if the request is meant for a
Struts action */
+/**
+ * The URL extension to use to determine if the request is meant for
(struts) branch feature/WW-5482-locale created (now f7b6bc23a)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5482-locale in repository https://gitbox.apache.org/repos/asf/struts.git at f7b6bc23a WW-5482 Moves locale related code into org.apache.struts2.locale This branch includes the following new commits: new f7b6bc23a WW-5482 Moves locale related code into org.apache.struts2.locale 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-5459 Deprecate and repackage ActionChainResult
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch WW-5459-repkg-action-chain-2 in repository https://gitbox.apache.org/repos/asf/struts.git commit 7f04e181e05c53d1839c843f7932bbd352dd54af Author: Kusal Kithul-Godage AuthorDate: Sun Nov 3 11:09:04 2024 +1100 WW-5459 Deprecate and repackage ActionChainResult --- .../com/opensymphony/xwork2/ActionChainResult.java | 262 + .../xwork2/DefaultActionInvocation.java| 1 + .../xwork2/interceptor/ChainingInterceptor.java| 4 +- .../java/org/apache/struts2/ActionInvocation.java | 2 +- .../struts2/interceptor/ChainingInterceptor.java | 2 +- .../apache/struts2/result}/ActionChainResult.java | 9 +- 6 files changed, 16 insertions(+), 264 deletions(-) diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java b/core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java index 4f7233046..378b07a06 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java +++ b/core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java @@ -18,263 +18,9 @@ */ package com.opensymphony.xwork2; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.TextParseUtil; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.struts2.StrutsException; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; - /** -* -* -* This result invokes an entire other action, complete with it's own interceptor stack and result. -* -* -* -* This result type takes the following parameters: -* -* -* -* -* -* actionName (default) - the name of the action that will be chained to -* -* namespace - used to determine which namespace the Action is in that we're chaining. If namespace is null, -* this defaults to the current namespace -* -* method - used to specify another method on target action to be invoked. -* If null, this defaults to execute method -* -* skipActions - (optional) the list of comma separated action names for the -* actions that could be chained to -* -* -* -* -* -* Example: -* -* -*-* -* -* -*-* -* -*login -*-* -* -*-* dashboard -* /secure -* -*-* -* -* -* @author Alexandru Popescu -*/ -public class ActionChainResult implements Result { - -private static final Logger LOG = LogManager.getLogger(ActionChainResult.class); - -/** - * The result parameter name to set the name of the action to chain to. - */ -public static final String DEFAULT_PARAM = "actionName"; - -/** - * The action context key to save the chain history. - */ -private static final String CHAIN_HISTORY = "CHAIN_HISTORY"; - -private ActionProxy proxy; -private String actionName; - -private String namespace; - -private String methodName; - -/** - * The list of actions to skip. - */ -private String skipActions; - -private ActionProxyFactory actionProxyFactory; - -public ActionChainResult() { -super(); -} - -public ActionChainResult(String namespace, String actionName, String methodName) { -this.namespace = namespace; -this.actionName = actionName; -this.methodName = methodName; -} - -public ActionChainResult(String namespace, String actionName, String methodName, String skipActions) { -this.namespace = namespace; -this.actionName = actionName; -this.methodName = methodName; -this.skipActions = skipActions; -} - -/** - * @param actionProxyFactory the actionProxyFactory to set - */ -@Inject -public void setActionProxyFactory(ActionProxyFactory actionProxyFactory) { -this.actionProxyFactory = actionProxyFactory; -} - -/** - * Set the action name. - * - * @param actionName The action name. - */ -public void setActionName(String actionName) { -this.actionName = actionName; -} - -/** - * sets the namespace of the Action that we're chaining to. if namespace - * is null, this defaults to the current namespace. - * - * @param namespace the name of the namespace we're chaining to --* -*dashboard.jsp -*
(struts) branch WW-5459-repkg-action-chain-2 created (now 7f04e181e)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5459-repkg-action-chain-2 in repository https://gitbox.apache.org/repos/asf/struts.git at 7f04e181e WW-5459 Deprecate and repackage ActionChainResult This branch includes the following new commits: new 7f04e181e WW-5459 Deprecate and repackage ActionChainResult 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/02: WW-3714 Ensure correct delegation of new Result API
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-3714-overriding-behaviour
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 4281b1be5ce888e5e077c04d345957270462af01
Author: Kusal Kithul-Godage
AuthorDate: Sun Nov 3 11:17:04 2024 +1100
WW-3714 Ensure correct delegation of new Result API
---
.../com/opensymphony/xwork2/DefaultActionInvocation.java | 2 +-
.../java/org/apache/struts2/dispatcher/Dispatcher.java | 2 +-
.../interceptor/TokenSessionStoreInterceptor.java| 16
.../org/apache/struts2/rest/RestActionInvocation.java| 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index db171d191..f04b765ae 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -378,7 +378,7 @@ public class DefaultActionInvocation implements
ActionInvocation {
result = createResult();
if (result != null) {
-result.execute(this);
+result.execute((org.apache.struts2.ActionInvocation) this);
} else if (resultCode != null && !Action.NONE.equals(resultCode)) {
throw new ConfigurationException("No result defined for action " +
getAction().getClass().getName()
+ " and result " + getResultCode(), proxy.getConfig());
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 a1f9094d1..ec5333864 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -734,7 +734,7 @@ public class Dispatcher {
// if the ActionMapping says to go straight to a result, do it!
if (mapping.getResult() != null) {
Result result = mapping.getResult();
-result.execute(proxy.getInvocation());
+result.execute((org.apache.struts2.ActionInvocation)
proxy.getInvocation());
} else {
proxy.execute();
}
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
index 05e491eeb..2657fb7e6 100644
---
a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
+++
b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
@@ -116,15 +116,15 @@ public class TokenSessionStoreInterceptor extends
TokenInterceptor {
* Handles processing of invalid tokens. If a previously stored
invocation is
* available, the method will attempt to return and render its result.
Otherwise
* it will return INVALID_TOKEN_CODE.
- *
+ *
* Note: Because a stored (previously completed) invocation's PageContext
will be closed,
* this method must replace the stored PageContext with the current
invocation's one (or a null).
* See {@link
org.apache.struts2.util.InvocationSessionStore#loadInvocation(String key,
String token)} for details.
- *
+ *
* @param invocation
- *
+ *
* @return
- * @throws Exception
+ * @throws Exception
*/
@Override
protected String handleInvalidToken(ActionInvocation invocation) throws
Exception {
@@ -154,7 +154,7 @@ public class TokenSessionStoreInterceptor extends
TokenInterceptor {
Result result = savedInvocation.getResult();
if ((result != null) &&
(savedInvocation.getProxy().getExecuteResult())) {
-result.execute(savedInvocation);
+result.execute((org.apache.struts2.ActionInvocation)
savedInvocation);
}
// turn off execution of this invocations result
@@ -171,11 +171,11 @@ public class TokenSessionStoreInterceptor extends
TokenInterceptor {
* Handles processing of valid tokens. Stores the current invocation for
* later use by {@see #handleValidToken(ActionInvocation)}.
* See {@link
org.apache.struts2.util.InvocationSessionStore#storeInvocation(String key,
String token, ActionInvocation invocation)} for details.
- *
+ *
* @param invocation
- *
+ *
* @return
- * @throws Exception
+ * @throws Exception
*/
@Override
protected String handleValidToken(ActionInvocation invocation) throws
Exception {
diff --git
a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
index 076f94d87..6399478e0 100644
---
a/plugins/rest/src/main/java/
(struts) 02/02: WW-3714 Ensure correct delegation of new Interceptor API
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-3714-overriding-behaviour
in repository https://gitbox.apache.org/repos/asf/struts.git
commit c47ab9fbd701458cc691b4623da9d5c8e333160c
Author: Kusal Kithul-Godage
AuthorDate: Sun Nov 3 11:20:04 2024 +1100
WW-3714 Ensure correct delegation of new Interceptor API
---
.../main/java/com/opensymphony/xwork2/DefaultActionInvocation.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index f04b765ae..cb2047f06 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -257,7 +257,7 @@ public class DefaultActionInvocation implements
ActionInvocation {
resultCode = executeConditional((ConditionalInterceptor)
interceptor);
} else {
LOG.debug("Executing normal interceptor: {}",
interceptorMapping.getName());
-resultCode = interceptor.intercept(this);
+resultCode =
interceptor.intercept((org.apache.struts2.ActionInvocation) this);
}
} else {
resultCode = invokeActionOnly();
@@ -298,9 +298,9 @@ public class DefaultActionInvocation implements
ActionInvocation {
}
protected String executeConditional(ConditionalInterceptor
conditionalInterceptor) throws Exception {
-if (conditionalInterceptor.shouldIntercept(this)) {
+if
(conditionalInterceptor.shouldIntercept((org.apache.struts2.ActionInvocation)
this)) {
LOG.debug("Executing conditional interceptor: {}",
conditionalInterceptor.getClass().getSimpleName());
-return conditionalInterceptor.intercept(this);
+return
conditionalInterceptor.intercept((org.apache.struts2.ActionInvocation) this);
} else {
LOG.debug("Interceptor: {} is disabled, skipping to next",
conditionalInterceptor.getClass().getSimpleName());
return this.invoke();
(struts) branch WW-3714-overriding-behaviour created (now c47ab9fbd)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-3714-overriding-behaviour in repository https://gitbox.apache.org/repos/asf/struts.git at c47ab9fbd WW-3714 Ensure correct delegation of new Interceptor API This branch includes the following new commits: new 4281b1be5 WW-3714 Ensure correct delegation of new Result API new c47ab9fbd WW-3714 Ensure correct delegation of new Interceptor API The 2 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/02: WW-3714 Ensure correct delegation of new Result API
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-3714-overriding-behaviour
in repository https://gitbox.apache.org/repos/asf/struts.git
commit efa66d5e914f32cd3ee513b726f766ee9a3a37f9
Author: Kusal Kithul-Godage
AuthorDate: Sun Nov 3 11:17:04 2024 +1100
WW-3714 Ensure correct delegation of new Result API
---
.../com/opensymphony/xwork2/DefaultActionInvocation.java | 2 +-
.../java/org/apache/struts2/dispatcher/Dispatcher.java | 2 +-
.../interceptor/TokenSessionStoreInterceptor.java| 16
.../org/apache/struts2/rest/RestActionInvocation.java| 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index db171d191..f04b765ae 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -378,7 +378,7 @@ public class DefaultActionInvocation implements
ActionInvocation {
result = createResult();
if (result != null) {
-result.execute(this);
+result.execute((org.apache.struts2.ActionInvocation) this);
} else if (resultCode != null && !Action.NONE.equals(resultCode)) {
throw new ConfigurationException("No result defined for action " +
getAction().getClass().getName()
+ " and result " + getResultCode(), proxy.getConfig());
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 a1f9094d1..ec5333864 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -734,7 +734,7 @@ public class Dispatcher {
// if the ActionMapping says to go straight to a result, do it!
if (mapping.getResult() != null) {
Result result = mapping.getResult();
-result.execute(proxy.getInvocation());
+result.execute((org.apache.struts2.ActionInvocation)
proxy.getInvocation());
} else {
proxy.execute();
}
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
index 05e491eeb..2657fb7e6 100644
---
a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
+++
b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
@@ -116,15 +116,15 @@ public class TokenSessionStoreInterceptor extends
TokenInterceptor {
* Handles processing of invalid tokens. If a previously stored
invocation is
* available, the method will attempt to return and render its result.
Otherwise
* it will return INVALID_TOKEN_CODE.
- *
+ *
* Note: Because a stored (previously completed) invocation's PageContext
will be closed,
* this method must replace the stored PageContext with the current
invocation's one (or a null).
* See {@link
org.apache.struts2.util.InvocationSessionStore#loadInvocation(String key,
String token)} for details.
- *
+ *
* @param invocation
- *
+ *
* @return
- * @throws Exception
+ * @throws Exception
*/
@Override
protected String handleInvalidToken(ActionInvocation invocation) throws
Exception {
@@ -154,7 +154,7 @@ public class TokenSessionStoreInterceptor extends
TokenInterceptor {
Result result = savedInvocation.getResult();
if ((result != null) &&
(savedInvocation.getProxy().getExecuteResult())) {
-result.execute(savedInvocation);
+result.execute((org.apache.struts2.ActionInvocation)
savedInvocation);
}
// turn off execution of this invocations result
@@ -171,11 +171,11 @@ public class TokenSessionStoreInterceptor extends
TokenInterceptor {
* Handles processing of valid tokens. Stores the current invocation for
* later use by {@see #handleValidToken(ActionInvocation)}.
* See {@link
org.apache.struts2.util.InvocationSessionStore#storeInvocation(String key,
String token, ActionInvocation invocation)} for details.
- *
+ *
* @param invocation
- *
+ *
* @return
- * @throws Exception
+ * @throws Exception
*/
@Override
protected String handleValidToken(ActionInvocation invocation) throws
Exception {
diff --git
a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
index 076f94d87..6399478e0 100644
---
a/plugins/rest/src/main/java/
(struts) 02/02: WW-3714 Ensure correct delegation of new Interceptor API
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-3714-overriding-behaviour
in repository https://gitbox.apache.org/repos/asf/struts.git
commit ed92552e4ebd0e0772a6df6a72cebd0799619d72
Author: Kusal Kithul-Godage
AuthorDate: Sun Nov 3 11:20:04 2024 +1100
WW-3714 Ensure correct delegation of new Interceptor API
---
.../main/java/com/opensymphony/xwork2/DefaultActionInvocation.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index f04b765ae..cb2047f06 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -257,7 +257,7 @@ public class DefaultActionInvocation implements
ActionInvocation {
resultCode = executeConditional((ConditionalInterceptor)
interceptor);
} else {
LOG.debug("Executing normal interceptor: {}",
interceptorMapping.getName());
-resultCode = interceptor.intercept(this);
+resultCode =
interceptor.intercept((org.apache.struts2.ActionInvocation) this);
}
} else {
resultCode = invokeActionOnly();
@@ -298,9 +298,9 @@ public class DefaultActionInvocation implements
ActionInvocation {
}
protected String executeConditional(ConditionalInterceptor
conditionalInterceptor) throws Exception {
-if (conditionalInterceptor.shouldIntercept(this)) {
+if
(conditionalInterceptor.shouldIntercept((org.apache.struts2.ActionInvocation)
this)) {
LOG.debug("Executing conditional interceptor: {}",
conditionalInterceptor.getClass().getSimpleName());
-return conditionalInterceptor.intercept(this);
+return
conditionalInterceptor.intercept((org.apache.struts2.ActionInvocation) this);
} else {
LOG.debug("Interceptor: {} is disabled, skipping to next",
conditionalInterceptor.getClass().getSimpleName());
return this.invoke();
(struts) branch WW-3714-overriding-behaviour updated (c47ab9fbd -> ed92552e4)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-3714-overriding-behaviour in repository https://gitbox.apache.org/repos/asf/struts.git discard c47ab9fbd WW-3714 Ensure correct delegation of new Interceptor API discard 4281b1be5 WW-3714 Ensure correct delegation of new Result API discard 7f04e181e WW-5459 Deprecate and repackage ActionChainResult add 42a683773 WW-5459 Deprecate and repackage ActionChainResult new efa66d5e9 WW-3714 Ensure correct delegation of new Result API new ed92552e4 WW-3714 Ensure correct delegation of new Interceptor API 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 (c47ab9fbd) \ N -- N -- N refs/heads/WW-3714-overriding-behaviour (ed92552e4) 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. The 2 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: .../xwork2/config/providers/ConfigurationProviderOgnlAllowlistTest.java | 2 ++ 1 file changed, 2 insertions(+)
(struts) branch WW-5459-repkg-action-chain-2 updated (7f04e181e -> 42a683773)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5459-repkg-action-chain-2 in repository https://gitbox.apache.org/repos/asf/struts.git omit 7f04e181e WW-5459 Deprecate and repackage ActionChainResult add 42a683773 WW-5459 Deprecate and repackage ActionChainResult 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 (7f04e181e) \ N -- N -- N refs/heads/WW-5459-repkg-action-chain-2 (42a683773) 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: .../xwork2/config/providers/ConfigurationProviderOgnlAllowlistTest.java | 2 ++ 1 file changed, 2 insertions(+)
(struts) branch WW-5459-repkg-action-chain-2 updated (42a683773 -> b0a4c4f41)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5459-repkg-action-chain-2 in repository https://gitbox.apache.org/repos/asf/struts.git omit 42a683773 WW-5459 Deprecate and repackage ActionChainResult add b0a4c4f41 WW-5459 Deprecate and repackage ActionChainResult 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 (42a683773) \ N -- N -- N refs/heads/WW-5459-repkg-action-chain-2 (b0a4c4f41) 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: .../main/java/com/opensymphony/xwork2/ActionChainResult.java | 12 1 file changed, 12 insertions(+)
(struts) branch WW-3714-overriding-behaviour updated (ed92552e4 -> 57e08fb37)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-3714-overriding-behaviour in repository https://gitbox.apache.org/repos/asf/struts.git discard ed92552e4 WW-3714 Ensure correct delegation of new Interceptor API discard efa66d5e9 WW-3714 Ensure correct delegation of new Result API discard 42a683773 WW-5459 Deprecate and repackage ActionChainResult add b0a4c4f41 WW-5459 Deprecate and repackage ActionChainResult new 6fbd9e532 WW-3714 Ensure correct delegation of new Result API new 57e08fb37 WW-3714 Ensure correct delegation of new Interceptor API 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 (ed92552e4) \ N -- N -- N refs/heads/WW-3714-overriding-behaviour (57e08fb37) 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. The 2 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: .../main/java/com/opensymphony/xwork2/ActionChainResult.java | 12 1 file changed, 12 insertions(+)
(struts) 01/02: WW-3714 Ensure correct delegation of new Result API
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-3714-overriding-behaviour
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 6fbd9e53210bd3a18f3c0778f3bed1d3cef3236f
Author: Kusal Kithul-Godage
AuthorDate: Sun Nov 3 11:17:04 2024 +1100
WW-3714 Ensure correct delegation of new Result API
---
.../com/opensymphony/xwork2/DefaultActionInvocation.java | 2 +-
.../java/org/apache/struts2/dispatcher/Dispatcher.java | 2 +-
.../interceptor/TokenSessionStoreInterceptor.java| 16
.../org/apache/struts2/rest/RestActionInvocation.java| 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index db171d191..f04b765ae 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -378,7 +378,7 @@ public class DefaultActionInvocation implements
ActionInvocation {
result = createResult();
if (result != null) {
-result.execute(this);
+result.execute((org.apache.struts2.ActionInvocation) this);
} else if (resultCode != null && !Action.NONE.equals(resultCode)) {
throw new ConfigurationException("No result defined for action " +
getAction().getClass().getName()
+ " and result " + getResultCode(), proxy.getConfig());
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 a1f9094d1..ec5333864 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -734,7 +734,7 @@ public class Dispatcher {
// if the ActionMapping says to go straight to a result, do it!
if (mapping.getResult() != null) {
Result result = mapping.getResult();
-result.execute(proxy.getInvocation());
+result.execute((org.apache.struts2.ActionInvocation)
proxy.getInvocation());
} else {
proxy.execute();
}
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
index 05e491eeb..2657fb7e6 100644
---
a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
+++
b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
@@ -116,15 +116,15 @@ public class TokenSessionStoreInterceptor extends
TokenInterceptor {
* Handles processing of invalid tokens. If a previously stored
invocation is
* available, the method will attempt to return and render its result.
Otherwise
* it will return INVALID_TOKEN_CODE.
- *
+ *
* Note: Because a stored (previously completed) invocation's PageContext
will be closed,
* this method must replace the stored PageContext with the current
invocation's one (or a null).
* See {@link
org.apache.struts2.util.InvocationSessionStore#loadInvocation(String key,
String token)} for details.
- *
+ *
* @param invocation
- *
+ *
* @return
- * @throws Exception
+ * @throws Exception
*/
@Override
protected String handleInvalidToken(ActionInvocation invocation) throws
Exception {
@@ -154,7 +154,7 @@ public class TokenSessionStoreInterceptor extends
TokenInterceptor {
Result result = savedInvocation.getResult();
if ((result != null) &&
(savedInvocation.getProxy().getExecuteResult())) {
-result.execute(savedInvocation);
+result.execute((org.apache.struts2.ActionInvocation)
savedInvocation);
}
// turn off execution of this invocations result
@@ -171,11 +171,11 @@ public class TokenSessionStoreInterceptor extends
TokenInterceptor {
* Handles processing of valid tokens. Stores the current invocation for
* later use by {@see #handleValidToken(ActionInvocation)}.
* See {@link
org.apache.struts2.util.InvocationSessionStore#storeInvocation(String key,
String token, ActionInvocation invocation)} for details.
- *
+ *
* @param invocation
- *
+ *
* @return
- * @throws Exception
+ * @throws Exception
*/
@Override
protected String handleValidToken(ActionInvocation invocation) throws
Exception {
diff --git
a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
index 076f94d87..6399478e0 100644
---
a/plugins/rest/src/main/java/
(struts) 02/02: WW-3714 Ensure correct delegation of new Interceptor API
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-3714-overriding-behaviour
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 57e08fb370e381cec4a134836694f183f7ab2aec
Author: Kusal Kithul-Godage
AuthorDate: Sun Nov 3 11:20:04 2024 +1100
WW-3714 Ensure correct delegation of new Interceptor API
---
.../main/java/com/opensymphony/xwork2/DefaultActionInvocation.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index f04b765ae..cb2047f06 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -257,7 +257,7 @@ public class DefaultActionInvocation implements
ActionInvocation {
resultCode = executeConditional((ConditionalInterceptor)
interceptor);
} else {
LOG.debug("Executing normal interceptor: {}",
interceptorMapping.getName());
-resultCode = interceptor.intercept(this);
+resultCode =
interceptor.intercept((org.apache.struts2.ActionInvocation) this);
}
} else {
resultCode = invokeActionOnly();
@@ -298,9 +298,9 @@ public class DefaultActionInvocation implements
ActionInvocation {
}
protected String executeConditional(ConditionalInterceptor
conditionalInterceptor) throws Exception {
-if (conditionalInterceptor.shouldIntercept(this)) {
+if
(conditionalInterceptor.shouldIntercept((org.apache.struts2.ActionInvocation)
this)) {
LOG.debug("Executing conditional interceptor: {}",
conditionalInterceptor.getClass().getSimpleName());
-return conditionalInterceptor.intercept(this);
+return
conditionalInterceptor.intercept((org.apache.struts2.ActionInvocation) this);
} else {
LOG.debug("Interceptor: {} is disabled, skipping to next",
conditionalInterceptor.getClass().getSimpleName());
return this.invoke();
(struts) branch feature/WW-5459-restructure created (now 5e88a0ac1)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5459-restructure in repository https://gitbox.apache.org/repos/asf/struts.git at 5e88a0ac1 WW-5459 Moves ActionChainResult into org.apache.struts2.result package This branch includes the following new commits: new 2aeaf51d9 WW-5459 Moves Action interface into org.apache.struts2.action package new 5e88a0ac1 WW-5459 Moves ActionChainResult into org.apache.struts2.result package The 2 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 release/struts-7-0-x updated (46251a11f -> 3931968b1)
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
from 46251a11f Merge pull request #1107 from
apache/7.0.x/WW-5478-delete-result
add 87df4a229 WW-3714 Move new Result class into result package
add 3931968b1 Merge pull request # from
apache/7.0.x/WW-3714-result-repkg
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/struts2/ActionChainResult.java | 5 +-
.../java/org/apache/struts2/ActionInvocation.java | 1 +
.../apache/struts2/DefaultActionInvocation.java| 1 +
.../struts2/DefaultUnknownHandlerManager.java | 1 +
.../java/org/apache/struts2/ObjectFactory.java | 15 +++---
.../java/org/apache/struts2/UnknownHandler.java| 1 +
.../org/apache/struts2/UnknownHandlerManager.java | 1 +
.../java/org/apache/struts2/config/NullResult.java | 2 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 56 +++---
.../struts2/dispatcher/mapper/ActionMapping.java | 2 +-
.../org/apache/struts2/factory/ResultFactory.java | 4 +-
.../struts2/factory/StrutsResultFactory.java | 2 +-
.../struts2/interceptor/ChainingInterceptor.java | 2 +-
.../interceptor/MessageStoreInterceptor.java | 7 ++-
.../struts2/interceptor/PreResultListener.java | 5 +-
.../interceptor/TokenSessionStoreInterceptor.java | 8 ++--
.../apache/struts2/mock/MockActionInvocation.java | 2 +-
.../java/org/apache/struts2/mock/MockResult.java | 2 +-
.../apache/struts2/result/HttpHeaderResult.java| 7 ++-
.../struts2/result/ParamNameAwareResult.java | 2 +-
.../org/apache/struts2/result/PlainResult.java | 8 ++--
.../org/apache/struts2/{ => result}/Result.java| 5 +-
.../result/ServletActionRedirectResult.java| 4 +-
.../apache/struts2/result/StrutsResultSupport.java | 5 +-
.../org/apache/struts2/ActionChainResultTest.java | 3 +-
.../org/apache/struts2/ActionInvocationTest.java | 6 +--
.../struts2/DefaultActionInvocationTest.java | 5 +-
.../test/java/org/apache/struts2/SimpleAction.java | 1 +
.../org/apache/struts2/TestActionTagResult.java| 3 +-
.../test/java/org/apache/struts2/TestResult.java | 8 ++--
.../test/java/org/apache/struts2/VoidResult.java | 2 +
.../ConfigurationProviderOgnlAllowlistTest.java| 6 +--
.../config/providers/SomeUnknownHandler.java | 4 +-
.../struts2/factory/StrutsResultFactoryTest.java | 4 +-
.../org/apache/struts2/result/PlainResultTest.java | 3 +-
.../apache/struts2/result/PostbackResultTest.java | 3 +-
.../struts2/result/ServletRedirectResultTest.java | 13 +++--
.../apache/struts/beanvalidation/VoidResult.java | 2 +-
.../convention/ConventionUnknownHandler.java | 25 ++
.../PackageBasedActionConfigBuilderTest.java | 24 +-
.../java/org/apache/struts2/json/JSONResult.java | 18 +++
.../org/apache/struts2/json/JSONResultTest.java| 8 ++--
.../apache/struts2/rest/RestActionInvocation.java | 20
.../test/java/org/apache/struts2/SimpleAction.java | 10 +++-
.../struts2/spring/SpringObjectFactoryTest.java| 4 +-
.../org/apache/struts2/spring/SpringResult.java| 2 +-
.../spring/interceptor/TestActionInvocation.java | 6 ++-
.../org/apache/struts2/result/xslt/XSLTResult.java | 12 ++---
.../apache/struts2/result/xslt/XSLTResultTest.java | 8 ++--
49 files changed, 188 insertions(+), 160 deletions(-)
rename core/src/main/java/org/apache/struts2/{ => result}/Result.java (93%)
(struts) branch 7.0.x/WW-3714-result-repkg deleted (was 87df4a229)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-3714-result-repkg in repository https://gitbox.apache.org/repos/asf/struts.git was 87df4a229 WW-3714 Move new Result class into result package 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 feature/WW-5459-restructure updated (5e88a0ac1 -> 1d10679be)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch feature/WW-5459-restructure
in repository https://gitbox.apache.org/repos/asf/struts.git
discard 5e88a0ac1 WW-5459 Moves ActionChainResult into
org.apache.struts2.result package
discard 2aeaf51d9 WW-5459 Moves Action interface into
org.apache.struts2.action package
add 87df4a229 WW-3714 Move new Result class into result package
add 3931968b1 Merge pull request # from
apache/7.0.x/WW-3714-result-repkg
add dd6bb139f WW-5459 Moves Action interface into
org.apache.struts2.action package
add 1d10679be WW-5459 Moves ActionChainResult into
org.apache.struts2.result package
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 (5e88a0ac1)
\
N -- N -- N refs/heads/feature/WW-5459-restructure (1d10679be)
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:
.../java/org/apache/struts2/ActionInvocation.java | 1 +
.../apache/struts2/DefaultActionInvocation.java| 1 +
.../struts2/DefaultUnknownHandlerManager.java | 1 +
.../java/org/apache/struts2/ObjectFactory.java | 15 +++---
.../java/org/apache/struts2/UnknownHandler.java| 1 +
.../org/apache/struts2/UnknownHandlerManager.java | 1 +
.../java/org/apache/struts2/config/NullResult.java | 2 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 56 +++---
.../struts2/dispatcher/mapper/ActionMapping.java | 2 +-
.../org/apache/struts2/factory/ResultFactory.java | 4 +-
.../struts2/factory/StrutsResultFactory.java | 2 +-
.../struts2/interceptor/ChainingInterceptor.java | 2 +-
.../interceptor/MessageStoreInterceptor.java | 7 ++-
.../struts2/interceptor/PreResultListener.java | 8 ++--
.../interceptor/TokenSessionStoreInterceptor.java | 8 ++--
.../apache/struts2/mock/MockActionInvocation.java | 2 +-
.../java/org/apache/struts2/mock/MockResult.java | 2 +-
.../apache/struts2/result/ActionChainResult.java | 1 -
.../apache/struts2/result/HttpHeaderResult.java| 7 ++-
.../struts2/result/ParamNameAwareResult.java | 2 +-
.../org/apache/struts2/result/PlainResult.java | 8 ++--
.../org/apache/struts2/{ => result}/Result.java| 5 +-
.../result/ServletActionRedirectResult.java| 4 +-
.../apache/struts2/result/StrutsResultSupport.java | 5 +-
.../org/apache/struts2/ActionChainResultTest.java | 3 +-
.../org/apache/struts2/ActionInvocationTest.java | 6 +--
.../struts2/DefaultActionInvocationTest.java | 4 +-
.../test/java/org/apache/struts2/SimpleAction.java | 1 +
.../org/apache/struts2/TestActionTagResult.java| 3 +-
.../test/java/org/apache/struts2/TestResult.java | 8 ++--
.../test/java/org/apache/struts2/VoidResult.java | 2 +
.../ConfigurationProviderOgnlAllowlistTest.java| 6 +--
.../config/providers/SomeUnknownHandler.java | 4 +-
.../struts2/factory/StrutsResultFactoryTest.java | 4 +-
.../org/apache/struts2/result/PlainResultTest.java | 3 +-
.../apache/struts2/result/PostbackResultTest.java | 3 +-
.../struts2/result/ServletRedirectResultTest.java | 13 +++--
.../apache/struts/beanvalidation/VoidResult.java | 2 +-
.../convention/ConventionUnknownHandler.java | 24 ++
.../PackageBasedActionConfigBuilderTest.java | 24 +-
.../java/org/apache/struts2/json/JSONResult.java | 18 +++
.../org/apache/struts2/json/JSONResultTest.java| 8 ++--
.../apache/struts2/rest/RestActionInvocation.java | 19
.../test/java/org/apache/struts2/SimpleAction.java | 10 +++-
.../struts2/spring/SpringObjectFactoryTest.java| 4 +-
.../org/apache/struts2/spring/SpringResult.java| 2 +-
.../spring/interceptor/TestActionInvocation.java | 6 ++-
.../org/apache/struts2/result/xslt/XSLTResult.java | 12 ++---
.../apache/struts2/result/xslt/XSLTResultTest.java | 8 ++--
49 files changed, 183 insertions(+), 161 deletions(-)
rename core/src/main/java/org/apache/struts2/{ => result}/Result.java (93%)
(struts) branch feature/WW-5459-restructure updated (1d10679be -> 5311596ba)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5459-restructure in repository https://gitbox.apache.org/repos/asf/struts.git omit 1d10679be WW-5459 Moves ActionChainResult into org.apache.struts2.result package add 5311596ba WW-5459 Moves ActionChainResult into org.apache.struts2.result package 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 (1d10679be) \ N -- N -- N refs/heads/feature/WW-5459-restructure (5311596ba) 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: core/src/main/java/org/apache/struts2/result/Result.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
(struts) 01/02: WW-5459 Moves Action interface into org.apache.struts2.action package
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5459-restructure
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 2aeaf51d9c5b73921ac4c195cbca654e37748bc7
Author: Lukasz Lenart
AuthorDate: Sat Nov 2 14:19:54 2024 +0100
WW-5459 Moves Action interface into org.apache.struts2.action package
---
.../main/java/org/apache/struts2/showcase/action/JSPEvalAction.java | 2 +-
.../main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java | 2 +-
.../apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java | 2 +-
.../main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java | 2 +-
.../apache/struts2/showcase/filedownload/FileDownloadAction.java| 2 +-
core/src/main/java/org/apache/struts2/ActionContext.java| 1 +
core/src/main/java/org/apache/struts2/ActionInvocation.java | 1 +
core/src/main/java/org/apache/struts2/ActionSupport.java| 1 +
core/src/main/java/org/apache/struts2/DefaultActionInvocation.java | 1 +
core/src/main/java/org/apache/struts2/Result.java | 2 ++
core/src/main/java/org/apache/struts2/{ => action}/Action.java | 2 +-
.../struts2/config/providers/XmlDocConfigurationProvider.java | 2 +-
.../org/apache/struts2/interceptor/DefaultWorkflowInterceptor.java | 2 +-
.../org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java | 3 +--
core/src/main/java/org/apache/struts2/interceptor/Interceptor.java | 5 +++--
.../main/java/org/apache/struts2/interceptor/PreResultListener.java | 5 +++--
.../org/apache/struts2/interceptor/annotations/InputConfig.java | 2 +-
.../org/apache/struts2/interceptor/parameter/StrutsParameter.java | 4 +++-
.../src/main/java/org/apache/struts2/util/AppendIteratorFilter.java | 2 +-
core/src/main/java/org/apache/struts2/util/IteratorGenerator.java | 2 +-
core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java | 2 +-
core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java | 2 +-
.../src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java | 2 +-
core/src/test/java/org/apache/struts2/ActionNestingTest.java| 1 +
core/src/test/java/org/apache/struts2/ActionSupportTest.java| 1 +
core/src/test/java/org/apache/struts2/ExternalReferenceAction.java | 2 ++
core/src/test/java/org/apache/struts2/NestedAction.java | 1 +
core/src/test/java/org/apache/struts2/SimpleFooAction.java | 2 ++
core/src/test/java/org/apache/struts2/TestAction.java | 3 +--
.../src/test/java/org/apache/struts2/TestConfigurationProvider.java | 5 +
core/src/test/java/org/apache/struts2/components/FormTest.java | 2 +-
.../config/providers/ConfigurationProviderOgnlAllowlistTest.java| 6 +++---
.../apache/struts2/config/providers/MockConfigurationProvider.java | 2 +-
.../apache/struts2/config/providers/NoNoArgsConstructorAction.java | 2 +-
.../apache/struts2/config/providers/PrivateConstructorAction.java | 2 +-
.../config/providers/XmlConfigurationProviderResultsTest.java | 2 +-
.../java/org/apache/struts2/conversion/ConversionTestAction.java| 2 +-
.../java/org/apache/struts2/interceptor/AliasInterceptorTest.java | 2 +-
.../org/apache/struts2/interceptor/ChainingInterceptorTest.java | 2 +-
.../struts2/interceptor/ChainingInterceptorWithConfigTest.java | 2 +-
.../apache/struts2/interceptor/ConversionErrorInterceptorTest.java | 2 +-
.../java/org/apache/struts2/interceptor/CookieInterceptorTest.java | 2 +-
.../apache/struts2/interceptor/DefaultWorkflowInterceptorTest.java | 2 +-
.../apache/struts2/interceptor/ExceptionMappingInterceptorTest.java | 2 +-
.../org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java | 2 +-
.../apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java | 2 +-
.../java/org/apache/struts2/interceptor/I18nInterceptorTest.java| 2 +-
.../org/apache/struts2/interceptor/MessageStoreInterceptorTest.java | 3 +--
.../struts2/interceptor/MessageStorePreResultListenerTest.java | 2 +-
.../org/apache/struts2/interceptor/ModelDrivenInterceptorTest.java | 2 +-
.../java/org/apache/struts2/interceptor/PreResultListenerTest.java | 2 +-
.../java/org/apache/struts2/interceptor/PrepareInterceptorTest.java | 2 +-
.../struts2/interceptor/ScopedModelDrivenInterceptorTest.java | 2 +-
.../apache/struts2/interceptor/ServletConfigInterceptorTest.java| 2 +-
.../struts2/interceptor/StrutsConversionErrorInterceptorTest.java | 2 +-
.../java/org/apache/struts2/interceptor/TokenInterceptorTest.java | 2 +-
.../struts2/interceptor/TokenSessionStoreInterceptorTest.java | 2 +-
.../org/apache/struts2/interceptor/ValidationErrorAwareTest.java| 2 +-
.../ValidationInterceptorPrefixMethodInvocationTest.java| 2 +-
.../org/apache/struts2/interceptor/annotations/AnnotatedAction.java | 2 +-
.../interceptor/annotations/Annotatio
(struts) 02/02: WW-5459 Moves ActionChainResult into org.apache.struts2.result package
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5459-restructure
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 5e88a0ac15049f67046da00b300a3fc7c77bb3d7
Author: Lukasz Lenart
AuthorDate: Sat Nov 2 15:06:29 2024 +0100
WW-5459 Moves ActionChainResult into org.apache.struts2.result package
---
core/pom.xml | 8
.../java/org/apache/struts2/ActionInvocation.java | 1 +
.../org/apache/struts2/DefaultActionInvocation.java | 1 +
.../struts2/interceptor/ChainingInterceptor.java | 2 +-
.../struts2/{ => result}/ActionChainResult.java | 10 --
core/src/main/resources/struts-default.xml| 2 +-
core/src/main/resources/xwork-default.xml | 2 +-
.../org/apache/struts2/ActionChainResultTest.java | 1 +
.../test/java/org/apache/struts2/ChainResultTest.java | 2 +-
.../apache/struts2/DefaultActionInvocationTest.java | 1 +
.../ConfigurationProviderOgnlAllowlistTest.java | 4 ++--
.../config/providers/MockConfigurationProvider.java | 2 +-
...XmlConfigurationProviderExceptionMappingsTest.java | 2 +-
.../XmlConfigurationProviderMultilevelTest.java | 2 +-
.../XmlConfigurationProviderResultsTest.java | 2 +-
.../struts2/interceptor/ChainingInterceptorTest.java | 2 +-
.../ChainingInterceptorWithConfigTest.java| 2 +-
.../apache/struts2/config/providers/xwork- test.xml | 2 +-
.../struts2/config/providers/xwork-include-parent.xml | 2 +-
.../xwork-test-actions-packagedefaultclassref.xml | 2 +-
.../struts2/config/providers/xwork-test-actions.xml | 2 +-
.../config/providers/xwork-test-allowlist-2.xml | 2 +-
.../providers/xwork-test-exception-mappings.xml | 2 +-
.../config/providers/xwork-test-multilevel.xml| 2 +-
.../providers/xwork-test-result-inheritance.xml | 2 +-
.../config/providers/xwork-test-result-names.xml | 2 +-
.../struts2/config/providers/xwork-test-results.xml | 2 +-
core/src/test/resources/xwork - jar.jar | Bin 2042 -> 902 bytes
core/src/test/resources/xwork - zip.zip | Bin 2653 -> 3117 bytes
core/src/test/resources/xwork-jar.jar | Bin 2026 -> 898 bytes
core/src/test/resources/xwork-proxyinvoke.xml | 2 +-
core/src/test/resources/xwork-test-default.xml| 2 +-
core/src/test/resources/xwork-test-validation.xml | 2 +-
core/src/test/resources/xwork-zip.zip | Bin 2645 -> 3084 bytes
.../PackageBasedActionConfigBuilderTest.java | 2 +-
.../struts2/spring/SpringObjectFactoryTest.java | 2 +-
.../org/apache/struts2/spring/actionContext-xwork.xml | 2 +-
37 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 965351898..1125671bb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -50,10 +50,10 @@
false
-
${project.build.testOutputDirectory}/xwork-jar.jar
-
${project.build.testOutputDirectory}/xwork-zip.zip
-${project.build.testOutputDirectory}/xwork -
jar.jar
-${project.build.testOutputDirectory}/xwork -
zip.zip
+
${project.build.testSourceDirectory}/xwork-jar.jar
+
${project.build.testSourceDirectory}/xwork-zip.zip
+${project.build.testSourceDirectory}/xwork -
jar.jar
+${project.build.testSourceDirectory}/xwork -
zip.zip
**/XWorkTestCase.java
diff --git a/core/src/main/java/org/apache/struts2/ActionInvocation.java
b/core/src/main/java/org/apache/struts2/ActionInvocation.java
index 16ad109e6..95aebf0e5 100644
--- a/core/src/main/java/org/apache/struts2/ActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java
@@ -20,6 +20,7 @@ package org.apache.struts2;
import org.apache.struts2.action.Action;
import org.apache.struts2.interceptor.PreResultListener;
+import org.apache.struts2.result.ActionChainResult;
import org.apache.struts2.util.ValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
index 3770f47bb..3ab1dd30f 100644
--- a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
@@ -34,6 +34,7 @@ import org.apache.struts2.interceptor.Interceptor;
import org.apache.struts2.interceptor.PreResultListener;
import org.apache.struts2.interceptor.WithLazyParams;
import org.apache.struts2.ognl.OgnlUtil;
+import org.apache.struts2.result.ActionChainResult;
import org.apache.struts2.util.
(struts) branch feature/WW-5459-restructure updated (5311596ba -> 1b86eb234)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5459-restructure in repository https://gitbox.apache.org/repos/asf/struts.git omit 5311596ba WW-5459 Moves ActionChainResult into org.apache.struts2.result package add 1b86eb234 WW-5459 Moves ActionChainResult into org.apache.struts2.result package 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 (5311596ba) \ N -- N -- N refs/heads/feature/WW-5459-restructure (1b86eb234) 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: core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java | 1 + 1 file changed, 1 insertion(+)
(struts) branch feature/WW-5459-restructure updated (1b86eb234 -> 83cb936c3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5459-restructure in repository https://gitbox.apache.org/repos/asf/struts.git discard 1b86eb234 WW-5459 Moves ActionChainResult into org.apache.struts2.result package add 83cb936c3 WW-5459 Moves ActionChainResult into org.apache.struts2.result package 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 (1b86eb234) \ N -- N -- N refs/heads/feature/WW-5459-restructure (83cb936c3) 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: core/pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-)
(struts) branch feature/WW-5459-restructure updated (83cb936c3 -> b835e8978)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5459-restructure in repository https://gitbox.apache.org/repos/asf/struts.git from 83cb936c3 WW-5459 Moves ActionChainResult into org.apache.struts2.result package add 7e3b3e58c Uses proper default package name add f4f828814 WW-5459 Updates content of zipped XMLs add b835e8978 Creates temp folder in target folder No new revisions were added by this update. Summary of changes: .../java/org/apache/struts2/config/SettingsTest.java | 2 +- .../XmlConfigurationProviderWildCardIncludeTest.java | 4 ++-- core/src/test/resources/struts.properties | 2 +- core/src/test/resources/xwork - zip.zip| Bin 3117 -> 664 bytes core/src/test/resources/xwork-zip.zip | Bin 3084 -> 660 bytes 5 files changed, 4 insertions(+), 4 deletions(-)
