This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch 7.0.x/merge-master-2024-11-01
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 91154f0ec886833251061a0158a15572cb0576ff
Merge: 9130e3165 b622e5d72
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Fri Nov 1 15:21:57 2024 +1100
Merge branch 'kusal-depr-apis-3.5' into 7.0.x/merge-master-2024-11-01
# Conflicts:
# core/src/main/java/com/opensymphony/xwork2/Action.java
# core/src/main/java/com/opensymphony/xwork2/ActionContext.java
#
core/src/main/java/com/opensymphony/xwork2/factory/DefaultInterceptorFactory.java
#
core/src/main/java/com/opensymphony/xwork2/interceptor/Interceptor.java
# jakarta/pom.xml
#
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java
#
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
.../main/java/com/opensymphony/xwork2/Action.java | 70 +--
.../com/opensymphony/xwork2/ActionContext.java | 471 +++++----------------
.../com/opensymphony/xwork2/ActionInvocation.java | 234 ++++------
.../xwork2/DefaultActionInvocation.java | 3 +
.../main/java/com/opensymphony/xwork2/Result.java | 51 +--
.../xwork2/factory/DefaultInterceptorFactory.java | 14 +-
.../xwork2/factory/DefaultResultFactory.java | 19 +-
.../xwork2/interceptor/ConditionalInterceptor.java | 44 +-
.../xwork2/interceptor/Interceptor.java | 237 ++---------
.../xwork2/interceptor/PreResultListener.java | 40 +-
.../xwork2/interceptor/WithLazyParams.java | 5 +-
.../xwork2 => org/apache/struts2}/Action.java | 2 +-
.../apache/struts2}/ActionContext.java | 28 +-
.../apache/struts2}/ActionInvocation.java | 9 +-
.../xwork2 => org/apache/struts2}/Result.java | 2 +-
.../struts2/factory/StrutsResultFactory.java | 38 +-
.../interceptor/ConditionalInterceptor.java | 4 +-
.../apache/struts2}/interceptor/Interceptor.java | 12 +-
.../struts2}/interceptor/PreResultListener.java | 10 +-
.../ConfigurationProviderOgnlAllowlistTest.java | 18 +-
.../apache/struts2/views/jsp/ActionTagTest.java | 6 +-
21 files changed, 448 insertions(+), 869 deletions(-)
diff --cc core/src/main/java/com/opensymphony/xwork2/ActionContext.java
index 629c65c80,c7864571f..73d885757
--- a/core/src/main/java/com/opensymphony/xwork2/ActionContext.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionContext.java
@@@ -24,14 -24,10 +24,10 @@@ import com.opensymphony.xwork2.util.Val
import org.apache.struts2.dispatcher.HttpParameters;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.PageContext;
- import java.io.Serializable;
- import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
diff --cc core/src/main/java/org/apache/struts2/ActionInvocation.java
index 472f23ea7,8b789f50d..1ad744b5e
--- a/core/src/main/java/org/apache/struts2/ActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java
@@@ -16,18 -16,21 +16,21 @@@
* specific language governing permissions and limitations
* under the License.
*/
- package com.opensymphony.xwork2;
+ package org.apache.struts2;
- import com.opensymphony.xwork2.interceptor.PreResultListener;
+ import com.opensymphony.xwork2.ActionChainResult;
+ import com.opensymphony.xwork2.ActionEventListener;
+ import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.util.ValueStack;
+ import org.apache.struts2.interceptor.PreResultListener;
/**
- * An {@link ActionInvocation} represents the execution state of an {@link
com.opensymphony.xwork2.Action}. It holds the Interceptors and the Action
instance.
+ * An {@link ActionInvocation} represents the execution state of an {@link
Action}. It holds the Interceptors and the Action instance.
* By repeated re-entrant execution of the <code>invoke()</code> method,
initially by the {@link ActionProxy}, then by the Interceptors, the
- * Interceptors are all executed, and then the {@link Action} and the {@link
com.opensymphony.xwork2.Result}.
+ * Interceptors are all executed, and then the {@link Action} and the {@link
Result}.
*
* @author Jason Carreira
- * @see com.opensymphony.xwork2.ActionProxy
+ * @see ActionProxy
*/
public interface ActionInvocation {
diff --cc core/src/main/java/org/apache/struts2/interceptor/Interceptor.java
index eb7f6850e,7eabb85a8..58beef284
--- a/core/src/main/java/org/apache/struts2/interceptor/Interceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/Interceptor.java
@@@ -27,7 -27,7 +27,7 @@@ import java.io.Serializable
*
* <p>
* An interceptor is a stateless class that follows the interceptor pattern,
as
- * found in {@link jakarta.servlet.Filter} and in AOP languages.
- * found in {@link javax.servlet.Filter} and in AOP languages.
++ * found in {@link jakarta.servlet.Filter} and in AOP languages.
* </p>
*
* <p>
@@@ -42,7 -42,7 +42,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 com.opensymphony.xwork2.Action#SUCCESS}), or it may choose
to do some processing before
++ * (such as {@link org.apache.struts2.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 -215,7 +215,7 @@@ public interface Interceptor extends Se
*
* @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
com.opensymphony.xwork2.Action#execute()}.
++ * @throws Exception any system-level error, as defined in {@link
org.apache.struts2.Action#execute()}.
*/
String intercept(ActionInvocation invocation) throws Exception;
diff --cc
core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java
index f9faa2377,a8e9f6250..69745b925
--- a/core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java
@@@ -22,7 -22,7 +22,7 @@@ import org.apache.struts2.ActionInvocat
/**
* PreResultListeners may be registered with an {@link ActionInvocation} to
get a callback after the
-- * {@link com.opensymphony.xwork2.Action} has been executed but before the
{@link com.opensymphony.xwork2.Result}
++ * {@link org.apache.struts2.Action} has been executed but before the {@link
org.apache.struts2.Result}
* is executed.
*
* @author Jason Carreira
@@@ -30,8 -30,8 +30,8 @@@
public interface PreResultListener {
/**
-- * This callback method will be called after the {@link
com.opensymphony.xwork2.Action} execution and
-- * before the {@link com.opensymphony.xwork2.Result} execution.
++ * This callback method will be called after the {@link
org.apache.struts2.Action} execution and
++ * before the {@link org.apache.struts2.Result} execution.
*
* @param invocation the action invocation
* @param resultCode the result code returned by the action (eg.
<code>success</code>).
