WW-5459 Moves ActionChainResult into org.apache.struts2.result package

apache · Nov 2, 2024 · 1b86eb2 · 1b86eb2
1 parent dd6bb13
commit 1b86eb2
Show file tree

Hide file tree

Showing 38 changed files with 45 additions and 39 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -50,10 +50,10 @@
                     </properties>
                     <useSystemClassLoader>false</useSystemClassLoader>
                     <additionalClasspathElements>
-                        <element>${project.build.testOutputDirectory}/xwork-jar.jar</element>
-                        <element>${project.build.testOutputDirectory}/xwork-zip.zip</element>
-                        <element>${project.build.testOutputDirectory}/xwork - jar.jar</element>
-                        <element>${project.build.testOutputDirectory}/xwork - zip.zip</element>
+                        <element>${project.build.testSourceDirectory}/xwork-jar.jar</element>
+                        <element>${project.build.testSourceDirectory}/xwork-zip.zip</element>
+                        <element>${project.build.testSourceDirectory}/xwork - jar.jar</element>
+                        <element>${project.build.testSourceDirectory}/xwork - zip.zip</element>
                     </additionalClasspathElements>
                     <excludes>
                         <exclude>**/XWorkTestCase.java</exclude>

diff --git a/core/src/main/java/org/apache/struts2/ActionInvocation.java b/core/src/main/java/org/apache/struts2/ActionInvocation.java
@@ -20,6 +20,7 @@
 
 import org.apache.struts2.action.Action;
 import org.apache.struts2.interceptor.PreResultListener;
+import org.apache.struts2.result.ActionChainResult;
 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
@@ -34,6 +34,7 @@
 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.result.Result;
 import org.apache.struts2.util.ValueStack;
 import org.apache.struts2.util.ValueStackFactory;

diff --git a/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java
@@ -20,7 +20,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.ActionInvocation;
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.Unchainable;

diff --git a/...org/apache/struts2/ActionChainResult.java → ...che/struts2/result/ActionChainResult.java b/...org/apache/struts2/ActionChainResult.java → ...che/struts2/result/ActionChainResult.java
@@ -16,13 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2;
+package org.apache.struts2.result;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ActionContext;
+import org.apache.struts2.ActionInvocation;
+import org.apache.struts2.ActionProxy;
+import org.apache.struts2.ActionProxyFactory;
+import org.apache.struts2.StrutsException;
 import org.apache.struts2.inject.Inject;
-import org.apache.struts2.result.Result;
 import org.apache.struts2.util.TextParseUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.HashSet;
 import java.util.LinkedList;

diff --git a/core/src/main/java/org/apache/struts2/result/Result.java b/core/src/main/java/org/apache/struts2/result/Result.java
@@ -18,10 +18,8 @@
  */
 package org.apache.struts2.result;
 
-import org.apache.struts2.Action;
-import org.apache.struts2.ActionInvocation;
-
 import org.apache.struts2.action.Action;
+import org.apache.struts2.ActionInvocation;
 
 import java.io.Serializable;
 

diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
@@ -31,7 +31,7 @@
 
     <package name="struts-default" abstract="true">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult"/>
             <result-type name="dispatcher" class="org.apache.struts2.result.ServletDispatcherResult" default="true"/>
             <result-type name="freemarker" class="org.apache.struts2.views.freemarker.FreemarkerResult"/>
             <result-type name="httpheader" class="org.apache.struts2.result.HttpHeaderResult"/>

diff --git a/core/src/main/resources/xwork-default.xml b/core/src/main/resources/xwork-default.xml
@@ -26,7 +26,7 @@
     <package name="xwork-default" abstract="true">
 
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult"/>
         </result-types>
         <interceptors>
             <interceptor name="logger" class="org.apache.struts2.interceptor.LoggingInterceptor"/>

diff --git a/core/src/test/java/org/apache/struts2/ActionChainResultTest.java b/core/src/test/java/org/apache/struts2/ActionChainResultTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.struts2;
 
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.result.Result;
 import org.junit.Test;
 

diff --git a/core/src/test/java/org/apache/struts2/ChainResultTest.java b/core/src/test/java/org/apache/struts2/ChainResultTest.java
@@ -21,9 +21,9 @@
 import com.mockobjects.dynamic.Mock;
 import org.apache.struts2.config.providers.XmlConfigurationProvider;
 import org.apache.struts2.mock.MockResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.util.ValueStack;
 import junit.framework.TestCase;
-import org.apache.struts2.StrutsException;
 import org.apache.struts2.config.StrutsXmlConfigurationProvider;
 
 import java.util.HashMap;

diff --git a/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java b/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java
@@ -28,6 +28,7 @@
 import org.apache.struts2.mock.MockActionProxy;
 import org.apache.struts2.mock.MockInterceptor;
 import org.apache.struts2.mock.MockResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.result.Result;
 import org.apache.struts2.util.ValueStack;
 import org.apache.struts2.util.ValueStackFactory;

diff --git a/...test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java b/...test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
@@ -51,7 +51,7 @@ public void allowList() throws Exception {
                 Class.forName("org.apache.struts2.mock.MockResult"),
                 Class.forName("org.apache.struts2.interceptor.ConditionalInterceptor"),
                 Class.forName("org.apache.struts2.ActionSupport"),
-                Class.forName("org.apache.struts2.ActionChainResult"),
+                Class.forName("org.apache.struts2.result.ActionChainResult"),
                 Class.forName("org.apache.struts2.TextProvider"),
                 Class.forName("org.apache.struts2.interceptor.NoOpInterceptor"),
                 Class.forName("org.apache.struts2.interceptor.Interceptor"),
@@ -100,7 +100,7 @@ public void allowlist_2only() throws Exception {
                 Class.forName("java.io.Serializable"),
                 Class.forName("org.apache.struts2.interceptor.ConditionalInterceptor"),
                 Class.forName("org.apache.struts2.ActionSupport"),
-                Class.forName("org.apache.struts2.ActionChainResult"),
+                Class.forName("org.apache.struts2.result.ActionChainResult"),
                 Class.forName("org.apache.struts2.TextProvider"),
                 Class.forName("org.apache.struts2.interceptor.NoOpInterceptor"),
                 Class.forName("org.apache.struts2.interceptor.Interceptor"),

diff --git a/core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java b/core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java
@@ -19,7 +19,7 @@
 package org.apache.struts2.config.providers;
 
 import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.ModelDrivenAction;
 import org.apache.struts2.ObjectFactory;
 import org.apache.struts2.SimpleAction;

diff --git a/...va/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java b/...va/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.config.providers;
 
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.SimpleAction;
 import org.apache.struts2.config.ConfigurationException;
 import org.apache.struts2.config.ConfigurationProvider;

diff --git a/...test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java b/...test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.config.providers;
 
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.config.ConfigurationProvider;
 import org.apache.struts2.config.entities.ActionConfig;
 import org.apache.struts2.config.entities.InterceptorMapping;

diff --git a/...rc/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java b/...rc/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java
@@ -19,7 +19,7 @@
 package org.apache.struts2.config.providers;
 
 import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.SimpleAction;
 import org.apache.struts2.config.ConfigurationException;
 import org.apache.struts2.config.ConfigurationProvider;

diff --git a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java
@@ -20,7 +20,7 @@
 
 import com.mockobjects.dynamic.Mock;
 import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.ActionContext;
 import org.apache.struts2.ActionInvocation;
 import org.apache.struts2.SimpleAction;

diff --git a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java
@@ -19,7 +19,7 @@
 package org.apache.struts2.interceptor;
 
 import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.ActionProxy;
 import org.apache.struts2.ActionProxyFactory;
 import org.apache.struts2.DefaultActionProxyFactory;

diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork- test.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork- test.xml
@@ -26,7 +26,7 @@
     <include file="xwork-test-beans.xml"/>
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
 

diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-include-parent.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-include-parent.xml
@@ -27,7 +27,7 @@
 
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
         </result-types>
         <interceptors>
             <interceptor name="params" class="org.apache.struts2.interceptor.parameter.ParametersInterceptor"/>

diff --git a/...sources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml b/...sources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml
@@ -26,7 +26,7 @@
     <package name="default">
 
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
 

diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions.xml
@@ -26,7 +26,7 @@
     <include file="xwork-test-beans.xml"/>
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
 

diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-allowlist-2.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-allowlist-2.xml
@@ -25,7 +25,7 @@
 <struts>
     <package name="allow2">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
         </result-types>
 
         <interceptors>

diff --git a/.../src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml b/.../src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml
@@ -26,7 +26,7 @@
 	<include file="xwork-test-beans.xml" />
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
 

diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-multilevel.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-multilevel.xml
@@ -26,7 +26,7 @@
 	<include file="xwork-test-beans.xml" />
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
         </result-types>
         <interceptors>
             <interceptor name="params" class="org.apache.struts2.interceptor.parameter.ParametersInterceptor"/>

diff --git a/.../src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml b/.../src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml
@@ -26,7 +26,7 @@
 	<include file="xwork-test-beans.xml" />
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true" />
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true" />
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
     </package>

diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-names.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-names.xml
@@ -26,7 +26,7 @@
     <include file="xwork-test-beans.xml" />
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
         </result-types>
 
         <action name="noname">

diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-results.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-results.xml
@@ -26,7 +26,7 @@
 	<include file="xwork-test-beans.xml" />
     <package name="default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>
 

diff --git a/core/src/test/resources/xwork - jar.jar b/core/src/test/resources/xwork - jar.jar
diff --git a/core/src/test/resources/xwork - zip.zip b/core/src/test/resources/xwork - zip.zip
diff --git a/core/src/test/resources/xwork-jar.jar b/core/src/test/resources/xwork-jar.jar
diff --git a/core/src/test/resources/xwork-proxyinvoke.xml b/core/src/test/resources/xwork-proxyinvoke.xml
@@ -30,7 +30,7 @@
 
     <package name="xwork-test-default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="void" class="org.apache.struts2.VoidResult"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>

diff --git a/core/src/test/resources/xwork-test-default.xml b/core/src/test/resources/xwork-test-default.xml
@@ -25,7 +25,7 @@
 <struts>
     <package name="xwork-test-default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="void" class="org.apache.struts2.VoidResult"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>

diff --git a/core/src/test/resources/xwork-test-validation.xml b/core/src/test/resources/xwork-test-validation.xml
@@ -26,7 +26,7 @@
 	<include file="xwork-test-beans.xml" />
     <package name="xwork-test-default">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult" default="true"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult" default="true"/>
             <result-type name="void" class="org.apache.struts2.VoidResult"/>
             <result-type name="mock" class="org.apache.struts2.mock.MockResult"/>
         </result-types>

diff --git a/core/src/test/resources/xwork-zip.zip b/core/src/test/resources/xwork-zip.zip
diff --git a/...tion/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java b/...tion/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
@@ -18,10 +18,10 @@
  */
 package org.apache.struts2.convention;
 
+import org.apache.struts2.result.ActionChainResult;
 import jakarta.servlet.ServletContext;
 import junit.framework.TestCase;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.struts2.ActionChainResult;
 import org.apache.struts2.ActionContext;
 import org.apache.struts2.FileManager;
 import org.apache.struts2.FileManagerFactory;

diff --git a/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java b/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java
@@ -19,7 +19,7 @@
 package org.apache.struts2.spring;
 
 import org.apache.struts2.action.Action;
-import org.apache.struts2.ActionChainResult;
+import org.apache.struts2.result.ActionChainResult;
 import org.apache.struts2.ActionContext;
 import org.apache.struts2.ModelDrivenAction;
 import org.apache.struts2.ObjectFactory;

diff --git a/plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-xwork.xml b/plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-xwork.xml
@@ -31,7 +31,7 @@
             <result-type name="null" class="org.apache.struts2.mock.MockResult" default="true"/>
             <result-type name="springResult" class="springResult"/>
             <result-type name="chain"
-                         class="org.apache.struts2.ActionChainResult"/>
+                         class="org.apache.struts2.result.ActionChainResult"/>
         </result-types>
 
         <interceptors>