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

WW-5459 Move new Action class into action package

Browse Source
This commit is contained in:
Kusal Kithul-Godage
2024-11-03 10:49:36 +11:00
parent 2beac8eba4
commit b001c61f89
7 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/opensymphony/xwork2/Action.java
+2 -2
View File
@@ -21,8 +21,8 @@ package com.opensymphony.xwork2;
/**
* {@inheritDoc}
*
* @deprecated since 6.7.0, use {@link org.apache.struts2.Action} instead.
* @deprecated since 6.7.0, use {@link org.apache.struts2.action.Action} instead.
*/
@Deprecated
public interface Action extends org.apache.struts2.Action {
public interface Action extends org.apache.struts2.action.Action {
}
core/src/main/java/org/apache/struts2/ActionContext.java
+1
View File
@@ -20,6 +20,7 @@ package org.apache.struts2;
import com.opensymphony.xwork2.conversion.impl.ConversionData;
import com.opensymphony.xwork2.inject.Container;
import org.apache.struts2.action.Action;
import org.apache.struts2.dispatcher.HttpParameters;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.util.ValueStack;
core/src/main/java/org/apache/struts2/ActionInvocation.java
+1
View File
@@ -19,6 +19,7 @@
package org.apache.struts2;
import com.opensymphony.xwork2.ActionChainResult;
import org.apache.struts2.action.Action;
import org.apache.struts2.interceptor.PreResultListener;
import org.apache.struts2.result.Result;
import org.apache.struts2.util.ValueStack;
core/src/main/java/org/apache/struts2/ActionSupport.java
+1
View File
@@ -29,6 +29,7 @@ import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.action.Action;
import org.apache.struts2.interceptor.ValidationAware;
import java.io.Serializable;
core/src/main/java/org/apache/struts2/Action.java → core/src/main/java/org/apache/struts2/action/Action.java
+1 -1
View File
@@ -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/result/Result.java
+1 -1
View File
@@ -18,8 +18,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;
core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
+3 -3
View File
@@ -67,7 +67,7 @@ public class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase
Class.forName("org.apache.struts2.interceptor.Interceptor"),
Class.forName("org.apache.struts2.interceptor.ConditionalInterceptor"),
Class.forName("org.apache.struts2.result.Result"),
Class.forName("org.apache.struts2.Action"),
Class.forName("org.apache.struts2.action.Action"),
Class.forName("org.apache.struts2.Validateable"),
Class.forName("org.apache.struts2.interceptor.ValidationAware")
);
@@ -99,7 +99,7 @@ public class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase
Class.forName("org.apache.struts2.interceptor.Interceptor"),
Class.forName("org.apache.struts2.interceptor.ConditionalInterceptor"),
Class.forName("org.apache.struts2.result.Result"),
Class.forName("org.apache.struts2.Action"),
Class.forName("org.apache.struts2.action.Action"),
Class.forName("org.apache.struts2.Validateable"),
Class.forName("org.apache.struts2.interceptor.ValidationAware")
);
@@ -130,7 +130,7 @@ public class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase
Class.forName("org.apache.struts2.interceptor.Interceptor"),
Class.forName("org.apache.struts2.interceptor.ConditionalInterceptor"),
Class.forName("org.apache.struts2.result.Result"),
Class.forName("org.apache.struts2.Action"),
Class.forName("org.apache.struts2.action.Action"),
Class.forName("org.apache.struts2.Validateable"),
Class.forName("org.apache.struts2.interceptor.ValidationAware")
);