Merge pull request #1112 from apache/feature/WW-5459-restructure

WW-5459 Moves Action & ActionChainResult into proper packages

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;

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;

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;

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;

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;
 

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;

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;
 

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;

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;

core/src/main/java/org/apache/struts2/Action.java → 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 <b>may</b> implement this interface, which exposes the <code>execute()</code> method.

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;

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;

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;
 

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;

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 @@
  * <p>
  * Interceptors <b>must</b> 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()}.
  * </p>
  * <!-- END SNIPPET: introduction -->
@@ -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;
 

core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java

@@ -23,15 +23,15 @@
 
 /**
  * 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
  */
 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

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;
 
 /**
  * <!-- START SNIPPET: description -->

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

core/src/main/java/org/apache/struts2/ActionChainResult.java → 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;

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;

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;

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;
 

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;

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;
 

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;
 

core/src/main/resources/struts-default.xml

@@ -31,7 +31,7 @@
 
     <package name="struts-default" abstract="true">
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult"/>
             <result-type name="dispatcher" class="org.apache.struts2.result.ServletDispatcherResult" default="true"/>
             <result-type name="freemarker" class="org.apache.struts2.views.freemarker.FreemarkerResult"/>
             <result-type name="httpheader" class="org.apache.struts2.result.HttpHeaderResult"/>

core/src/main/resources/xwork-default.xml

@@ -26,7 +26,7 @@
     <package name="xwork-default" abstract="true">
 
         <result-types>
-            <result-type name="chain" class="org.apache.struts2.ActionChainResult"/>
+            <result-type name="chain" class="org.apache.struts2.result.ActionChainResult"/>
         </result-types>
         <interceptors>
             <interceptor name="logger" class="org.apache.struts2.interceptor.LoggingInterceptor"/>

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;
 

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;

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;

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;

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;

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;

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;
 

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!
  *

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;

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;