diff --git a/core/src/main/java/com/opensymphony/xwork2/Action.java b/core/src/main/java/com/opensymphony/xwork2/Action.java index 57d7678341..4fa03a7b3f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/Action.java +++ b/core/src/main/java/com/opensymphony/xwork2/Action.java @@ -21,8 +21,8 @@ /** * {@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 { } diff --git a/core/src/main/java/org/apache/struts2/ActionContext.java b/core/src/main/java/org/apache/struts2/ActionContext.java index 335c24e95f..0bd28253b3 100644 --- a/core/src/main/java/org/apache/struts2/ActionContext.java +++ b/core/src/main/java/org/apache/struts2/ActionContext.java @@ -20,6 +20,7 @@ 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; diff --git a/core/src/main/java/org/apache/struts2/ActionInvocation.java b/core/src/main/java/org/apache/struts2/ActionInvocation.java index 2a90a06b43..97acc6cb14 100644 --- a/core/src/main/java/org/apache/struts2/ActionInvocation.java +++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java @@ -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; diff --git a/core/src/main/java/org/apache/struts2/ActionSupport.java b/core/src/main/java/org/apache/struts2/ActionSupport.java index 04c513f3a2..894dc9ed4b 100644 --- a/core/src/main/java/org/apache/struts2/ActionSupport.java +++ b/core/src/main/java/org/apache/struts2/ActionSupport.java @@ -29,6 +29,7 @@ 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; 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/result/Result.java b/core/src/main/java/org/apache/struts2/result/Result.java index c30083d863..beb82b6965 100644 --- a/core/src/main/java/org/apache/struts2/result/Result.java +++ b/core/src/main/java/org/apache/struts2/result/Result.java @@ -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; diff --git a/core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationProviderOgnlAllowlistTest.java b/core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationProviderOgnlAllowlistTest.java index 6b31360a28..1c86c917ba 100644 --- a/core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationProviderOgnlAllowlistTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationProviderOgnlAllowlistTest.java @@ -67,7 +67,7 @@ public void allowlist() throws Exception { 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 void allowlist_1only() throws Exception { 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 void allowlist_2only() throws Exception { 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") );