diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java index 8e0e71a9ae..43e15e0134 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.showcase.action; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.interceptor.annotations.After; import org.apache.struts2.ServletActionContext; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java index 02cd9f1f82..ecbf9c0db6 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.ajax; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.io.Serializable; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java index ad352ff522..fb775075b7 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java @@ -21,7 +21,7 @@ package org.apache.struts2.showcase.chat; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.interceptor.AbstractInterceptor; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java index 52678d2889..e5b136f34e 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.chat; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.interceptor.AbstractInterceptor; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java index da35e7bb82..4c667b644a 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.filedownload; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ServletActionContext; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/core/src/main/java/org/apache/struts2/ActionContext.java b/core/src/main/java/org/apache/struts2/ActionContext.java index 2f023bc514..febedd04fa 100644 --- a/core/src/main/java/org/apache/struts2/ActionContext.java +++ b/core/src/main/java/org/apache/struts2/ActionContext.java @@ -22,6 +22,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.jsp.PageContext; +import org.apache.struts2.action.Action; import org.apache.struts2.conversion.impl.ConversionData; import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.mapper.ActionMapping; diff --git a/core/src/main/java/org/apache/struts2/ActionInvocation.java b/core/src/main/java/org/apache/struts2/ActionInvocation.java index f203cc777b..bd52e185ae 100644 --- a/core/src/main/java/org/apache/struts2/ActionInvocation.java +++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java @@ -18,7 +18,9 @@ */ 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; diff --git a/core/src/main/java/org/apache/struts2/ActionSupport.java b/core/src/main/java/org/apache/struts2/ActionSupport.java index 92ce264fe8..f5d58b0918 100644 --- a/core/src/main/java/org/apache/struts2/ActionSupport.java +++ b/core/src/main/java/org/apache/struts2/ActionSupport.java @@ -20,6 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.struts2.action.Action; import org.apache.struts2.conversion.impl.ConversionData; import org.apache.struts2.inject.Container; import org.apache.struts2.inject.Inject; diff --git a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java index b146b7c741..cc477abc2d 100644 --- a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java +++ b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java @@ -22,6 +22,7 @@ import ognl.NoSuchPropertyException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.struts2.action.Action; import org.apache.struts2.config.ConfigurationException; import org.apache.struts2.config.entities.ActionConfig; import org.apache.struts2.config.entities.InterceptorMapping; @@ -33,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/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 cc3fb83ac1..11064054bd 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/config/providers/XmlDocConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/providers/XmlDocConfigurationProvider.java index 2ae13bcce0..da44b71f64 100644 --- a/core/src/main/java/org/apache/struts2/config/providers/XmlDocConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/providers/XmlDocConfigurationProvider.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.config.providers; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ObjectFactory; import org.apache.struts2.config.BeanSelectionProvider; import org.apache.struts2.config.Configuration; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java index f7755d212b..c114d65e1e 100644 --- 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/core/src/main/java/org/apache/struts2/interceptor/DefaultWorkflowInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/DefaultWorkflowInterceptor.java index 90f7f70a8f..8419c992b5 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/DefaultWorkflowInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/DefaultWorkflowInterceptor.java @@ -22,7 +22,7 @@ import org.apache.commons.lang3.reflect.MethodUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionInvocation; import org.apache.struts2.interceptor.annotations.InputConfig; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java index 54fa9c1138..5ab03f15a7 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java @@ -18,14 +18,13 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; import org.apache.struts2.config.entities.ResultConfig; import org.apache.struts2.inject.Container; import org.apache.struts2.inject.Inject; -import org.apache.struts2.interceptor.MethodFilterInterceptor; import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/interceptor/Interceptor.java b/core/src/main/java/org/apache/struts2/interceptor/Interceptor.java index 58beef2847..c277c74ccf 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/Interceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/Interceptor.java @@ -19,6 +19,7 @@ package org.apache.struts2.interceptor; import org.apache.struts2.ActionInvocation; +import org.apache.struts2.action.Action; import java.io.Serializable; @@ -42,7 +43,7 @@ *

* Interceptors must be stateless and not assume that a new instance will be created for each request or Action. * Interceptors may choose to either short-circuit the {@link ActionInvocation} execution and return a return code - * (such as {@link org.apache.struts2.Action#SUCCESS}), or it may choose to do some processing before + * (such as {@link Action#SUCCESS}), or it may choose to do some processing before * and/or after delegating the rest of the procesing using {@link ActionInvocation#invoke()}. *

* @@ -215,7 +216,7 @@ public interface Interceptor extends Serializable { * * @param invocation the action invocation * @return the return code, either returned from {@link ActionInvocation#invoke()}, or from the interceptor itself. - * @throws Exception any system-level error, as defined in {@link org.apache.struts2.Action#execute()}. + * @throws Exception any system-level error, as defined in {@link Action#execute()}. */ String intercept(ActionInvocation invocation) throws Exception; diff --git a/core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java b/core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java index affdfc318d..6d304db57c 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java +++ b/core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java @@ -23,7 +23,7 @@ /** * PreResultListeners may be registered with an {@link ActionInvocation} to get a callback after the - * {@link org.apache.struts2.Action} has been executed but before the {@link Result} + * {@link org.apache.struts2.action.Action} has been executed but before the {@link Result} * is executed. * * @author Jason Carreira @@ -31,7 +31,7 @@ public interface PreResultListener { /** - * This callback method will be called after the {@link org.apache.struts2.Action} execution and + * This callback method will be called after the {@link org.apache.struts2.action.Action} execution and * before the {@link Result} execution. * * @param invocation the action invocation diff --git a/core/src/main/java/org/apache/struts2/interceptor/annotations/InputConfig.java b/core/src/main/java/org/apache/struts2/interceptor/annotations/InputConfig.java index 695f4f7509..8eaf163d8f 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/annotations/InputConfig.java +++ b/core/src/main/java/org/apache/struts2/interceptor/annotations/InputConfig.java @@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; /** * diff --git a/core/src/main/java/org/apache/struts2/interceptor/parameter/StrutsParameter.java b/core/src/main/java/org/apache/struts2/interceptor/parameter/StrutsParameter.java index 99de060ff8..1fbafa3c7f 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/parameter/StrutsParameter.java +++ b/core/src/main/java/org/apache/struts2/interceptor/parameter/StrutsParameter.java @@ -18,13 +18,15 @@ */ package org.apache.struts2.interceptor.parameter; +import org.apache.struts2.action.Action; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Used to annotate public getter/setter methods or fields on {@link org.apache.struts2.Action} classes that are + * Used to annotate public getter/setter methods or fields on {@link Action} classes that are * intended for parameter injection by the {@link ParametersInterceptor}. * * @since 6.4.0 diff --git a/core/src/main/java/org/apache/struts2/ActionChainResult.java b/core/src/main/java/org/apache/struts2/result/ActionChainResult.java similarity index 97% rename from core/src/main/java/org/apache/struts2/ActionChainResult.java rename to core/src/main/java/org/apache/struts2/result/ActionChainResult.java index 30f59b1a67..ba1ca315fd 100644 --- a/core/src/main/java/org/apache/struts2/ActionChainResult.java +++ b/core/src/main/java/org/apache/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 index c30083d863..082e4866f0 100644 --- a/core/src/main/java/org/apache/struts2/result/Result.java +++ b/core/src/main/java/org/apache/struts2/result/Result.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.result; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionInvocation; import java.io.Serializable; diff --git a/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java index fafbadb754..c10d102eff 100644 --- a/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import java.util.ArrayList; import java.util.Iterator; diff --git a/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java b/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java index b193d6ad1b..4aa0619518 100644 --- a/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java +++ b/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java index 0f00ec56b3..fefeb4a263 100644 --- a/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import java.util.ArrayList; import java.util.Iterator; diff --git a/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java index e126c5c0d2..e22517b4a2 100644 --- a/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java index 41564409ea..662ea02948 100644 --- a/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index 4f2ccb18d2..f9a0eced0a 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -31,7 +31,7 @@ - + diff --git a/core/src/main/resources/xwork-default.xml b/core/src/main/resources/xwork-default.xml index e56b2e6e0a..504c21b350 100644 --- a/core/src/main/resources/xwork-default.xml +++ b/core/src/main/resources/xwork-default.xml @@ -26,7 +26,7 @@ - + diff --git a/core/src/test/java/org/apache/struts2/ActionChainResultTest.java b/core/src/test/java/org/apache/struts2/ActionChainResultTest.java index 58f4ea90aa..11075c9cc9 100644 --- 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/ActionNestingTest.java b/core/src/test/java/org/apache/struts2/ActionNestingTest.java index f925eed35a..a64260d731 100644 --- a/core/src/test/java/org/apache/struts2/ActionNestingTest.java +++ b/core/src/test/java/org/apache/struts2/ActionNestingTest.java @@ -18,6 +18,7 @@ */ package org.apache.struts2; +import org.apache.struts2.action.Action; import org.apache.struts2.config.Configuration; import org.apache.struts2.config.ConfigurationProvider; import org.apache.struts2.config.entities.ActionConfig; diff --git a/core/src/test/java/org/apache/struts2/ActionSupportTest.java b/core/src/test/java/org/apache/struts2/ActionSupportTest.java index 79420172cd..e42271deab 100644 --- a/core/src/test/java/org/apache/struts2/ActionSupportTest.java +++ b/core/src/test/java/org/apache/struts2/ActionSupportTest.java @@ -18,6 +18,7 @@ */ package org.apache.struts2; +import org.apache.struts2.action.Action; import org.apache.struts2.conversion.impl.ConversionData; import org.apache.struts2.util.ValueStack; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/core/src/test/java/org/apache/struts2/ChainResultTest.java b/core/src/test/java/org/apache/struts2/ChainResultTest.java index dbdecf2c89..109d723525 100644 --- 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 index b853a23cec..76d3cd4322 100644 --- 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/core/src/test/java/org/apache/struts2/ExternalReferenceAction.java b/core/src/test/java/org/apache/struts2/ExternalReferenceAction.java index 469f97538e..8c44aeb41e 100644 --- a/core/src/test/java/org/apache/struts2/ExternalReferenceAction.java +++ b/core/src/test/java/org/apache/struts2/ExternalReferenceAction.java @@ -18,6 +18,8 @@ */ package org.apache.struts2; +import org.apache.struts2.action.Action; + public class ExternalReferenceAction implements Action { private Foo foo; diff --git a/core/src/test/java/org/apache/struts2/NestedAction.java b/core/src/test/java/org/apache/struts2/NestedAction.java index 75f8783df3..28c9ea2246 100644 --- a/core/src/test/java/org/apache/struts2/NestedAction.java +++ b/core/src/test/java/org/apache/struts2/NestedAction.java @@ -18,6 +18,7 @@ */ package org.apache.struts2; +import org.apache.struts2.action.Action; import org.apache.struts2.util.ValueStack; import org.junit.Assert; diff --git a/core/src/test/java/org/apache/struts2/SimpleFooAction.java b/core/src/test/java/org/apache/struts2/SimpleFooAction.java index 9c0804518c..ff3c358017 100644 --- a/core/src/test/java/org/apache/struts2/SimpleFooAction.java +++ b/core/src/test/java/org/apache/struts2/SimpleFooAction.java @@ -19,6 +19,8 @@ package org.apache.struts2; +import org.apache.struts2.action.Action; + /** * DOCUMENT ME! * diff --git a/core/src/test/java/org/apache/struts2/TestAction.java b/core/src/test/java/org/apache/struts2/TestAction.java index ebcd7f18dc..d8f5b0d421 100644 --- a/core/src/test/java/org/apache/struts2/TestAction.java +++ b/core/src/test/java/org/apache/struts2/TestAction.java @@ -18,8 +18,7 @@ */ package org.apache.struts2; -import org.apache.struts2.Action; -import org.apache.struts2.ActionSupport; +import org.apache.struts2.action.Action; import org.apache.struts2.util.ValueStack; import org.apache.struts2.validator.annotations.RequiredFieldValidator; import org.apache.struts2.validator.annotations.RequiredStringValidator; diff --git a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java index a401d3ae43..34d1ecd5b6 100644 --- a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java +++ b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java @@ -18,10 +18,7 @@ */ package org.apache.struts2; -import org.apache.struts2.Action; -import org.apache.struts2.ActionProxyFactory; -import org.apache.struts2.DefaultActionProxyFactory; -import org.apache.struts2.ObjectFactory; +import org.apache.struts2.action.Action; import org.apache.struts2.config.Configuration; import org.apache.struts2.config.ConfigurationException; import org.apache.struts2.config.ConfigurationProvider; diff --git a/core/src/test/java/org/apache/struts2/components/FormTest.java b/core/src/test/java/org/apache/struts2/components/FormTest.java index 69a213706a..5f3ed682fe 100644 --- a/core/src/test/java/org/apache/struts2/components/FormTest.java +++ b/core/src/test/java/org/apache/struts2/components/FormTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/config/SettingsTest.java b/core/src/test/java/org/apache/struts2/config/SettingsTest.java index c3ac9f0444..cb283cb286 100644 --- a/core/src/test/java/org/apache/struts2/config/SettingsTest.java +++ b/core/src/test/java/org/apache/struts2/config/SettingsTest.java @@ -36,7 +36,7 @@ public void testSettings() { Settings settings = new DefaultSettings(); assertEquals("12345", settings.get(StrutsConstants.STRUTS_MULTIPART_MAX_SIZE)); - assertEquals("\\temp", settings.get(StrutsConstants.STRUTS_MULTIPART_SAVE_DIR)); + assertEquals("./target/temp", settings.get(StrutsConstants.STRUTS_MULTIPART_SAVE_DIR)); assertEquals("test,org/apache/struts2/othertest", settings.get( StrutsConstants.STRUTS_CUSTOM_PROPERTIES)); assertEquals("testvalue", settings.get("testkey")); diff --git a/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java b/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java index 45e6dd2c62..f0eabcc3a7 100644 --- a/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java +++ b/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java @@ -51,14 +51,14 @@ 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"), Class.forName("java.lang.Object"), Class.forName("org.apache.struts2.Validateable"), Class.forName("org.apache.struts2.mock.MockInterceptor"), - Class.forName("org.apache.struts2.Action"), + Class.forName("org.apache.struts2.action.Action"), Class.forName("org.apache.struts2.interceptor.AbstractInterceptor"), Class.forName("org.apache.struts2.result.Result"), Class.forName("org.apache.struts2.SimpleAction") @@ -82,7 +82,7 @@ public void allowlist_1only() throws Exception { Class.forName("java.lang.Object"), Class.forName("org.apache.struts2.Validateable"), Class.forName("org.apache.struts2.mock.MockInterceptor"), - Class.forName("org.apache.struts2.Action"), + Class.forName("org.apache.struts2.action.Action"), Class.forName("org.apache.struts2.interceptor.AbstractInterceptor"), Class.forName("org.apache.struts2.result.Result"), Class.forName("org.apache.struts2.SimpleAction") @@ -100,13 +100,13 @@ 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"), Class.forName("java.lang.Object"), Class.forName("org.apache.struts2.Validateable"), - Class.forName("org.apache.struts2.Action"), + Class.forName("org.apache.struts2.action.Action"), Class.forName("org.apache.struts2.interceptor.AbstractInterceptor"), Class.forName("org.apache.struts2.result.Result") ); 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 index 8cc506f05b..7b89a4ad71 100644 --- a/core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java +++ b/core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.config.providers; -import org.apache.struts2.Action; -import org.apache.struts2.ActionChainResult; +import org.apache.struts2.action.Action; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.ModelDrivenAction; import org.apache.struts2.ObjectFactory; import org.apache.struts2.SimpleAction; diff --git a/core/src/test/java/org/apache/struts2/config/providers/NoNoArgsConstructorAction.java b/core/src/test/java/org/apache/struts2/config/providers/NoNoArgsConstructorAction.java index f9b9268b85..0b26d5a675 100644 --- a/core/src/test/java/org/apache/struts2/config/providers/NoNoArgsConstructorAction.java +++ b/core/src/test/java/org/apache/struts2/config/providers/NoNoArgsConstructorAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.config.providers; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; /** * Action with no public constructor taking no args. diff --git a/core/src/test/java/org/apache/struts2/config/providers/PrivateConstructorAction.java b/core/src/test/java/org/apache/struts2/config/providers/PrivateConstructorAction.java index 43876adaa5..542d5dcdc5 100644 --- a/core/src/test/java/org/apache/struts2/config/providers/PrivateConstructorAction.java +++ b/core/src/test/java/org/apache/struts2/config/providers/PrivateConstructorAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.config.providers; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; /** * Action with no public constructor. diff --git a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java index d120e91d25..af68d7dc6c 100644 --- a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java +++ b/core/src/test/java/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/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java index cd6827fa11..a1fdcaccf6 100644 --- a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java +++ b/core/src/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/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java index 5c3d4b55c4..1f7285db9c 100644 --- a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java +++ b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.config.providers; -import org.apache.struts2.Action; -import org.apache.struts2.ActionChainResult; +import org.apache.struts2.action.Action; +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/config/providers/XmlConfigurationProviderWildCardIncludeTest.java b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java index 4a29e76b51..db57821210 100644 --- a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java +++ b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java @@ -44,9 +44,9 @@ public void testWildCardInclude() throws Exception { assertNotNull(defaultTwoPackage); assertEquals("default-2", defaultTwoPackage.getName()); - PackageConfig defaultPackage = configuration.getPackageConfig("default"); + PackageConfig defaultPackage = configuration.getPackageConfig("default-wildcard"); assertNotNull(defaultPackage); - assertEquals("default", defaultPackage.getName()); + assertEquals("default-wildcard", defaultPackage.getName()); configurationManager.addContainerProvider(provider); configurationManager.reload(); diff --git a/core/src/test/java/org/apache/struts2/conversion/ConversionTestAction.java b/core/src/test/java/org/apache/struts2/conversion/ConversionTestAction.java index 8d779256bd..a425a202b0 100644 --- a/core/src/test/java/org/apache/struts2/conversion/ConversionTestAction.java +++ b/core/src/test/java/org/apache/struts2/conversion/ConversionTestAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.conversion; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.conversion.annotations.Conversion; import org.apache.struts2.conversion.annotations.ConversionRule; import org.apache.struts2.conversion.annotations.ConversionType; diff --git a/core/src/test/java/org/apache/struts2/interceptor/AliasInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/AliasInterceptorTest.java index ed05389b99..d2a38f3323 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/AliasInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/AliasInterceptorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionProxy; import org.apache.struts2.SimpleAction; diff --git a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java index efdd77b583..85df164cce 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java @@ -19,8 +19,8 @@ package org.apache.struts2.interceptor; import com.mockobjects.dynamic.Mock; -import org.apache.struts2.Action; -import org.apache.struts2.ActionChainResult; +import org.apache.struts2.action.Action; +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 index 211e7329bc..88d5fcc8cc 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; -import org.apache.struts2.ActionChainResult; +import org.apache.struts2.action.Action; +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/java/org/apache/struts2/interceptor/ConversionErrorInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ConversionErrorInterceptorTest.java index 677f248d31..35e87a1828 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ConversionErrorInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ConversionErrorInterceptorTest.java @@ -20,7 +20,7 @@ import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionSupport; diff --git a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java index 13c9bbc7ae..8189f5ce8e 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionSupport; diff --git a/core/src/test/java/org/apache/struts2/interceptor/DefaultWorkflowInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/DefaultWorkflowInterceptorTest.java index 83cdcfabad..f00c514874 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/DefaultWorkflowInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/DefaultWorkflowInterceptorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/interceptor/ExceptionMappingInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ExceptionMappingInterceptorTest.java index a7e799b49d..e5f922fdf9 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ExceptionMappingInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ExceptionMappingInterceptorTest.java @@ -19,7 +19,7 @@ package org.apache.struts2.interceptor; import com.mockobjects.dynamic.Mock; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java index d6caace33b..76f72ca84f 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; /** * Used by ExecuteAndWaitInterceptorTest. diff --git a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java index a8da7b1e6b..7af1e6cc49 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionProxy; import org.apache.struts2.ActionProxyFactory; diff --git a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java index 879924f6ed..de85a42a6f 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.DefaultLocaleProviderFactory; diff --git a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java index 86bc96286e..c066b41d58 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionSupport; @@ -31,7 +31,6 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; import java.util.ArrayList; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java b/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java index e640231ee1..bd39d829a9 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionSupport; diff --git a/core/src/test/java/org/apache/struts2/interceptor/ModelDrivenInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ModelDrivenInterceptorTest.java index ed3b2c2d2a..cb2b06a0cd 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ModelDrivenInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ModelDrivenInterceptorTest.java @@ -20,7 +20,7 @@ import com.mockobjects.dynamic.ConstraintMatcher; import com.mockobjects.dynamic.Mock; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionSupport; diff --git a/core/src/test/java/org/apache/struts2/interceptor/PreResultListenerTest.java b/core/src/test/java/org/apache/struts2/interceptor/PreResultListenerTest.java index 0b397ab6f6..0b91f30cdc 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/PreResultListenerTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/PreResultListenerTest.java @@ -20,7 +20,7 @@ import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; import org.apache.struts2.ActionProxyFactory; diff --git a/core/src/test/java/org/apache/struts2/interceptor/PrepareInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/PrepareInterceptorTest.java index 85e62126de..5d93ce1db5 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/PrepareInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/PrepareInterceptorTest.java @@ -20,7 +20,7 @@ import com.mockobjects.dynamic.Mock; import junit.framework.TestCase; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; import org.apache.struts2.Preparable; diff --git a/core/src/test/java/org/apache/struts2/interceptor/ScopedModelDrivenInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ScopedModelDrivenInterceptorTest.java index f9e2777aca..9f9d594e6e 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ScopedModelDrivenInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ScopedModelDrivenInterceptorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ObjectFactory; import org.apache.struts2.ProxyObjectFactory; diff --git a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java index dbea9906ef..8adc1ccba7 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.StrutsInternalTestCase; import org.apache.struts2.StrutsStatics; diff --git a/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java index 399774c6a2..15f42c1755 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java @@ -20,7 +20,7 @@ import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionSupport; diff --git a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java index 2fd00872f2..8ab596075d 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionProxy; import org.apache.struts2.util.ValueStack; diff --git a/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java index 9ca1006349..d499ac000c 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java @@ -20,7 +20,7 @@ import org.apache.struts2.TestConfigurationProvider; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionProxy; /** diff --git a/core/src/test/java/org/apache/struts2/interceptor/ValidationErrorAwareTest.java b/core/src/test/java/org/apache/struts2/interceptor/ValidationErrorAwareTest.java index 268359c779..31a64aaad3 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ValidationErrorAwareTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ValidationErrorAwareTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java b/core/src/test/java/org/apache/struts2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java index 6473514461..6aba113c43 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotatedAction.java b/core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotatedAction.java index 6ac578ae65..cfa057756f 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotatedAction.java +++ b/core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotatedAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor.annotations; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; /** * @author Zsolt Szasz, zsolt at lorecraft dot com diff --git a/core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java index 37a163a062..dcb80b9437 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor.annotations; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionProxy; import org.apache.struts2.ActionProxyFactory; import org.apache.struts2.DefaultActionProxyFactory; diff --git a/core/src/test/java/org/apache/struts2/interceptor/annotations/ShortcircuitedAction.java b/core/src/test/java/org/apache/struts2/interceptor/annotations/ShortcircuitedAction.java index 6026eedc8f..525b88c24f 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/annotations/ShortcircuitedAction.java +++ b/core/src/test/java/org/apache/struts2/interceptor/annotations/ShortcircuitedAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor.annotations; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; /** * @author Zsolt Szasz, zsolt at lorecraft dot com diff --git a/core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java index be23fef5d0..de849cd10c 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor.parameter; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionProxy; import org.apache.struts2.ActionSupport; diff --git a/core/src/test/java/org/apache/struts2/result/StreamResultTest.java b/core/src/test/java/org/apache/struts2/result/StreamResultTest.java index 9a223effbc..b1e756cbce 100644 --- a/core/src/test/java/org/apache/struts2/result/StreamResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/StreamResultTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.result; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.mock.MockActionInvocation; import org.apache.struts2.util.ClassLoaderUtil; diff --git a/core/src/test/java/org/apache/struts2/util/MyBeanAction.java b/core/src/test/java/org/apache/struts2/util/MyBeanAction.java index f59502e112..54b47868cd 100644 --- a/core/src/test/java/org/apache/struts2/util/MyBeanAction.java +++ b/core/src/test/java/org/apache/struts2/util/MyBeanAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.conversion.annotations.Conversion; import org.apache.struts2.conversion.annotations.ConversionRule; import org.apache.struts2.conversion.annotations.TypeConversion; diff --git a/core/src/test/java/org/apache/struts2/util/StrutsLocalizedTextProviderTest.java b/core/src/test/java/org/apache/struts2/util/StrutsLocalizedTextProviderTest.java index 39bc8f8cea..44c68acd75 100644 --- a/core/src/test/java/org/apache/struts2/util/StrutsLocalizedTextProviderTest.java +++ b/core/src/test/java/org/apache/struts2/util/StrutsLocalizedTextProviderTest.java @@ -19,7 +19,7 @@ package org.apache.struts2.util; import com.mockobjects.dynamic.Mock; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/validator/AnnotationActionValidatorManagerTest.java b/core/src/test/java/org/apache/struts2/validator/AnnotationActionValidatorManagerTest.java index 5d5779467b..39065c933a 100644 --- a/core/src/test/java/org/apache/struts2/validator/AnnotationActionValidatorManagerTest.java +++ b/core/src/test/java/org/apache/struts2/validator/AnnotationActionValidatorManagerTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.validator; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/validator/ExpressionValidatorTest.java b/core/src/test/java/org/apache/struts2/validator/ExpressionValidatorTest.java index 82b373ef81..bb4bd4f855 100644 --- a/core/src/test/java/org/apache/struts2/validator/ExpressionValidatorTest.java +++ b/core/src/test/java/org/apache/struts2/validator/ExpressionValidatorTest.java @@ -20,7 +20,7 @@ import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/validator/ModelDrivenValidationTest.java b/core/src/test/java/org/apache/struts2/validator/ModelDrivenValidationTest.java index 7ba745c1bd..8c59588d74 100644 --- a/core/src/test/java/org/apache/struts2/validator/ModelDrivenValidationTest.java +++ b/core/src/test/java/org/apache/struts2/validator/ModelDrivenValidationTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.validator; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionProxy; import org.apache.struts2.ModelDrivenAction; diff --git a/core/src/test/java/org/apache/struts2/validator/StringValidatorTest.java b/core/src/test/java/org/apache/struts2/validator/StringValidatorTest.java index 2e4bde0778..d052b4aeaa 100644 --- a/core/src/test/java/org/apache/struts2/validator/StringValidatorTest.java +++ b/core/src/test/java/org/apache/struts2/validator/StringValidatorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.validator; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/validator/VisitorFieldValidatorModelTest.java b/core/src/test/java/org/apache/struts2/validator/VisitorFieldValidatorModelTest.java index 05fd4f331b..157fea9097 100644 --- a/core/src/test/java/org/apache/struts2/validator/VisitorFieldValidatorModelTest.java +++ b/core/src/test/java/org/apache/struts2/validator/VisitorFieldValidatorModelTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.validator; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/validator/VisitorFieldValidatorTest.java b/core/src/test/java/org/apache/struts2/validator/VisitorFieldValidatorTest.java index b9d361c3bc..a0ec81166e 100644 --- a/core/src/test/java/org/apache/struts2/validator/VisitorFieldValidatorTest.java +++ b/core/src/test/java/org/apache/struts2/validator/VisitorFieldValidatorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.validator; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java index 4c936148e4..eee8b06fa9 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java @@ -19,7 +19,7 @@ package org.apache.struts2.views.jsp; import com.mockobjects.dynamic.Mock; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java index 70445a3d0b..3b60dca090 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java @@ -21,7 +21,7 @@ import com.mockobjects.dynamic.Mock; import jakarta.servlet.jsp.JspException; import jakarta.servlet.jsp.PageContext; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java index 2554fc6487..b2f09c1752 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java @@ -24,7 +24,7 @@ import org.apache.struts2.views.jsp.iterator.AppendIteratorTag; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionSupport; /** diff --git a/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java index 94b279395a..618335996e 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.views.jsp; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionSupport; import org.apache.struts2.util.IteratorGenerator.Converter; import org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java index bc6aa152fe..254d72be45 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java @@ -24,7 +24,7 @@ import org.apache.struts2.views.jsp.iterator.MergeIteratorTag; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionSupport; /** diff --git a/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java index 6eb5fc1478..1fc02ef85f 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java @@ -20,7 +20,7 @@ import jakarta.servlet.jsp.JspException; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionSupport; import org.apache.struts2.views.jsp.iterator.SortIteratorTag; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java index 999a2bfbb9..1d8a18c336 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.views.jsp; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionSupport; import org.apache.struts2.util.SubsetIteratorFilter.Decider; import org.apache.struts2.views.jsp.iterator.SubsetIteratorTag; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java index 1e4d2fae6f..2dcffd901e 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java @@ -35,7 +35,7 @@ import org.apache.struts2.views.jsp.ui.TestAction1; import org.springframework.mock.web.MockJspWriter; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.util.ValueStack; import org.apache.struts2.util.ValueStackFactory; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java index 3eeae5ae38..c253efda46 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.views.jsp.ui; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionSupport; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.TestAction; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java index 9fd50a47e0..c11e794007 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.views.jsp.ui; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionSupport; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.TestAction; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java index 3bd44769c9..c1fbcae8d1 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.views.jsp.ui; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionSupport; import org.apache.struts2.TestAction; import org.apache.struts2.views.jsp.AbstractUITagTest; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java index 85903ce218..18ffb20285 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.views.jsp.ui; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionProxy; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/LocaleTestAction.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/LocaleTestAction.java index 56cec4340b..0cc49a0b7a 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/LocaleTestAction.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/LocaleTestAction.java @@ -23,7 +23,7 @@ import org.apache.struts2.TestAction; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; public class LocaleTestAction extends TestAction implements Action { diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java index 29af863ef6..dc05b54bfc 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java @@ -25,7 +25,7 @@ import org.apache.struts2.views.jsp.AbstractUITagTest; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionSupport; /** 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 index 42941e5f24..4febcad9df 100644 --- 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 @@ - + 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 index ca38ab0aba..d74c500f22 100644 --- 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 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml index f94e7fd13d..0e0259b470 100644 --- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml +++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml @@ -26,7 +26,7 @@ - + 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 index 42941e5f24..4febcad9df 100644 --- 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 @@ - + 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 index d920b03bd0..ff884c86ca 100644 --- 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 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml index 99a6b4ecce..951eca5bed 100644 --- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml +++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml @@ -26,7 +26,7 @@ - + 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 index f710519b79..71d4c82b44 100644 --- 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 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml index e42274f2ea..b4bc03a1b2 100644 --- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml +++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml @@ -26,7 +26,7 @@ - + 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 index f7c67b165b..99bfcf69fd 100644 --- 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 @@ - + 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 index 82582db3cb..9020e1a1a6 100644 --- 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 @@ - + diff --git a/core/src/test/resources/struts.properties b/core/src/test/resources/struts.properties index 7d905d214a..58288bdda4 100644 --- a/core/src/test/resources/struts.properties +++ b/core/src/test/resources/struts.properties @@ -24,7 +24,7 @@ struts.i18n.encoding=ISO-8859-1 struts.locale=de_DE -struts.multipart.saveDir=\\temp +struts.multipart.saveDir=./target/temp struts.multipart.maxSize=12345 ### Load custom property files (does not override struts.properties!) diff --git a/core/src/test/resources/xwork - jar.jar b/core/src/test/resources/xwork - jar.jar index 001de63fc5..4258db034a 100644 Binary files a/core/src/test/resources/xwork - jar.jar and b/core/src/test/resources/xwork - jar.jar differ diff --git a/core/src/test/resources/xwork - zip.zip b/core/src/test/resources/xwork - zip.zip index 6490cf77ea..edfc308019 100644 Binary files a/core/src/test/resources/xwork - zip.zip and b/core/src/test/resources/xwork - zip.zip differ diff --git a/core/src/test/resources/xwork-jar.jar b/core/src/test/resources/xwork-jar.jar index 58335095e9..36bc457c6d 100644 Binary files a/core/src/test/resources/xwork-jar.jar and b/core/src/test/resources/xwork-jar.jar differ diff --git a/core/src/test/resources/xwork-proxyinvoke.xml b/core/src/test/resources/xwork-proxyinvoke.xml index 7a4b78425b..64919e3064 100644 --- a/core/src/test/resources/xwork-proxyinvoke.xml +++ b/core/src/test/resources/xwork-proxyinvoke.xml @@ -30,7 +30,7 @@ - + diff --git a/core/src/test/resources/xwork-test-default.xml b/core/src/test/resources/xwork-test-default.xml index 7f9f3c0ae9..31f92d9d66 100644 --- a/core/src/test/resources/xwork-test-default.xml +++ b/core/src/test/resources/xwork-test-default.xml @@ -25,7 +25,7 @@ - + diff --git a/core/src/test/resources/xwork-test-validation.xml b/core/src/test/resources/xwork-test-validation.xml index feb14423a6..e451836367 100644 --- a/core/src/test/resources/xwork-test-validation.xml +++ b/core/src/test/resources/xwork-test-validation.xml @@ -26,7 +26,7 @@ - + diff --git a/core/src/test/resources/xwork-zip.zip b/core/src/test/resources/xwork-zip.zip index 19c19c12af..e26353ebfa 100644 Binary files a/core/src/test/resources/xwork-zip.zip and b/core/src/test/resources/xwork-zip.zip differ diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java index f7406e3dd6..fd95c87d55 100644 --- a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java +++ b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java @@ -22,7 +22,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionSupport; import org.apache.struts2.ObjectFactory; diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java b/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java index 9de94c217a..2688e32d71 100644 --- a/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java +++ b/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.convention; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.config.ConfigurationException; import org.apache.struts2.config.entities.PackageConfig; diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java index f993ea153f..45eb3f8b82 100644 --- a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java +++ b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java @@ -545,7 +545,7 @@ private UrlSet buildUrlSet(List resourceUrls) throws IOException { /** * Note that we can't include the test for {@link #actionSuffix} here * because a class is included if its name ends in {@link #actionSuffix} OR - * it implements {@link org.apache.struts2.Action}. Since the whole + * it implements {@link org.apache.struts2.action.Action}. Since the whole * goal is to avoid loading the class if we don't have to, the (actionSuffix * || implements Action) test will have to remain until later. See * {@link #getActionClassTest()} for the test performed on the loaded @@ -660,7 +660,7 @@ public boolean test(ClassFinder.ClassInfo classInfo) { boolean nameMatches = matchesSuffix(classInfo.getName()); try { - return inPackage && (nameMatches || (checkImplementsAction && org.apache.struts2.Action.class.isAssignableFrom(classInfo.get()))); + return inPackage && (nameMatches || (checkImplementsAction && org.apache.struts2.action.Action.class.isAssignableFrom(classInfo.get()))); } catch (ClassNotFoundException ex) { LOG.error("Unable to load class [{}]", classInfo.getName(), ex); return false; diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Result.java b/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Result.java index d55fd6019d..3254336d25 100644 --- a/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Result.java +++ b/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Result.java @@ -67,7 +67,7 @@ * @return The name of the result mapping. This is the value that is returned from the action * method and is used to associate a location with a return value. */ - String[] name() default org.apache.struts2.Action.SUCCESS; + String[] name() default org.apache.struts2.action.Action.SUCCESS; /** * @return The location of the result within the web application or anywhere on disk. This location diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java b/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java index c17a75b029..dcb0b4352e 100644 --- a/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java +++ b/plugins/convention/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/convention/src/test/java/org/apache/struts2/convention/actions/Skip.java b/plugins/convention/src/test/java/org/apache/struts2/convention/actions/Skip.java index 3af91c99fa..9abfdbc0c8 100644 --- a/plugins/convention/src/test/java/org/apache/struts2/convention/actions/Skip.java +++ b/plugins/convention/src/test/java/org/apache/struts2/convention/actions/Skip.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.convention.actions; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; public class Skip implements Action { public String execute() throws Exception { diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/actions/defaultinterceptor/SingleActionNameAction2.java b/plugins/convention/src/test/java/org/apache/struts2/convention/actions/defaultinterceptor/SingleActionNameAction2.java index c0ee03683d..b235e5367e 100644 --- a/plugins/convention/src/test/java/org/apache/struts2/convention/actions/defaultinterceptor/SingleActionNameAction2.java +++ b/plugins/convention/src/test/java/org/apache/struts2/convention/actions/defaultinterceptor/SingleActionNameAction2.java @@ -25,7 +25,7 @@ * This is a test action. *

*/ -public class SingleActionNameAction2 implements org.apache.struts2.Action { +public class SingleActionNameAction2 implements org.apache.struts2.action.Action { @Action("action345") public String execute() { return null; diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/actions/idx/Index.java b/plugins/convention/src/test/java/org/apache/struts2/convention/actions/idx/Index.java index 23ce3d9d5c..fbb2b9a3cc 100644 --- a/plugins/convention/src/test/java/org/apache/struts2/convention/actions/idx/Index.java +++ b/plugins/convention/src/test/java/org/apache/struts2/convention/actions/idx/Index.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.convention.actions.idx; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; public class Index implements Action { public String execute() throws Exception { diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/actions/idx/idx2/Index.java b/plugins/convention/src/test/java/org/apache/struts2/convention/actions/idx/idx2/Index.java index 8a0325c26e..dbde6bfb28 100644 --- a/plugins/convention/src/test/java/org/apache/struts2/convention/actions/idx/idx2/Index.java +++ b/plugins/convention/src/test/java/org/apache/struts2/convention/actions/idx/idx2/Index.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.convention.actions.idx.idx2; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; public class Index implements Action { public String execute() throws Exception { diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/actions/skip/Index.java b/plugins/convention/src/test/java/org/apache/struts2/convention/actions/skip/Index.java index ce2b2ccb3e..a59307d645 100644 --- a/plugins/convention/src/test/java/org/apache/struts2/convention/actions/skip/Index.java +++ b/plugins/convention/src/test/java/org/apache/struts2/convention/actions/skip/Index.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.convention.actions.skip; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; public class Index implements Action { public String execute() throws Exception { diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java index 7b96378763..df8609ab61 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.json; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionInvocation; import org.apache.struts2.inject.Inject; import org.apache.struts2.interceptor.AbstractInterceptor; diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java index fddeb37b6d..3e5bd736dd 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.json; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ModelDriven; import org.apache.struts2.interceptor.ValidationAware; diff --git a/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java b/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java index 4e10416782..08b3b78cc2 100644 --- a/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java +++ b/plugins/json/src/test/java/org/apache/struts2/json/JSONValidationInterceptorTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.json; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionSupport; import org.apache.struts2.config.entities.ActionConfig; diff --git a/plugins/json/src/test/java/org/apache/struts2/json/TestAction.java b/plugins/json/src/test/java/org/apache/struts2/json/TestAction.java index 93002671e6..e8ff6ad2ab 100644 --- a/plugins/json/src/test/java/org/apache/struts2/json/TestAction.java +++ b/plugins/json/src/test/java/org/apache/struts2/json/TestAction.java @@ -25,7 +25,7 @@ import org.apache.struts2.json.annotations.JSON; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionSupport; /** diff --git a/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsSpringJUnit4TestCaseTest.java b/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsSpringJUnit4TestCaseTest.java index dd2511b263..366e9bb3df 100644 --- a/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsSpringJUnit4TestCaseTest.java +++ b/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsSpringJUnit4TestCaseTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.junit; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionProxy; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.junit.Assert; diff --git a/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsTestCaseTest.java b/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsTestCaseTest.java index 951a9c8461..5ae5f17313 100644 --- a/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsTestCaseTest.java +++ b/plugins/junit/src/test/java/org/apache/struts2/junit/StrutsTestCaseTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.junit; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionProxy; import org.apache.struts2.dispatcher.mapper.ActionMapping; 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 5c781bc308..2defb5773c 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java @@ -23,7 +23,7 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionInvocation; import org.apache.struts2.DefaultActionInvocation; import org.apache.struts2.ModelDriven; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java index a85fddbbd6..0efe9a57aa 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.rest; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.inject.Inject; diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeInterceptorTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeInterceptorTest.java index 61058cdc28..2232ccb94c 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeInterceptorTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeInterceptorTest.java @@ -20,7 +20,7 @@ import com.mockobjects.dynamic.AnyConstraintMatcher; import com.mockobjects.dynamic.Mock; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.ActionSupport; diff --git a/plugins/spring/src/test/java/org/apache/struts2/spring/ActionsFromSpringTest.java b/plugins/spring/src/test/java/org/apache/struts2/spring/ActionsFromSpringTest.java index 0875810adf..a3cf29a620 100644 --- a/plugins/spring/src/test/java/org/apache/struts2/spring/ActionsFromSpringTest.java +++ b/plugins/spring/src/test/java/org/apache/struts2/spring/ActionsFromSpringTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.spring; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionProxy; import org.apache.struts2.ObjectFactory; diff --git a/plugins/spring/src/test/java/org/apache/struts2/spring/ExecuteInterceptor.java b/plugins/spring/src/test/java/org/apache/struts2/spring/ExecuteInterceptor.java index 7a24815984..43a3b81539 100644 --- a/plugins/spring/src/test/java/org/apache/struts2/spring/ExecuteInterceptor.java +++ b/plugins/spring/src/test/java/org/apache/struts2/spring/ExecuteInterceptor.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.spring; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; 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 index 2ab25ce34c..01990e59ad 100644 --- a/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java +++ b/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.spring; -import org.apache.struts2.Action; -import org.apache.struts2.ActionChainResult; +import org.apache.struts2.action.Action; +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 index 60f64ef5bb..2a80b6fa3b 100644 --- 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 @@ + class="org.apache.struts2.result.ActionChainResult"/> diff --git a/plugins/xslt/src/test/java/org/apache/struts2/result/xslt/XSLTResultTest.java b/plugins/xslt/src/test/java/org/apache/struts2/result/xslt/XSLTResultTest.java index c8ef8a2fe2..51efb818a7 100644 --- a/plugins/xslt/src/test/java/org/apache/struts2/result/xslt/XSLTResultTest.java +++ b/plugins/xslt/src/test/java/org/apache/struts2/result/xslt/XSLTResultTest.java @@ -19,7 +19,7 @@ package org.apache.struts2.result.xslt; import junit.framework.TestCase; -import org.apache.struts2.Action; +import org.apache.struts2.action.Action; import org.apache.struts2.ActionContext; import org.apache.struts2.ServletActionContext; import org.apache.struts2.junit.StrutsTestCase;