Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 07:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lukasz Lenart
2024-11-02 15:06:29 +01:00
parent dd6bb139f7
commit 83cb936c3a
37 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/ActionInvocation.java
+1
View File
@@ -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.result.Result;
import org.apache.struts2.util.ValueStack;
core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
+1
View File
@@ -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.result.Result;
import org.apache.struts2.util.ValueStack;
import org.apache.struts2.util.ValueStackFactory;
core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java
+1 -1
View File
@@ -20,7 +20,7 @@ package org.apache.struts2.interceptor;
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;
core/src/main/java/org/apache/struts2/ActionChainResult.java → core/src/main/java/org/apache/struts2/result/ActionChainResult.java
+8 -4
View File
@@ -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.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.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;
core/src/main/java/org/apache/struts2/result/Result.java
+1 -3
View File
@@ -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;
core/src/main/resources/struts-default.xml
+1 -1
View File
@@ -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"/>
core/src/main/resources/xwork-default.xml
+1 -1
View File
@@ -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"/>
core/src/test/java/org/apache/struts2/ActionChainResultTest.java
+1
View File
@@ -18,6 +18,7 @@
*/
package org.apache.struts2;
import org.apache.struts2.result.ActionChainResult;
import org.apache.struts2.result.Result;
import org.junit.Test;
core/src/test/java/org/apache/struts2/ChainResultTest.java
+1 -1
View File
@@ -21,9 +21,9 @@ package org.apache.struts2;
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;
core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java
+1
View File
@@ -28,6 +28,7 @@ import org.apache.struts2.interceptor.Interceptor;
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;
core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
+2 -2
View File
@@ -51,7 +51,7 @@ public class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase
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 class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase
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"),
core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java
+1 -1
View File
@@ -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;
core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java
+1 -1
View File
@@ -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;
core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java
+1 -1
View File
@@ -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;
core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java
+1 -1
View File
@@ -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;
core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java
+1 -1
View File
@@ -20,7 +20,7 @@ package org.apache.struts2.interceptor;
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;
core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java
+1 -1
View File
@@ -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;
core/src/test/resources/org/apache/struts2/config/providers/xwork- test.xml
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/config/providers/xwork-include-parent.xml
+1 -1
View File
@@ -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"/>
core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions.xml
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/config/providers/xwork-test-allowlist-2.xml
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/config/providers/xwork-test-multilevel.xml
+1 -1
View File
@@ -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"/>
core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml
+1 -1
View File
@@ -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>
core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-names.xml
+1 -1
View File
@@ -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">
core/src/test/resources/org/apache/struts2/config/providers/xwork-test-results.xml
+1 -1
View File
@@ -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>
core/src/test/resources/xwork - jar.jar
BIN
View File
Binary file not shown.
core/src/test/resources/xwork - zip.zip
BIN
View File
Binary file not shown.
core/src/test/resources/xwork-jar.jar
BIN
View File
Binary file not shown.
core/src/test/resources/xwork-proxyinvoke.xml
+1 -1
View File
@@ -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>
core/src/test/resources/xwork-test-default.xml
+1 -1
View File
@@ -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>
core/src/test/resources/xwork-test-validation.xml
+1 -1
View File
@@ -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>
core/src/test/resources/xwork-zip.zip
BIN
View File
Binary file not shown.
plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
+1 -1
View File
@@ -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;
plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java
+1 -1
View File
@@ -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;
plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-xwork.xml
+1 -1
View File
@@ -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>