mirror of
https://github.com/apache/struts.git
synced 2026-08-07 07:37:20 +00:00
WW-5459 Moves Action interface into org.apache.struts2.action package
This commit is contained in:
Lukasz Lenart
+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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ import jakarta.servlet.http.HttpServletResponse;
|
||||
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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -20,7 +20,7 @@ package org.apache.struts2.rest;
|
||||
|
||||
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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
*/
|
||||
package org.apache.struts2.spring;
|
||||
|
||||
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.ModelDrivenAction;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user