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

WW-5141

Browse Source 
- initial attempt to update references javax>jakarta and get things to compile
This commit is contained in:
jdyer1
2023-10-18 13:06:44 -05:00
committed by Lukasz Lenart
parent f4501846c6
commit 2202e5fbbb
646 changed files with 1604 additions and 1575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/showcase/pom.xml
+2 -2
View File
@@ -99,8 +99,8 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
apps/showcase/src/main/java/org/apache/struts2/showcase/async/AsyncFilter.java
+7 -7
View File
@@ -18,13 +18,13 @@
*/
package org.apache.struts2.showcase.async;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
/**
apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatSessionListener.java
+3 -3
View File
@@ -25,9 +25,9 @@ import org.apache.logging.log4j.LogManager;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSessionEvent;
import jakarta.servlet.http.HttpSessionListener;
public class ChatSessionListener implements HttpSessionListener {
apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java
+2 -2
View File
@@ -24,8 +24,8 @@ import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.views.freemarker.FreemarkerManager;
import org.apache.struts2.views.freemarker.ScopesHashModel;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* <p>
apps/showcase/src/main/java/org/apache/struts2/showcase/servlet/TestServlet.java
+4 -4
View File
@@ -20,10 +20,10 @@
*/
package org.apache.struts2.showcase.servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
public class TestServlet extends HttpServlet {
apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
+1 -1
View File
@@ -24,7 +24,7 @@ import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import org.apache.struts2.action.ServletContextAware;
import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java
+7 -7
View File
@@ -30,13 +30,13 @@ import org.apache.struts2.interceptor.validation.SkipValidation;
import org.hibernate.validator.constraints.ScriptAssert;
import org.hibernate.validator.constraints.URL;
import javax.validation.constraints.Email;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
import java.util.Date;
// <!-- START SNIPPET: beanValidationExample -->
apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java
+1 -1
View File
@@ -22,7 +22,7 @@ package org.apache.struts2.showcase.xslt;
import com.opensymphony.xwork2.ActionSupport;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import org.apache.struts2.action.ServletRequestAware;
bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/BundlesAction.java
+1 -1
View File
@@ -32,7 +32,7 @@ import org.apache.struts2.action.ServletContextAware;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
bundles/pom.xml
+3 -3
View File
@@ -51,9 +51,9 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
core/pom.xml
+4 -4
View File
@@ -190,14 +190,14 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<scope>provided</scope>
</dependency>
core/src/main/java/com/opensymphony/xwork2/ActionContext.java
+4 -4
View File
@@ -26,10 +26,10 @@ import org.apache.struts2.StrutsStatics;
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;
core/src/main/java/com/opensymphony/xwork2/config/ServletContextAwareConfigurationProvider.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package com.opensymphony.xwork2.config;
import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;
/**
* Dedicated interface to allow inject {@link ServletContext} and perform initialisation based in it
core/src/main/java/org/apache/struts2/RequestUtils.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.util.Date;
import java.util.Locale;
core/src/main/java/org/apache/struts2/ServletActionContext.java
+4 -4
View File
@@ -22,10 +22,10 @@ import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.ValueStack;
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;
/**
* Web-specific context information for actions. This class subclasses <tt>ActionContext</tt> which
core/src/main/java/org/apache/struts2/StrutsStatics.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2;
import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;
/**
* <p>
core/src/main/java/org/apache/struts2/action/CspReportAction.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.struts2.action;
import com.opensymphony.xwork2.ActionSupport;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.io.IOException;
core/src/main/java/org/apache/struts2/action/ServletContextAware.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.action;
import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;
/**
* For components that have a dependence on the Servlet context.
core/src/main/java/org/apache/struts2/action/ServletRequestAware.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.action;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
/**
* All Actions that want to have access to the servlet request object must implement this interface.
core/src/main/java/org/apache/struts2/action/ServletResponseAware.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.action;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
/**
* All Actions that want to have access to the servlet response object must implement this interface.
core/src/main/java/org/apache/struts2/components/ActionComponent.java
+3 -3
View File
@@ -38,9 +38,9 @@ import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.jsp.PageContext;
import java.io.IOException;
import java.io.Writer;
import java.util.Map;
core/src/main/java/org/apache/struts2/components/ActionError.java
+2 -2
View File
@@ -23,8 +23,8 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Collection;
import java.util.List;
core/src/main/java/org/apache/struts2/components/ActionMessage.java
+2 -2
View File
@@ -23,8 +23,8 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Collection;
import java.util.List;
core/src/main/java/org/apache/struts2/components/Anchor.java
+2 -2
View File
@@ -28,8 +28,8 @@ import org.apache.struts2.StrutsConstants;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.StringWriter;
import java.io.Writer;
import java.util.LinkedHashMap;
core/src/main/java/org/apache/struts2/components/Checkbox.java
+2 -2
View File
@@ -24,8 +24,8 @@ import org.apache.struts2.StrutsConstants;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* <!-- START SNIPPET: javadoc -->
core/src/main/java/org/apache/struts2/components/CheckboxList.java
+2 -2
View File
@@ -18,8 +18,8 @@
*/
package org.apache.struts2.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.views.annotations.StrutsTag;
core/src/main/java/org/apache/struts2/components/ClosingUIBean.java
+2 -2
View File
@@ -23,8 +23,8 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.Writer;
/**
core/src/main/java/org/apache/struts2/components/ComboBox.java
+2 -2
View File
@@ -23,8 +23,8 @@ import org.apache.struts2.util.MakeIterator;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
core/src/main/java/org/apache/struts2/components/Component.java
+2 -2
View File
@@ -38,8 +38,8 @@ import org.apache.struts2.util.FastByteArrayOutputStream;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.views.util.UrlHelper;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
core/src/main/java/org/apache/struts2/components/ComponentUrlProvider.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.struts2.components;
import com.opensymphony.xwork2.util.ValueStack;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
core/src/main/java/org/apache/struts2/components/DateTextField.java
+2 -2
View File
@@ -18,8 +18,8 @@
*/
package org.apache.struts2.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
core/src/main/java/org/apache/struts2/components/Debug.java
+2 -2
View File
@@ -22,8 +22,8 @@ import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import java.io.Writer;
import java.util.Iterator;
import java.util.Map;
core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
+2 -2
View File
@@ -21,8 +21,8 @@ package org.apache.struts2.components;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
core/src/main/java/org/apache/struts2/components/DoubleSelect.java
+2 -2
View File
@@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack;
import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.views.annotations.StrutsTag;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* <!-- START SNIPPET: javadoc -->
core/src/main/java/org/apache/struts2/components/FieldError.java
+2 -2
View File
@@ -23,8 +23,8 @@ import org.apache.struts2.components.Param.UnnamedParametric;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
core/src/main/java/org/apache/struts2/components/File.java
+2 -2
View File
@@ -24,8 +24,8 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* <!-- START SNIPPET: javadoc -->
core/src/main/java/org/apache/struts2/components/Form.java
+2 -2
View File
@@ -38,8 +38,8 @@ import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
core/src/main/java/org/apache/struts2/components/FormButton.java
+2 -2
View File
@@ -24,8 +24,8 @@ import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* FormButton.
core/src/main/java/org/apache/struts2/components/GenericUIBean.java
+2 -2
View File
@@ -18,8 +18,8 @@
*/
package org.apache.struts2.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.util.ContainUtil;
core/src/main/java/org/apache/struts2/components/Head.java
+2 -2
View File
@@ -23,8 +23,8 @@ import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.views.annotations.StrutsTag;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* <!-- START SNIPPET: javadoc -->
core/src/main/java/org/apache/struts2/components/Hidden.java
+2 -2
View File
@@ -18,8 +18,8 @@
*/
package org.apache.struts2.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.views.annotations.StrutsTag;
core/src/main/java/org/apache/struts2/components/Include.java
+8 -8
View File
@@ -30,14 +30,14 @@ import org.apache.struts2.util.FastByteArrayOutputStream;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest;
import javax.servlet.WriteListener;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.WriteListener;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponseWrapper;
import java.io.*;
import java.net.URLEncoder;
core/src/main/java/org/apache/struts2/components/InputTransferSelect.java
+2 -2
View File
@@ -25,8 +25,8 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.LinkedHashMap;
import java.util.Map;
core/src/main/java/org/apache/struts2/components/Label.java
+2 -2
View File
@@ -18,8 +18,8 @@
*/
package org.apache.struts2.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
core/src/main/java/org/apache/struts2/components/Link.java
+2 -2
View File
@@ -23,8 +23,8 @@ import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* <p>
core/src/main/java/org/apache/struts2/components/ListUIBean.java
+2 -2
View File
@@ -24,8 +24,8 @@ import org.apache.struts2.util.ContainUtil;
import org.apache.struts2.util.MakeIterator;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.lang.reflect.Array;
import java.util.Collection;
import java.util.Collections;
core/src/main/java/org/apache/struts2/components/OptGroup.java
+2 -2
View File
@@ -22,8 +22,8 @@ import java.io.Writer;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java
+2 -2
View File
@@ -25,8 +25,8 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.LinkedHashMap;
import java.util.Map;
core/src/main/java/org/apache/struts2/components/Password.java
+2 -2
View File
@@ -18,8 +18,8 @@
*/
package org.apache.struts2.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
core/src/main/java/org/apache/struts2/components/Radio.java
+2 -2
View File
@@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* <!-- START SNIPPET: javadoc -->
core/src/main/java/org/apache/struts2/components/Reset.java
+2 -2
View File
@@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* <!-- START SNIPPET: javadoc -->
core/src/main/java/org/apache/struts2/components/Script.java
+2 -2
View File
@@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
core/src/main/java/org/apache/struts2/components/Select.java
+2 -2
View File
@@ -18,8 +18,8 @@
*/
package org.apache.struts2.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
core/src/main/java/org/apache/struts2/components/Submit.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.struts2.components;
import java.io.Writer;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import com.opensymphony.xwork2.inject.Inject;
import org.apache.commons.lang3.BooleanUtils;
core/src/main/java/org/apache/struts2/components/TextArea.java
+2 -2
View File
@@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* <!-- START SNIPPET: javadoc -->
core/src/main/java/org/apache/struts2/components/TextField.java
+2 -2
View File
@@ -22,8 +22,8 @@ import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* <!-- START SNIPPET: javadoc -->
core/src/main/java/org/apache/struts2/components/Token.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.struts2.components;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.util.TokenHelper;
core/src/main/java/org/apache/struts2/components/UIBean.java
+2 -2
View File
@@ -38,8 +38,8 @@ import org.apache.struts2.util.TextProviderHelper;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.views.util.ContextUtil;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.Writer;
import java.util.HashMap;
import java.util.LinkedHashMap;
core/src/main/java/org/apache/struts2/components/URL.java
+2 -2
View File
@@ -24,8 +24,8 @@ import org.apache.struts2.StrutsConstants;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.Writer;
/**
core/src/main/java/org/apache/struts2/components/UpDownSelect.java
+2 -2
View File
@@ -25,8 +25,8 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.LinkedHashMap;
import java.util.Map;
core/src/main/java/org/apache/struts2/components/UrlProvider.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.struts2.components;
import com.opensymphony.xwork2.util.ValueStack;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;
import java.io.*;
import java.util.Map;
import java.util.Properties;
core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
+3 -3
View File
@@ -31,9 +31,9 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.views.freemarker.FreemarkerManager;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.Writer;
import java.util.List;
core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
+2 -2
View File
@@ -27,8 +27,8 @@ import org.apache.struts2.StrutsConstants;
import org.apache.struts2.components.Include;
import org.apache.struts2.components.UIBean;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.jsp.PageContext;
import java.util.List;
/**
core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
+1 -1
View File
@@ -28,7 +28,7 @@ import com.opensymphony.xwork2.util.location.LocatableProperties;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java
+1 -1
View File
@@ -24,7 +24,7 @@ import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;
/**
* A simple implementation of the {@link java.util.Map} interface to handle a collection of attributes and
core/src/main/java/org/apache/struts2/dispatcher/AttributeMap.java
+1 -1
View File
@@ -20,7 +20,7 @@ package org.apache.struts2.dispatcher;
import org.apache.struts2.StrutsStatics;
import javax.servlet.jsp.PageContext;
import jakarta.servlet.jsp.PageContext;
import java.util.AbstractMap;
import java.util.Collection;
import java.util.Collections;
core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.dispatcher;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import org.apache.struts2.ServletActionContext;
core/src/main/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandler.java
+3 -3
View File
@@ -29,9 +29,9 @@ import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsException;
import org.apache.struts2.views.freemarker.FreemarkerManager;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
+2 -2
View File
@@ -26,8 +26,8 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+4 -4
View File
@@ -70,10 +70,10 @@ import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
import org.apache.struts2.util.ObjectFactoryDestroyable;
import org.apache.struts2.util.fs.JBossFileManager;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.util.Collection;
core/src/main/java/org/apache/struts2/dispatcher/DispatcherErrorHandler.java
+3 -3
View File
@@ -18,9 +18,9 @@
*/
package org.apache.struts2.dispatcher;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* Implementation of this interface is used to handle internal errors or missing resources.
core/src/main/java/org/apache/struts2/dispatcher/ExecuteOperations.java
+3 -3
View File
@@ -21,9 +21,9 @@ package org.apache.struts2.dispatcher;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.RequestUtils;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
core/src/main/java/org/apache/struts2/dispatcher/HostConfig.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.dispatcher;
import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;
import java.util.Iterator;
/**
core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java
+1 -1
View File
@@ -20,7 +20,7 @@ package org.apache.struts2.dispatcher;
import com.opensymphony.xwork2.config.ConfigurationManager;
import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;
import java.util.HashMap;
import java.util.Map;
core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java
+3 -3
View File
@@ -29,9 +29,9 @@ import org.apache.struts2.StrutsException;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.dispatcher;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.AbstractMap;
import java.util.Enumeration;
core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
+2 -2
View File
@@ -18,8 +18,8 @@
*/
package org.apache.struts2.dispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
import java.io.Serializable;
import java.util.AbstractMap;
import java.util.Collections;
core/src/main/java/org/apache/struts2/dispatcher/StaticContentLoader.java
+2 -2
View File
@@ -24,8 +24,8 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.config.StrutsBeanSelectionProvider;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
+2 -2
View File
@@ -21,8 +21,8 @@ package org.apache.struts2.dispatcher;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.ValueStack;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
import static org.apache.commons.lang3.BooleanUtils.isTrue;
core/src/main/java/org/apache/struts2/dispatcher/filter/FilterHostConfig.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.struts2.dispatcher.filter;
import org.apache.struts2.util.MakeIterator;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletContext;
import java.util.Iterator;
import org.apache.struts2.dispatcher.HostConfig;
core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsExecuteFilter.java
+8 -8
View File
@@ -25,14 +25,14 @@ import org.apache.struts2.dispatcher.InitOperations;
import org.apache.struts2.dispatcher.PrepareOperations;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java
+8 -8
View File
@@ -28,14 +28,14 @@ import org.apache.struts2.dispatcher.InitOperations;
import org.apache.struts2.dispatcher.PrepareOperations;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.regex.Pattern;
core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
+8 -8
View File
@@ -23,14 +23,14 @@ import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.InitOperations;
import org.apache.struts2.dispatcher.PrepareOperations;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.regex.Pattern;
core/src/main/java/org/apache/struts2/dispatcher/listener/ListenerHostConfig.java
+1 -1
View File
@@ -20,7 +20,7 @@ package org.apache.struts2.dispatcher.listener;
import org.apache.struts2.dispatcher.HostConfig;
import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;
import java.util.Iterator;
import java.util.Collections;
core/src/main/java/org/apache/struts2/dispatcher/listener/StrutsListener.java
+2 -2
View File
@@ -23,8 +23,8 @@ import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.InitOperations;
import org.apache.struts2.dispatcher.PrepareOperations;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
/**
* Servlet listener for Struts. The preferred way to use Struts is as a filter via the
core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java
+1 -1
View File
@@ -20,7 +20,7 @@ package org.apache.struts2.dispatcher.mapper;
import com.opensymphony.xwork2.config.ConfigurationManager;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
/**
* <!-- START SNIPPET: javadoc -->
core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
+1 -1
View File
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.LinkedList;
import java.util.List;
core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+1 -1
View File
@@ -33,7 +33,7 @@ import org.apache.struts2.RequestUtils;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.util.PrefixTrie;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java
+1 -1
View File
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts2.RequestUtils;
import org.apache.struts2.StrutsConstants;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
+1 -1
View File
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.url.UrlDecoder;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.StringTokenizer;
core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts2.RequestUtils;
import org.apache.struts2.url.UrlDecoder;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
import java.util.StringTokenizer;
core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.dispatcher.LocalizedMessage;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
+1 -1
View File
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.dispatcher.LocalizedMessage;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
+1 -1
View File
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.dispatcher.LocalizedMessage;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.IOException;
core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java
+1 -1
View File
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.dispatcher.multipart;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import org.apache.struts2.dispatcher.LocalizedMessage;
core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts2.dispatcher.LocalizedMessage;
import org.apache.struts2.dispatcher.StrutsRequestWrapper;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.*;
core/src/main/java/org/apache/struts2/dispatcher/servlet/ServletHostConfig.java
+2 -2
View File
@@ -20,8 +20,8 @@ package org.apache.struts2.dispatcher.servlet;
import org.apache.struts2.util.MakeIterator;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import jakarta.servlet.ServletConfig;
import jakarta.servlet.ServletContext;
import java.util.Iterator;
import org.apache.struts2.dispatcher.HostConfig;
core/src/main/java/org/apache/struts2/dispatcher/servlet/StrutsServlet.java
+5 -5
View File
@@ -24,11 +24,11 @@ import org.apache.struts2.dispatcher.InitOperations;
import org.apache.struts2.dispatcher.PrepareOperations;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
core/src/main/java/org/apache/struts2/interceptor/CoepInterceptor.java
+2 -2
View File
@@ -25,8 +25,8 @@ import com.opensymphony.xwork2.util.TextParseUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.HashSet;
import java.util.Set;

Some files were not shown because too many files have changed in this diff Show More