mirror of
https://github.com/apache/struts.git
synced 2026-08-06 07:06:58 +00:00
WW-5459 Moves Action interface into org.apache.struts2.action package
This commit is contained in:
Lukasz Lenart
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@ import jakarta.servlet.ServletContext;
|
||||
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;
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
package org.apache.struts2;
|
||||
|
||||
import org.apache.struts2.action.Action;
|
||||
import org.apache.struts2.interceptor.PreResultListener;
|
||||
import org.apache.struts2.result.Result;
|
||||
import org.apache.struts2.util.ValueStack;
|
||||
|
||||
@@ -20,6 +20,7 @@ package org.apache.struts2;
|
||||
|
||||
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;
|
||||
|
||||
@@ -22,6 +22,7 @@ import ognl.MethodFailedException;
|
||||
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;
|
||||
|
||||
+1
-1
@@ -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.
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -22,7 +22,7 @@ import org.apache.commons.lang3.StringUtils;
|
||||
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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 @@ import java.io.Serializable;
|
||||
* <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;
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ import org.apache.struts2.result.Result;
|
||||
|
||||
/**
|
||||
* 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 @@ import org.apache.struts2.result.Result;
|
||||
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
|
||||
|
||||
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
import org.apache.struts2.Action;
|
||||
import org.apache.struts2.action.Action;
|
||||
|
||||
/**
|
||||
* <!-- START SNIPPET: description -->
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -21,6 +21,8 @@ package org.apache.struts2.result;
|
||||
import org.apache.struts2.Action;
|
||||
import org.apache.struts2.ActionInvocation;
|
||||
|
||||
import org.apache.struts2.action.Action;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
*/
|
||||
package org.apache.struts2;
|
||||
|
||||
import org.apache.struts2.action.Action;
|
||||
|
||||
public class ExternalReferenceAction implements Action {
|
||||
|
||||
private Foo foo;
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
package org.apache.struts2;
|
||||
|
||||
import org.apache.struts2.action.Action;
|
||||
import org.apache.struts2.util.ValueStack;
|
||||
import org.junit.Assert;
|
||||
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
package org.apache.struts2;
|
||||
|
||||
|
||||
import org.apache.struts2.action.Action;
|
||||
|
||||
/**
|
||||
* DOCUMENT ME!
|
||||
*
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
+3
-3
@@ -58,7 +58,7 @@ public class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase
|
||||
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 class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase
|
||||
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")
|
||||
@@ -106,7 +106,7 @@ public class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase
|
||||
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")
|
||||
);
|
||||
|
||||
+1
-1
@@ -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.ActionChainResult;
|
||||
import org.apache.struts2.ModelDrivenAction;
|
||||
import org.apache.struts2.ObjectFactory;
|
||||
|
||||
+1
-1
@@ -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.
|
||||
|
||||
+1
-1
@@ -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.
|
||||
|
||||
+1
-1
@@ -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.ActionChainResult;
|
||||
import org.apache.struts2.SimpleAction;
|
||||
import org.apache.struts2.config.ConfigurationException;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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.ActionChainResult;
|
||||
import org.apache.struts2.ActionContext;
|
||||
import org.apache.struts2.ActionInvocation;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
*/
|
||||
package org.apache.struts2.interceptor;
|
||||
|
||||
import org.apache.struts2.Action;
|
||||
import org.apache.struts2.action.Action;
|
||||
import org.apache.struts2.ActionChainResult;
|
||||
import org.apache.struts2.ActionProxy;
|
||||
import org.apache.struts2.ActionProxyFactory;
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@ package org.apache.struts2.interceptor;
|
||||
|
||||
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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
*/
|
||||
package org.apache.struts2.interceptor;
|
||||
|
||||
import org.apache.struts2.Action;
|
||||
import org.apache.struts2.action.Action;
|
||||
|
||||
/**
|
||||
* Used by ExecuteAndWaitInterceptorTest.
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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.HttpServletRequest;
|
||||
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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -20,7 +20,7 @@ package org.apache.struts2.interceptor;
|
||||
|
||||
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;
|
||||
|
||||
@@ -20,7 +20,7 @@ package org.apache.struts2.interceptor;
|
||||
|
||||
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;
|
||||
|
||||
@@ -20,7 +20,7 @@ package org.apache.struts2.interceptor;
|
||||
|
||||
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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@ package org.apache.struts2.interceptor;
|
||||
|
||||
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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@ package org.apache.struts2.interceptor;
|
||||
|
||||
import org.apache.struts2.TestConfigurationProvider;
|
||||
|
||||
import org.apache.struts2.Action;
|
||||
import org.apache.struts2.action.Action;
|
||||
import org.apache.struts2.ActionProxy;
|
||||
|
||||
/**
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -20,7 +20,7 @@ package org.apache.struts2.validator;
|
||||
|
||||
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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -21,7 +21,7 @@ package org.apache.struts2.views.jsp;
|
||||
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;
|
||||
|
||||
@@ -24,7 +24,7 @@ import java.util.List;
|
||||
|
||||
import org.apache.struts2.views.jsp.iterator.AppendIteratorTag;
|
||||
|
||||
import org.apache.struts2.Action;
|
||||
import org.apache.struts2.action.Action;
|
||||
import org.apache.struts2.ActionSupport;
|
||||
|
||||
/**
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -24,7 +24,7 @@ import java.util.List;
|
||||
|
||||
import org.apache.struts2.views.jsp.iterator.MergeIteratorTag;
|
||||
|
||||
import org.apache.struts2.Action;
|
||||
import org.apache.struts2.action.Action;
|
||||
import org.apache.struts2.ActionSupport;
|
||||
|
||||
/**
|
||||
|
||||
@@ -20,7 +20,7 @@ package org.apache.struts2.views.jsp;
|
||||
|
||||
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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -35,7 +35,7 @@ import org.apache.struts2.views.jsp.ui.StrutsBodyContent;
|
||||
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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -23,7 +23,7 @@ import java.util.List;
|
||||
|
||||
import org.apache.struts2.TestAction;
|
||||
|
||||
import org.apache.struts2.Action;
|
||||
import org.apache.struts2.action.Action;
|
||||
|
||||
public class LocaleTestAction extends TestAction implements Action {
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ import java.util.Map;
|
||||
|
||||
import org.apache.struts2.views.jsp.AbstractUITagTest;
|
||||
|
||||
import org.apache.struts2.Action;
|
||||
import org.apache.struts2.action.Action;
|
||||
import org.apache.struts2.ActionSupport;
|
||||
|
||||
/**
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ import jakarta.servlet.ServletContext;
|
||||
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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+2
-2
@@ -545,7 +545,7 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
|
||||
/**
|
||||
* 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 class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
|
||||
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;
|
||||
|
||||
+1
-1
@@ -67,7 +67,7 @@ public @interface Result {
|
||||
* @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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ import org.apache.struts2.convention.annotation.Action;
|
||||
* This is a test action.
|
||||
* </p>
|
||||
*/
|
||||
public class SingleActionNameAction2 implements org.apache.struts2.Action {
|
||||
public class SingleActionNameAction2 implements org.apache.struts2.action.Action {
|
||||
@Action("action345")
|
||||
public String execute() {
|
||||
return null;
|
||||
|
||||
+1
-1
@@ -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 {
|
||||
|
||||
+1
-1
@@ -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 {
|
||||
|
||||
+1
-1
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -25,7 +25,7 @@ import java.util.Set;
|
||||
|
||||
import org.apache.struts2.json.annotations.JSON;
|
||||
|
||||
import org.apache.struts2.Action;
|
||||
import org.apache.struts2.action.Action;
|
||||
import org.apache.struts2.ActionSupport;
|
||||
|
||||
/**
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user