diff --git a/api/src/main/java/jakarta/servlet/AsyncContext.java b/api/src/main/java/jakarta/servlet/AsyncContext.java index 2f96200..68b7669 100644 --- a/api/src/main/java/jakarta/servlet/AsyncContext.java +++ b/api/src/main/java/jakarta/servlet/AsyncContext.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; /** * Class representing the execution context for an asynchronous operation that was initiated on a ServletRequest. @@ -44,37 +44,37 @@ public interface AsyncContext { * The name of the request attribute under which the original request URI is made available to the target of a * {@link #dispatch(String)} or {@link #dispatch(ServletContext,String)} */ - static final String ASYNC_REQUEST_URI = "jakarta.servlet.async.request_uri"; + static final String ASYNC_REQUEST_URI = "javax.servlet.async.request_uri"; /** * The name of the request attribute under which the original context path is made available to the target of a * {@link #dispatch(String)} or {@link #dispatch(ServletContext,String)} */ - static final String ASYNC_CONTEXT_PATH = "jakarta.servlet.async.context_path"; + static final String ASYNC_CONTEXT_PATH = "javax.servlet.async.context_path"; /** - * The name of the request attribute under which the original {@link jakarta.servlet.http.HttpServletMapping} is made + * The name of the request attribute under which the original {@link javax.servlet.http.HttpServletMapping} is made * available to the target of a {@link #dispatch(String)} or {@link #dispatch(ServletContext,String)} */ - static final String ASYNC_MAPPING = "jakarta.servlet.async.mapping"; + static final String ASYNC_MAPPING = "javax.servlet.async.mapping"; /** * The name of the request attribute under which the original path info is made available to the target of a * {@link #dispatch(String)} or {@link #dispatch(ServletContext,String)} */ - static final String ASYNC_PATH_INFO = "jakarta.servlet.async.path_info"; + static final String ASYNC_PATH_INFO = "javax.servlet.async.path_info"; /** * The name of the request attribute under which the original servlet path is made available to the target of a * {@link #dispatch(String)} or {@link #dispatch(ServletContext,String)} */ - static final String ASYNC_SERVLET_PATH = "jakarta.servlet.async.servlet_path"; + static final String ASYNC_SERVLET_PATH = "javax.servlet.async.servlet_path"; /** * The name of the request attribute under which the original query string is made available to the target of a * {@link #dispatch(String)} or {@link #dispatch(ServletContext,String)} */ - static final String ASYNC_QUERY_STRING = "jakarta.servlet.async.query_string"; + static final String ASYNC_QUERY_STRING = "javax.servlet.async.query_string"; /** * Gets the request that was used to initialize this AsyncContext by calling {@link ServletRequest#startAsync()} or @@ -119,7 +119,7 @@ public interface AsyncContext { *

* If the asynchronous cycle was started with {@link ServletRequest#startAsync(ServletRequest, ServletResponse)}, and * the request passed is an instance of HttpServletRequest, then the dispatch is to the URI returned by - * {@link jakarta.servlet.http.HttpServletRequest#getRequestURI}. Otherwise, the dispatch is to the URI of the request + * {@link javax.servlet.http.HttpServletRequest#getRequestURI}. Otherwise, the dispatch is to the URI of the request * when it was last dispatched by the container. * *

diff --git a/api/src/main/java/jakarta/servlet/AsyncEvent.java b/api/src/main/java/jakarta/servlet/AsyncEvent.java index 56fdd83..881c79f 100644 --- a/api/src/main/java/jakarta/servlet/AsyncEvent.java +++ b/api/src/main/java/jakarta/servlet/AsyncEvent.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; /** * Event that gets fired when the asynchronous operation initiated on a ServletRequest (via a call to diff --git a/api/src/main/java/jakarta/servlet/AsyncListener.java b/api/src/main/java/jakarta/servlet/AsyncListener.java index 2651cf6..f5b7144 100644 --- a/api/src/main/java/jakarta/servlet/AsyncListener.java +++ b/api/src/main/java/jakarta/servlet/AsyncListener.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; import java.io.IOException; import java.util.EventListener; diff --git a/api/src/main/java/jakarta/servlet/DispatcherType.java b/api/src/main/java/jakarta/servlet/DispatcherType.java index dc17580..ffccc68 100644 --- a/api/src/main/java/jakarta/servlet/DispatcherType.java +++ b/api/src/main/java/jakarta/servlet/DispatcherType.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; /** * Enumeration of filter dispatcher types. diff --git a/api/src/main/java/jakarta/servlet/Filter.java b/api/src/main/java/jakarta/servlet/Filter.java index 2757374..5ff3522 100644 --- a/api/src/main/java/jakarta/servlet/Filter.java +++ b/api/src/main/java/jakarta/servlet/Filter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.io.IOException; diff --git a/api/src/main/java/jakarta/servlet/FilterChain.java b/api/src/main/java/jakarta/servlet/FilterChain.java index a5c1caf..f4559ec 100644 --- a/api/src/main/java/jakarta/servlet/FilterChain.java +++ b/api/src/main/java/jakarta/servlet/FilterChain.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.io.IOException; diff --git a/api/src/main/java/jakarta/servlet/FilterConfig.java b/api/src/main/java/jakarta/servlet/FilterConfig.java index 7187ecd..a816281 100644 --- a/api/src/main/java/jakarta/servlet/FilterConfig.java +++ b/api/src/main/java/jakarta/servlet/FilterConfig.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.util.Enumeration; diff --git a/api/src/main/java/jakarta/servlet/FilterRegistration.java b/api/src/main/java/jakarta/servlet/FilterRegistration.java index 69f6ddc..105167b 100644 --- a/api/src/main/java/jakarta/servlet/FilterRegistration.java +++ b/api/src/main/java/jakarta/servlet/FilterRegistration.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; import java.util.*; diff --git a/api/src/main/java/jakarta/servlet/GenericFilter.java b/api/src/main/java/jakarta/servlet/GenericFilter.java index b8e11b0..e3fcf9d 100644 --- a/api/src/main/java/jakarta/servlet/GenericFilter.java +++ b/api/src/main/java/jakarta/servlet/GenericFilter.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; import java.util.Enumeration; import java.util.ResourceBundle; @@ -24,7 +24,7 @@ import java.util.ResourceBundle; * *

* Defines a generic, protocol-independent filter. To write an HTTP filter for use on the Web, extend - * {@link jakarta.servlet.http.HttpFilter} instead. + * {@link javax.servlet.http.HttpFilter} instead. *

* *

@@ -46,7 +46,7 @@ import java.util.ResourceBundle; public abstract class GenericFilter implements Filter, FilterConfig, java.io.Serializable { private static final long serialVersionUID = 4060116231031076581L; - private static final String LSTRING_FILE = "jakarta.servlet.LocalStrings"; + private static final String LSTRING_FILE = "javax.servlet.LocalStrings"; private static final ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE); private transient FilterConfig config; diff --git a/api/src/main/java/jakarta/servlet/GenericServlet.java b/api/src/main/java/jakarta/servlet/GenericServlet.java index eb3b42a..373c6ad 100644 --- a/api/src/main/java/jakarta/servlet/GenericServlet.java +++ b/api/src/main/java/jakarta/servlet/GenericServlet.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.io.IOException; import java.util.Enumeration; @@ -25,7 +25,7 @@ import java.util.ResourceBundle; /** * * Defines a generic, protocol-independent servlet. To write an HTTP servlet for use on the Web, extend - * {@link jakarta.servlet.http.HttpServlet} instead. + * {@link javax.servlet.http.HttpServlet} instead. * *

* GenericServlet implements the Servlet and ServletConfig interfaces. @@ -47,7 +47,7 @@ import java.util.ResourceBundle; public abstract class GenericServlet implements Servlet, ServletConfig, java.io.Serializable { private static final long serialVersionUID = -8592279577370996712L; - private static final String LSTRING_FILE = "jakarta.servlet.LocalStrings"; + private static final String LSTRING_FILE = "javax.servlet.LocalStrings"; private static ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE); private transient ServletConfig config; diff --git a/api/src/main/java/jakarta/servlet/HttpConstraintElement.java b/api/src/main/java/jakarta/servlet/HttpConstraintElement.java index fd27b33..76c2dc3 100644 --- a/api/src/main/java/jakarta/servlet/HttpConstraintElement.java +++ b/api/src/main/java/jakarta/servlet/HttpConstraintElement.java @@ -15,11 +15,11 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; -import jakarta.servlet.annotation.HttpConstraint; -import jakarta.servlet.annotation.ServletSecurity.EmptyRoleSemantic; -import jakarta.servlet.annotation.ServletSecurity.TransportGuarantee; +import javax.servlet.annotation.HttpConstraint; +import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic; +import javax.servlet.annotation.ServletSecurity.TransportGuarantee; /** * Java Class representation of an {@link HttpConstraint} annotation value. diff --git a/api/src/main/java/jakarta/servlet/HttpMethodConstraintElement.java b/api/src/main/java/jakarta/servlet/HttpMethodConstraintElement.java index 46ce1b0..9f43120 100644 --- a/api/src/main/java/jakarta/servlet/HttpMethodConstraintElement.java +++ b/api/src/main/java/jakarta/servlet/HttpMethodConstraintElement.java @@ -15,9 +15,9 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; -import jakarta.servlet.annotation.HttpMethodConstraint; +import javax.servlet.annotation.HttpMethodConstraint; /** * Java Class represntation of an {@link HttpMethodConstraint} annotation value. diff --git a/api/src/main/java/jakarta/servlet/MultipartConfigElement.java b/api/src/main/java/jakarta/servlet/MultipartConfigElement.java index 91cf672..d53bd67 100644 --- a/api/src/main/java/jakarta/servlet/MultipartConfigElement.java +++ b/api/src/main/java/jakarta/servlet/MultipartConfigElement.java @@ -15,9 +15,9 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; -import jakarta.servlet.annotation.MultipartConfig; +import javax.servlet.annotation.MultipartConfig; /** * Java Class represntation of an {@link MultipartConfig} annotation value. diff --git a/api/src/main/java/jakarta/servlet/ReadListener.java b/api/src/main/java/jakarta/servlet/ReadListener.java index 758be6c..c818d3a 100644 --- a/api/src/main/java/jakarta/servlet/ReadListener.java +++ b/api/src/main/java/jakarta/servlet/ReadListener.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; import java.io.IOException; import java.util.EventListener; @@ -33,7 +33,7 @@ public interface ReadListener extends EventListener { /** * When an instance of the ReadListener is registered with a {@link ServletInputStream}, this method will * be invoked by the container the first time when it is possible to read data. Subsequently the container will invoke - * this method if and only if the {@link jakarta.servlet.ServletInputStream#isReady()} method has been called and has + * this method if and only if the {@link javax.servlet.ServletInputStream#isReady()} method has been called and has * returned a value of false and data has subsequently become available to read. * * @throws IOException if an I/O related error has occurred during processing diff --git a/api/src/main/java/jakarta/servlet/Registration.java b/api/src/main/java/jakarta/servlet/Registration.java index eae871a..f399ad5 100644 --- a/api/src/main/java/jakarta/servlet/Registration.java +++ b/api/src/main/java/jakarta/servlet/Registration.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; import java.util.Map; import java.util.Set; diff --git a/api/src/main/java/jakarta/servlet/RequestDispatcher.java b/api/src/main/java/jakarta/servlet/RequestDispatcher.java index 53b9851..04b29f9 100644 --- a/api/src/main/java/jakarta/servlet/RequestDispatcher.java +++ b/api/src/main/java/jakarta/servlet/RequestDispatcher.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.io.IOException; @@ -41,107 +41,107 @@ public interface RequestDispatcher { * The name of the request attribute under which the original request URI is made available to the target of a * {@link #forward(ServletRequest,ServletResponse) forward} */ - static final String FORWARD_REQUEST_URI = "jakarta.servlet.forward.request_uri"; + static final String FORWARD_REQUEST_URI = "javax.servlet.forward.request_uri"; /** * The name of the request attribute under which the original context path is made available to the target of a * {@link #forward(ServletRequest,ServletResponse) forward} */ - static final String FORWARD_CONTEXT_PATH = "jakarta.servlet.forward.context_path"; + static final String FORWARD_CONTEXT_PATH = "javax.servlet.forward.context_path"; /** - * The name of the request attribute under which the original {@link jakarta.servlet.http.HttpServletMapping} is made + * The name of the request attribute under which the original {@link javax.servlet.http.HttpServletMapping} is made * available to the target of a {@link #forward(ServletRequest,ServletResponse) forward} * * @since 4.0 */ - static final String FORWARD_MAPPING = "jakarta.servlet.forward.mapping"; + static final String FORWARD_MAPPING = "javax.servlet.forward.mapping"; /** * The name of the request attribute under which the original path info is made available to the target of a * {@link #forward(ServletRequest,ServletResponse) forward} */ - static final String FORWARD_PATH_INFO = "jakarta.servlet.forward.path_info"; + static final String FORWARD_PATH_INFO = "javax.servlet.forward.path_info"; /** * The name of the request attribute under which the original servlet path is made available to the target of a * {@link #forward(ServletRequest,ServletResponse) forward} */ - static final String FORWARD_SERVLET_PATH = "jakarta.servlet.forward.servlet_path"; + static final String FORWARD_SERVLET_PATH = "javax.servlet.forward.servlet_path"; /** * The name of the request attribute under which the original query string is made available to the target of a * {@link #forward(ServletRequest,ServletResponse) forward} */ - static final String FORWARD_QUERY_STRING = "jakarta.servlet.forward.query_string"; + static final String FORWARD_QUERY_STRING = "javax.servlet.forward.query_string"; /** * The name of the request attribute under which the request URI of the target of an * {@link #include(ServletRequest,ServletResponse) include} is stored */ - static final String INCLUDE_REQUEST_URI = "jakarta.servlet.include.request_uri"; + static final String INCLUDE_REQUEST_URI = "javax.servlet.include.request_uri"; /** * The name of the request attribute under which the context path of the target of an * {@link #include(ServletRequest,ServletResponse) include} is stored */ - static final String INCLUDE_CONTEXT_PATH = "jakarta.servlet.include.context_path"; + static final String INCLUDE_CONTEXT_PATH = "javax.servlet.include.context_path"; /** * The name of the request attribute under which the path info of the target of an * {@link #include(ServletRequest,ServletResponse) include} is stored */ - static final String INCLUDE_PATH_INFO = "jakarta.servlet.include.path_info"; + static final String INCLUDE_PATH_INFO = "javax.servlet.include.path_info"; /** - * The name of the request attribute under which the {@link jakarta.servlet.http.HttpServletMapping} of the target of an + * The name of the request attribute under which the {@link javax.servlet.http.HttpServletMapping} of the target of an * {@link #include(ServletRequest,ServletResponse) include} is stored */ - static final String INCLUDE_MAPPING = "jakarta.servlet.include.mapping"; + static final String INCLUDE_MAPPING = "javax.servlet.include.mapping"; /** * The name of the request attribute under which the servlet path of the target of an * {@link #include(ServletRequest,ServletResponse) include} is stored */ - static final String INCLUDE_SERVLET_PATH = "jakarta.servlet.include.servlet_path"; + static final String INCLUDE_SERVLET_PATH = "javax.servlet.include.servlet_path"; /** * The name of the request attribute under which the query string of the target of an * {@link #include(ServletRequest,ServletResponse) include} is stored */ - static final String INCLUDE_QUERY_STRING = "jakarta.servlet.include.query_string"; + static final String INCLUDE_QUERY_STRING = "javax.servlet.include.query_string"; /** * The name of the request attribute under which the exception object is propagated during an error dispatch */ - public static final String ERROR_EXCEPTION = "jakarta.servlet.error.exception"; + public static final String ERROR_EXCEPTION = "javax.servlet.error.exception"; /** * The name of the request attribute under which the type of the exception object is propagated during an error dispatch */ - public static final String ERROR_EXCEPTION_TYPE = "jakarta.servlet.error.exception_type"; + public static final String ERROR_EXCEPTION_TYPE = "javax.servlet.error.exception_type"; /** * The name of the request attribute under which the exception message is propagated during an error dispatch */ - public static final String ERROR_MESSAGE = "jakarta.servlet.error.message"; + public static final String ERROR_MESSAGE = "javax.servlet.error.message"; /** * The name of the request attribute under which the request URI whose processing caused the error is propagated during * an error dispatch */ - public static final String ERROR_REQUEST_URI = "jakarta.servlet.error.request_uri"; + public static final String ERROR_REQUEST_URI = "javax.servlet.error.request_uri"; /** * The name of the request attribute under which the name of the servlet in which the error occurred is propagated * during an error dispatch */ - public static final String ERROR_SERVLET_NAME = "jakarta.servlet.error.servlet_name"; + public static final String ERROR_SERVLET_NAME = "javax.servlet.error.servlet_name"; /** * The name of the request attribute under which the response status is propagated during an error dispatch */ - public static final String ERROR_STATUS_CODE = "jakarta.servlet.error.status_code"; + public static final String ERROR_STATUS_CODE = "javax.servlet.error.status_code"; /** * Forwards a request from a servlet to another resource (servlet, JSP file, or HTML file) on the server. This method diff --git a/api/src/main/java/jakarta/servlet/Servlet.java b/api/src/main/java/jakarta/servlet/Servlet.java index 3e9bfa4..38963f7 100644 --- a/api/src/main/java/jakarta/servlet/Servlet.java +++ b/api/src/main/java/jakarta/servlet/Servlet.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.io.IOException; @@ -28,8 +28,8 @@ import java.io.IOException; * clients, usually across HTTP, the HyperText Transfer Protocol. * *

- * To implement this interface, you can write a generic servlet that extends jakarta.servlet.GenericServlet - * or an HTTP servlet that extends jakarta.servlet.http.HttpServlet. + * To implement this interface, you can write a generic servlet that extends javax.servlet.GenericServlet + * or an HTTP servlet that extends javax.servlet.http.HttpServlet. * *

* This interface defines methods to initialize a servlet, to service requests, and to remove a servlet from the server. @@ -49,7 +49,7 @@ import java.io.IOException; * @author Various * * @see GenericServlet - * @see jakarta.servlet.http.HttpServlet + * @see javax.servlet.http.HttpServlet * */ public interface Servlet { diff --git a/api/src/main/java/jakarta/servlet/ServletConfig.java b/api/src/main/java/jakarta/servlet/ServletConfig.java index 4a4a882..46935b5 100644 --- a/api/src/main/java/jakarta/servlet/ServletConfig.java +++ b/api/src/main/java/jakarta/servlet/ServletConfig.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.util.Enumeration; diff --git a/api/src/main/java/jakarta/servlet/ServletContainerInitializer.java b/api/src/main/java/jakarta/servlet/ServletContainerInitializer.java index fbdb76b..a0271a8 100644 --- a/api/src/main/java/jakarta/servlet/ServletContainerInitializer.java +++ b/api/src/main/java/jakarta/servlet/ServletContainerInitializer.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; import java.util.Set; @@ -24,7 +24,7 @@ import java.util.Set; * programmatic registration of servlets, filters, and listeners in response to it. * *

- * Implementations of this interface may be annotated with {@link jakarta.servlet.annotation.HandlesTypes HandlesTypes}, + * Implementations of this interface may be annotated with {@link javax.servlet.annotation.HandlesTypes HandlesTypes}, * in order to receive (at their {@link #onStartup} method) the Set of application classes that implement, extend, or * have been annotated with the class types specified by the annotation. * @@ -48,7 +48,7 @@ import java.util.Set; * files excluded from an absolute ordering must be ignored, and the order in which these services are discovered must * follow the application's classloading delegation model. * - * @see jakarta.servlet.annotation.HandlesTypes + * @see javax.servlet.annotation.HandlesTypes * * @since Servlet 3.0 */ @@ -66,7 +66,7 @@ public interface ServletContainerInitializer { * application is started. * * @param c the Set of application classes that extend, implement, or have been annotated with the class types specified - * by the {@link jakarta.servlet.annotation.HandlesTypes HandlesTypes} annotation, or null if there are no + * by the {@link javax.servlet.annotation.HandlesTypes HandlesTypes} annotation, or null if there are no * matches, or this ServletContainerInitializer has not been annotated with HandlesTypes * * @param ctx the ServletContext of the web application that is being started and in which the classes diff --git a/api/src/main/java/jakarta/servlet/ServletContext.java b/api/src/main/java/jakarta/servlet/ServletContext.java index 7b61ed0..116e465 100644 --- a/api/src/main/java/jakarta/servlet/ServletContext.java +++ b/api/src/main/java/jakarta/servlet/ServletContext.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; -import jakarta.servlet.descriptor.JspConfigDescriptor; +import javax.servlet.descriptor.JspConfigDescriptor; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; @@ -56,7 +56,7 @@ public interface ServletContext { * The name of the ServletContext attribute which stores the private temporary directory (of type * java.io.File) provided by the servlet container for the ServletContext */ - public static final String TEMPDIR = "jakarta.servlet.context.tempdir"; + public static final String TEMPDIR = "javax.servlet.context.tempdir"; /** * The name of the ServletContext attribute whose value (of type @@ -65,7 +65,7 @@ public interface ServletContext { * <absolute-ordering> without any <others/> is being used), or null if no * absolute or relative ordering has been specified */ - public static final String ORDERED_LIBS = "jakarta.servlet.context.orderedLibs"; + public static final String ORDERED_LIBS = "javax.servlet.context.orderedLibs"; /** * Returns the context path of the web application. @@ -78,13 +78,13 @@ public interface ServletContext { * *

* It is possible that a servlet container may match a context by more than one context path. In such cases the - * {@link jakarta.servlet.http.HttpServletRequest#getContextPath()} will return the actual context path used by the + * {@link javax.servlet.http.HttpServletRequest#getContextPath()} will return the actual context path used by the * request and it may differ from the path returned by this method. The context path returned by this method should be * considered as the prime or preferred context path of the application. * * @return The context path of the web application, or "" for the root context * - * @see jakarta.servlet.http.HttpServletRequest#getContextPath() + * @see javax.servlet.http.HttpServletRequest#getContextPath() * * @since Servlet 2.5 */ @@ -140,7 +140,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -160,7 +160,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -361,7 +361,7 @@ public interface ServletContext { * shared business logic by invoking methods on common non-servlet classes. * * @param name the servlet name - * @return the {@code jakarta.servlet.Servlet Servlet} with the given name + * @return the {@code javax.servlet.Servlet Servlet} with the given name * @throws ServletException if an exception has occurred that interfaces with servlet's normal operation */ @Deprecated @@ -375,7 +375,7 @@ public interface ServletContext { * context. In this version, this method always returns an empty enumeration and remains only to preserve binary * compatibility. This method will be permanently removed in a future version of Jakarta Servlets. * - * @return an Enumeration of {@code jakarta.servlet.Servlet Servlet} + * @return an Enumeration of {@code javax.servlet.Servlet Servlet} */ @Deprecated public Enumeration getServlets(); @@ -388,7 +388,7 @@ public interface ServletContext { * context. In this version, this method always returns an empty Enumeration and remains only to preserve * binary compatibility. This method will be permanently removed in a future version of Jakarta Servlets. * - * @return an Enumeration of {@code jakarta.servlet.Servlet Servlet} names + * @return an Enumeration of {@code javax.servlet.Servlet Servlet} names */ @Deprecated public Enumeration getServletNames(); @@ -516,7 +516,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -620,7 +620,7 @@ public interface ServletContext { * *

* This method introspects the class with the given className for the - * {@link jakarta.servlet.annotation.ServletSecurity}, {@link jakarta.servlet.annotation.MultipartConfig}, + * {@link javax.servlet.annotation.ServletSecurity}, {@link javax.servlet.annotation.MultipartConfig}, * javax.annotation.security.RunAs, and javax.annotation.security.DeclareRoles annotations. In * addition, this method supports resource injection if the class with the given className represents a Managed * Bean. See the Jakarta EE platform and CDI specifications for additional details about Managed Beans and resource @@ -640,7 +640,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -669,7 +669,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @throws IllegalArgumentException if the given servlet instance implements {@link SingleThreadModel}, or * servletName is null or an empty String @@ -690,8 +690,8 @@ public interface ServletContext { * returned. * *

- * This method introspects the given servletClass for the {@link jakarta.servlet.annotation.ServletSecurity}, - * {@link jakarta.servlet.annotation.MultipartConfig}, javax.annotation.security.RunAs, and + * This method introspects the given servletClass for the {@link javax.servlet.annotation.ServletSecurity}, + * {@link javax.servlet.annotation.MultipartConfig}, javax.annotation.security.RunAs, and * javax.annotation.security.DeclareRoles annotations. In addition, this method supports resource injection if * the given servletClass represents a Managed Bean. See the Jakarta EE platform and CDI specifications for * additional details about Managed Beans and resource injection. @@ -709,7 +709,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -739,7 +739,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 4.0 */ @@ -757,7 +757,7 @@ public interface ServletContext { * *

* This method introspects the given clazz for the following annotations: - * {@link jakarta.servlet.annotation.ServletSecurity}, {@link jakarta.servlet.annotation.MultipartConfig}, + * {@link javax.servlet.annotation.ServletSecurity}, {@link javax.servlet.annotation.MultipartConfig}, * javax.annotation.security.RunAs, and javax.annotation.security.DeclareRoles. In addition, this * method supports resource injection if the given clazz represents a Managed Bean. See the Jakarta EE platform * and CDI specifications for additional details about Managed Beans and resource injection. @@ -772,7 +772,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -789,7 +789,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -813,7 +813,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -850,7 +850,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -881,7 +881,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -915,7 +915,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -945,7 +945,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -961,7 +961,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -985,7 +985,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -1004,7 +1004,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -1024,7 +1024,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @throws IllegalArgumentException if sessionTrackingModes specifies a combination of * SessionTrackingMode.SSL with a session tracking mode other than SessionTrackingMode.SSL, or if @@ -1047,7 +1047,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -1069,7 +1069,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -1085,9 +1085,9 @@ public interface ServletContext { *

  • {@link ServletContextAttributeListener} *
  • {@link ServletRequestListener} *
  • {@link ServletRequestAttributeListener} - *
  • {@link jakarta.servlet.http.HttpSessionAttributeListener} - *
  • {@link jakarta.servlet.http.HttpSessionIdListener} - *
  • {@link jakarta.servlet.http.HttpSessionListener} + *
  • {@link javax.servlet.http.HttpSessionAttributeListener} + *
  • {@link javax.servlet.http.HttpSessionIdListener} + *
  • {@link javax.servlet.http.HttpSessionListener} * * *

    @@ -1101,7 +1101,7 @@ public interface ServletContext { *

    * If the class with the given name implements a listener interface whose invocation order corresponds to the * declaration order (i.e., if it implements {@link ServletRequestListener}, {@link ServletContextListener}, or - * {@link jakarta.servlet.http.HttpSessionListener}), then the new listener will be added to the end of the ordered list + * {@link javax.servlet.http.HttpSessionListener}), then the new listener will be added to the end of the ordered list * of listeners of that interface. * *

    @@ -1119,7 +1119,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -1134,9 +1134,9 @@ public interface ServletContext { *

  • {@link ServletContextAttributeListener} *
  • {@link ServletRequestListener} *
  • {@link ServletRequestAttributeListener} - *
  • {@link jakarta.servlet.http.HttpSessionAttributeListener} - *
  • {@link jakarta.servlet.http.HttpSessionIdListener} - *
  • {@link jakarta.servlet.http.HttpSessionListener} + *
  • {@link javax.servlet.http.HttpSessionAttributeListener} + *
  • {@link javax.servlet.http.HttpSessionIdListener} + *
  • {@link javax.servlet.http.HttpSessionListener} * * *

    @@ -1146,7 +1146,7 @@ public interface ServletContext { *

    * If the given listener is an instance of a listener interface whose invocation order corresponds to the declaration * order (i.e., if it is an instance of {@link ServletRequestListener}, {@link ServletContextListener}, or - * {@link jakarta.servlet.http.HttpSessionListener}), then the listener will be added to the end of the ordered list of + * {@link javax.servlet.http.HttpSessionListener}), then the listener will be added to the end of the ordered list of * listeners of that interface. * * @param the class of the EventListener to add @@ -1161,7 +1161,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -1176,9 +1176,9 @@ public interface ServletContext { *

  • {@link ServletContextAttributeListener} *
  • {@link ServletRequestListener} *
  • {@link ServletRequestAttributeListener} - *
  • {@link jakarta.servlet.http.HttpSessionAttributeListener} - *
  • {@link jakarta.servlet.http.HttpSessionIdListener} - *
  • {@link jakarta.servlet.http.HttpSessionListener} + *
  • {@link javax.servlet.http.HttpSessionAttributeListener} + *
  • {@link javax.servlet.http.HttpSessionIdListener} + *
  • {@link javax.servlet.http.HttpSessionListener} * * *

    @@ -1188,7 +1188,7 @@ public interface ServletContext { *

    * If the given listenerClass implements a listener interface whose invocation order corresponds to the * declaration order (i.e., if it implements {@link ServletRequestListener}, {@link ServletContextListener}, or - * {@link jakarta.servlet.http.HttpSessionListener}), then the new listener will be added to the end of the ordered list + * {@link javax.servlet.http.HttpSessionListener}), then the new listener will be added to the end of the ordered list * of listeners of that interface. * *

    @@ -1206,7 +1206,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.0 */ @@ -1218,8 +1218,8 @@ public interface ServletContext { *

    * The specified EventListener class must implement at least one of the {@link ServletContextListener}, * {@link ServletContextAttributeListener}, {@link ServletRequestListener}, {@link ServletRequestAttributeListener}, - * {@link jakarta.servlet.http.HttpSessionAttributeListener}, {@link jakarta.servlet.http.HttpSessionIdListener}, or - * {@link jakarta.servlet.http.HttpSessionListener} interfaces. + * {@link javax.servlet.http.HttpSessionAttributeListener}, {@link javax.servlet.http.HttpSessionIdListener}, or + * {@link javax.servlet.http.HttpSessionListener} interfaces. * *

    * The returned EventListener instance may be further customized before it is registered with this ServletContext via a @@ -1242,12 +1242,12 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @throws IllegalArgumentException if the specified EventListener class does not implement any of the * {@link ServletContextListener}, {@link ServletContextAttributeListener}, {@link ServletRequestListener}, - * {@link ServletRequestAttributeListener}, {@link jakarta.servlet.http.HttpSessionAttributeListener}, - * {@link jakarta.servlet.http.HttpSessionIdListener}, or {@link jakarta.servlet.http.HttpSessionListener} interfaces. + * {@link ServletRequestAttributeListener}, {@link javax.servlet.http.HttpSessionAttributeListener}, + * {@link javax.servlet.http.HttpSessionIdListener}, or {@link javax.servlet.http.HttpSessionListener} interfaces. * * @since Servlet 3.0 */ @@ -1264,9 +1264,9 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * - * @see jakarta.servlet.descriptor.JspConfigDescriptor + * @see javax.servlet.descriptor.JspConfigDescriptor * * @since Servlet 3.0 */ @@ -1286,7 +1286,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @throws SecurityException if a security manager denies access to the requested class loader * @@ -1308,7 +1308,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @throws IllegalArgumentException if any of the argument roleNames is null or the empty string * @@ -1332,7 +1332,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 3.1 */ @@ -1346,7 +1346,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 4.0 */ @@ -1362,7 +1362,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 4.0 */ @@ -1378,7 +1378,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 4.0 */ @@ -1394,7 +1394,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 4.0 */ @@ -1410,7 +1410,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 4.0 */ @@ -1426,7 +1426,7 @@ public interface ServletContext { * @throws UnsupportedOperationException if this ServletContext was passed to the * {@link ServletContextListener#contextInitialized} method of a {@link ServletContextListener} that was neither * declared in web.xml or web-fragment.xml, nor annotated with - * {@link jakarta.servlet.annotation.WebListener} + * {@link javax.servlet.annotation.WebListener} * * @since Servlet 4.0 */ diff --git a/api/src/main/java/jakarta/servlet/ServletContextAttributeEvent.java b/api/src/main/java/jakarta/servlet/ServletContextAttributeEvent.java index 911326f..7233abd 100644 --- a/api/src/main/java/jakarta/servlet/ServletContextAttributeEvent.java +++ b/api/src/main/java/jakarta/servlet/ServletContextAttributeEvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; /** * Event class for notifications about changes to the attributes of the ServletContext of a web application. diff --git a/api/src/main/java/jakarta/servlet/ServletContextAttributeListener.java b/api/src/main/java/jakarta/servlet/ServletContextAttributeListener.java index 52dae60..b07f0c6 100644 --- a/api/src/main/java/jakarta/servlet/ServletContextAttributeListener.java +++ b/api/src/main/java/jakarta/servlet/ServletContextAttributeListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.util.EventListener; @@ -25,7 +25,7 @@ import java.util.EventListener; * *

    * In order to receive these notification events, the implementation class must be either declared in the deployment - * descriptor of the web application, annotated with {@link jakarta.servlet.annotation.WebListener}, or registered via + * descriptor of the web application, annotated with {@link javax.servlet.annotation.WebListener}, or registered via * one of the addListener methods defined on {@link ServletContext}. * *

    diff --git a/api/src/main/java/jakarta/servlet/ServletContextEvent.java b/api/src/main/java/jakarta/servlet/ServletContextEvent.java index 28ae64b..48c8fb9 100644 --- a/api/src/main/java/jakarta/servlet/ServletContextEvent.java +++ b/api/src/main/java/jakarta/servlet/ServletContextEvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; /** * This is the event class for notifications about changes to the servlet context of a web application. diff --git a/api/src/main/java/jakarta/servlet/ServletContextListener.java b/api/src/main/java/jakarta/servlet/ServletContextListener.java index 1b156db..0f42d27 100644 --- a/api/src/main/java/jakarta/servlet/ServletContextListener.java +++ b/api/src/main/java/jakarta/servlet/ServletContextListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.util.EventListener; @@ -25,7 +25,7 @@ import java.util.EventListener; * *

    * In order to receive these notification events, the implementation class must be either declared in the deployment - * descriptor of the web application, annotated with {@link jakarta.servlet.annotation.WebListener}, or registered via + * descriptor of the web application, annotated with {@link javax.servlet.annotation.WebListener}, or registered via * one of the addListener methods defined on {@link ServletContext}. * *

    diff --git a/api/src/main/java/jakarta/servlet/ServletException.java b/api/src/main/java/jakarta/servlet/ServletException.java index a2ec3cc..21ceb39 100644 --- a/api/src/main/java/jakarta/servlet/ServletException.java +++ b/api/src/main/java/jakarta/servlet/ServletException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; /** * Defines a general exception a servlet can throw when it encounters difficulty. diff --git a/api/src/main/java/jakarta/servlet/ServletInputStream.java b/api/src/main/java/jakarta/servlet/ServletInputStream.java index 4d07a06..4f75681 100644 --- a/api/src/main/java/jakarta/servlet/ServletInputStream.java +++ b/api/src/main/java/jakarta/servlet/ServletInputStream.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.io.IOException; import java.io.InputStream; diff --git a/api/src/main/java/jakarta/servlet/ServletOutputStream.java b/api/src/main/java/jakarta/servlet/ServletOutputStream.java index e97328f..6b8d7a2 100644 --- a/api/src/main/java/jakarta/servlet/ServletOutputStream.java +++ b/api/src/main/java/jakarta/servlet/ServletOutputStream.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.io.CharConversionException; import java.io.IOException; @@ -40,7 +40,7 @@ import java.util.ResourceBundle; */ public abstract class ServletOutputStream extends OutputStream { - private static final String LSTRING_FILE = "jakarta.servlet.LocalStrings"; + private static final String LSTRING_FILE = "javax.servlet.LocalStrings"; private static ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE); /** diff --git a/api/src/main/java/jakarta/servlet/ServletRegistration.java b/api/src/main/java/jakarta/servlet/ServletRegistration.java index cd24cea..abb3540 100644 --- a/api/src/main/java/jakarta/servlet/ServletRegistration.java +++ b/api/src/main/java/jakarta/servlet/ServletRegistration.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; import java.util.*; @@ -116,12 +116,12 @@ public interface ServletRegistration extends Registration { * *

    * If a URL pattern of this ServletRegistration is an exact target of a security constraint that was established via the - * {@link jakarta.servlet.annotation.ServletSecurity} annotation or a previous call to this method, then this method + * {@link javax.servlet.annotation.ServletSecurity} annotation or a previous call to this method, then this method * replaces the security constraint for that pattern. * *

    * If a URL pattern of this ServletRegistration is neither the exact target of a security constraint that was - * established via the {@link jakarta.servlet.annotation.ServletSecurity} annotation or a previous call to this method, + * established via the {@link javax.servlet.annotation.ServletSecurity} annotation or a previous call to this method, * nor the exact target of a security-constraint in the portable deployment descriptor, then this method * establishes the security constraint for that pattern from the argument ServletSecurityElement. * diff --git a/api/src/main/java/jakarta/servlet/ServletRequest.java b/api/src/main/java/jakarta/servlet/ServletRequest.java index 8dbfba7..ba0ba05 100644 --- a/api/src/main/java/jakarta/servlet/ServletRequest.java +++ b/api/src/main/java/jakarta/servlet/ServletRequest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.io.*; import java.util.*; @@ -28,11 +28,11 @@ import java.util.*; *

    * A ServletRequest object provides data including parameter name and values, attributes, and an input * stream. Interfaces that extend ServletRequest can provide additional protocol-specific data (for - * example, HTTP data is provided by {@link jakarta.servlet.http.HttpServletRequest}. + * example, HTTP data is provided by {@link javax.servlet.http.HttpServletRequest}. * * @author Various * - * @see jakarta.servlet.http.HttpServletRequest + * @see javax.servlet.http.HttpServletRequest * */ public interface ServletRequest { @@ -44,7 +44,7 @@ public interface ServletRequest { *

    * Attributes can be set two ways. The servlet container may set attributes to make available custom information about a * request. For example, for requests made using HTTPS, the attribute - * jakarta.servlet.request.X509Certificate can be used to retrieve information on the certificate of the + * javax.servlet.request.X509Certificate can be used to retrieve information on the certificate of the * client. Attributes can also be set programmatically using {@link ServletRequest#setAttribute}. This allows * information to be embedded into a request before a {@link RequestDispatcher} call. * diff --git a/api/src/main/java/jakarta/servlet/ServletRequestAttributeEvent.java b/api/src/main/java/jakarta/servlet/ServletRequestAttributeEvent.java index 2a4ec69..08a2077 100644 --- a/api/src/main/java/jakarta/servlet/ServletRequestAttributeEvent.java +++ b/api/src/main/java/jakarta/servlet/ServletRequestAttributeEvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; /** * This is the event class for notifications of changes to the attributes of the servlet request in an application. diff --git a/api/src/main/java/jakarta/servlet/ServletRequestAttributeListener.java b/api/src/main/java/jakarta/servlet/ServletRequestAttributeListener.java index 2221324..d83d29c 100644 --- a/api/src/main/java/jakarta/servlet/ServletRequestAttributeListener.java +++ b/api/src/main/java/jakarta/servlet/ServletRequestAttributeListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.util.EventListener; @@ -30,7 +30,7 @@ import java.util.EventListener; * *

    * In order to receive these notification events, the implementation class must be either declared in the deployment - * descriptor of the web application, annotated with {@link jakarta.servlet.annotation.WebListener}, or registered via + * descriptor of the web application, annotated with {@link javax.servlet.annotation.WebListener}, or registered via * one of the addListener methods defined on {@link ServletContext}. * *

    diff --git a/api/src/main/java/jakarta/servlet/ServletRequestEvent.java b/api/src/main/java/jakarta/servlet/ServletRequestEvent.java index d86365d..5ea80bb 100644 --- a/api/src/main/java/jakarta/servlet/ServletRequestEvent.java +++ b/api/src/main/java/jakarta/servlet/ServletRequestEvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; /** * Events of this kind indicate lifecycle events for a ServletRequest. The source of the event is the ServletContext of diff --git a/api/src/main/java/jakarta/servlet/ServletRequestListener.java b/api/src/main/java/jakarta/servlet/ServletRequestListener.java index 835420d..4d53b2a 100644 --- a/api/src/main/java/jakarta/servlet/ServletRequestListener.java +++ b/api/src/main/java/jakarta/servlet/ServletRequestListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.util.EventListener; @@ -30,7 +30,7 @@ import java.util.EventListener; * *

    * In order to receive these notification events, the implementation class must be either declared in the deployment - * descriptor of the web application, annotated with {@link jakarta.servlet.annotation.WebListener}, or registered via + * descriptor of the web application, annotated with {@link javax.servlet.annotation.WebListener}, or registered via * one of the addListener methods defined on {@link ServletContext}. * *

    diff --git a/api/src/main/java/jakarta/servlet/ServletRequestWrapper.java b/api/src/main/java/jakarta/servlet/ServletRequestWrapper.java index 73b94ab..26334cf 100644 --- a/api/src/main/java/jakarta/servlet/ServletRequestWrapper.java +++ b/api/src/main/java/jakarta/servlet/ServletRequestWrapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.io.BufferedReader; import java.io.IOException; @@ -30,7 +30,7 @@ import java.util.Map; * adapt the request to a Servlet. This class implements the Wrapper or Decorator pattern. Methods default to calling * through to the wrapped request object. * - * @see jakarta.servlet.ServletRequest + * @see javax.servlet.ServletRequest * * @since Servlet 2.3 */ diff --git a/api/src/main/java/jakarta/servlet/ServletResponse.java b/api/src/main/java/jakarta/servlet/ServletResponse.java index ae261d3..ce4588a 100644 --- a/api/src/main/java/jakarta/servlet/ServletResponse.java +++ b/api/src/main/java/jakarta/servlet/ServletResponse.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.io.IOException; import java.io.PrintWriter; diff --git a/api/src/main/java/jakarta/servlet/ServletResponseWrapper.java b/api/src/main/java/jakarta/servlet/ServletResponseWrapper.java index d228f07..de6752c 100644 --- a/api/src/main/java/jakarta/servlet/ServletResponseWrapper.java +++ b/api/src/main/java/jakarta/servlet/ServletResponseWrapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; import java.io.IOException; import java.io.PrintWriter; @@ -31,7 +31,7 @@ import java.util.Locale; * @author Various * @since Servlet 2.3 * - * @see jakarta.servlet.ServletResponse + * @see javax.servlet.ServletResponse */ public class ServletResponseWrapper implements ServletResponse { private ServletResponse response; diff --git a/api/src/main/java/jakarta/servlet/ServletSecurityElement.java b/api/src/main/java/jakarta/servlet/ServletSecurityElement.java index 569a6ff..1f7647c 100644 --- a/api/src/main/java/jakarta/servlet/ServletSecurityElement.java +++ b/api/src/main/java/jakarta/servlet/ServletSecurityElement.java @@ -15,10 +15,10 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; -import jakarta.servlet.annotation.HttpMethodConstraint; -import jakarta.servlet.annotation.ServletSecurity; +import javax.servlet.annotation.HttpMethodConstraint; +import javax.servlet.annotation.ServletSecurity; import java.util.*; /** diff --git a/api/src/main/java/jakarta/servlet/SessionCookieConfig.java b/api/src/main/java/jakarta/servlet/SessionCookieConfig.java index 18e7842..a9fc79c 100644 --- a/api/src/main/java/jakarta/servlet/SessionCookieConfig.java +++ b/api/src/main/java/jakarta/servlet/SessionCookieConfig.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; /** * Class that may be used to configure various properties of cookies used for session tracking purposes. @@ -52,7 +52,7 @@ public interface SessionCookieConfig { * * @return the cookie name set via {@link #setName}, or null if {@link #setName} was never called * - * @see jakarta.servlet.http.Cookie#getName() + * @see javax.servlet.http.Cookie#getName() */ public String getName(); @@ -65,7 +65,7 @@ public interface SessionCookieConfig { * @throws IllegalStateException if the ServletContext from which this SessionCookieConfig was * acquired has already been initialized * - * @see jakarta.servlet.http.Cookie#setDomain(String) + * @see javax.servlet.http.Cookie#setDomain(String) */ public void setDomain(String domain); @@ -75,7 +75,7 @@ public interface SessionCookieConfig { * * @return the cookie domain set via {@link #setDomain}, or null if {@link #setDomain} was never called * - * @see jakarta.servlet.http.Cookie#getDomain() + * @see javax.servlet.http.Cookie#getDomain() */ public String getDomain(); @@ -88,7 +88,7 @@ public interface SessionCookieConfig { * @throws IllegalStateException if the ServletContext from which this SessionCookieConfig was * acquired has already been initialized * - * @see jakarta.servlet.http.Cookie#setPath(String) + * @see javax.servlet.http.Cookie#setPath(String) */ public void setPath(String path); @@ -102,7 +102,7 @@ public interface SessionCookieConfig { * * @return the cookie path set via {@link #setPath}, or null if {@link #setPath} was never called * - * @see jakarta.servlet.http.Cookie#getPath() + * @see javax.servlet.http.Cookie#getPath() */ public String getPath(); @@ -119,8 +119,8 @@ public interface SessionCookieConfig { * @throws IllegalStateException if the ServletContext from which this SessionCookieConfig was * acquired has already been initialized * - * @see jakarta.servlet.http.Cookie#setComment(String) - * @see jakarta.servlet.http.Cookie#getVersion + * @see javax.servlet.http.Cookie#setComment(String) + * @see javax.servlet.http.Cookie#getVersion */ public void setComment(String comment); @@ -130,7 +130,7 @@ public interface SessionCookieConfig { * * @return the cookie comment set via {@link #setComment}, or null if {@link #setComment} was never called * - * @see jakarta.servlet.http.Cookie#getComment() + * @see javax.servlet.http.Cookie#getComment() */ public String getComment(); @@ -150,7 +150,7 @@ public interface SessionCookieConfig { * @throws IllegalStateException if the ServletContext from which this SessionCookieConfig was * acquired has already been initialized * - * @see jakarta.servlet.http.Cookie#setHttpOnly(boolean) + * @see javax.servlet.http.Cookie#setHttpOnly(boolean) */ public void setHttpOnly(boolean httpOnly); @@ -162,7 +162,7 @@ public interface SessionCookieConfig { * ServletContext from which this SessionCookieConfig was acquired will be marked as HttpOnly, * false otherwise * - * @see jakarta.servlet.http.Cookie#isHttpOnly() + * @see javax.servlet.http.Cookie#isHttpOnly() */ public boolean isHttpOnly(); @@ -184,7 +184,7 @@ public interface SessionCookieConfig { * @throws IllegalStateException if the ServletContext from which this SessionCookieConfig was * acquired has already been initialized * - * @see jakarta.servlet.http.Cookie#setSecure(boolean) + * @see javax.servlet.http.Cookie#setSecure(boolean) * @see ServletRequest#isSecure() */ public void setSecure(boolean secure); @@ -199,7 +199,7 @@ public interface SessionCookieConfig { * even if the request that initiated the corresponding session is using plain HTTP instead of HTTPS, and false if they * will be marked as secure only if the request that initiated the corresponding session was also secure * - * @see jakarta.servlet.http.Cookie#getSecure() + * @see javax.servlet.http.Cookie#getSecure() * @see ServletRequest#isSecure() */ public boolean isSecure(); @@ -214,7 +214,7 @@ public interface SessionCookieConfig { * @throws IllegalStateException if the ServletContext from which this SessionCookieConfig was * acquired has already been initialized * - * @see jakarta.servlet.http.Cookie#setMaxAge + * @see javax.servlet.http.Cookie#setMaxAge */ public void setMaxAge(int maxAge); @@ -228,7 +228,7 @@ public interface SessionCookieConfig { * @return the lifetime (in seconds) of the session tracking cookies created on behalf of the application represented by * the ServletContext from which this SessionCookieConfig was acquired, or -1 (the default) * - * @see jakarta.servlet.http.Cookie#getMaxAge + * @see javax.servlet.http.Cookie#getMaxAge */ public int getMaxAge(); } diff --git a/api/src/main/java/jakarta/servlet/SessionTrackingMode.java b/api/src/main/java/jakarta/servlet/SessionTrackingMode.java index 2926859..e4a553b 100644 --- a/api/src/main/java/jakarta/servlet/SessionTrackingMode.java +++ b/api/src/main/java/jakarta/servlet/SessionTrackingMode.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; /** * Enumeration of session tracking modes. diff --git a/api/src/main/java/jakarta/servlet/SingleThreadModel.java b/api/src/main/java/jakarta/servlet/SingleThreadModel.java index 3ff3d73..5b52265 100644 --- a/api/src/main/java/jakarta/servlet/SingleThreadModel.java +++ b/api/src/main/java/jakarta/servlet/SingleThreadModel.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; /** * Ensures that servlets handle only one request at a time. This interface has no methods. diff --git a/api/src/main/java/jakarta/servlet/UnavailableException.java b/api/src/main/java/jakarta/servlet/UnavailableException.java index b983361..09ed1a8 100644 --- a/api/src/main/java/jakarta/servlet/UnavailableException.java +++ b/api/src/main/java/jakarta/servlet/UnavailableException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet; +package javax.servlet; /** * Defines an exception that a servlet or filter throws to indicate that it is permanently or temporarily unavailable. diff --git a/api/src/main/java/jakarta/servlet/WriteListener.java b/api/src/main/java/jakarta/servlet/WriteListener.java index be95242..18e9ebb 100644 --- a/api/src/main/java/jakarta/servlet/WriteListener.java +++ b/api/src/main/java/jakarta/servlet/WriteListener.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet; +package javax.servlet; import java.io.IOException; import java.util.EventListener; @@ -31,7 +31,7 @@ public interface WriteListener extends EventListener { /** * When an instance of the WriteListener is registered with a {@link ServletOutputStream}, this method will be invoked * by the container the first time when it is possible to write data. Subsequently the container will invoke this method - * if and only if the {@link jakarta.servlet.ServletOutputStream#isReady()} method has been called and has returned a + * if and only if the {@link javax.servlet.ServletOutputStream#isReady()} method has been called and has returned a * value of false and a write operation has subsequently become possible. * * @throws IOException if an I/O related error has occurred during processing diff --git a/api/src/main/java/jakarta/servlet/annotation/HandlesTypes.java b/api/src/main/java/jakarta/servlet/annotation/HandlesTypes.java index 96f6510..dfe9f53 100644 --- a/api/src/main/java/jakarta/servlet/annotation/HandlesTypes.java +++ b/api/src/main/java/jakarta/servlet/annotation/HandlesTypes.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.annotation; +package javax.servlet.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -23,10 +23,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * This annotation is used to declare the class types that a {@link jakarta.servlet.ServletContainerInitializer + * This annotation is used to declare the class types that a {@link javax.servlet.ServletContainerInitializer * ServletContainerInitializer} can handle. * - * @see jakarta.servlet.ServletContainerInitializer + * @see javax.servlet.ServletContainerInitializer * * @since Servlet 3.0 */ @@ -35,16 +35,16 @@ import java.lang.annotation.Target; public @interface HandlesTypes { /** - * The classes in which a {@link jakarta.servlet.ServletContainerInitializer ServletContainerInitializer} has expressed + * The classes in which a {@link javax.servlet.ServletContainerInitializer ServletContainerInitializer} has expressed * interest. * *

    * If an implementation of ServletContainerInitializer specifies this annotation, the Servlet container must * pass the Set of application classes that extend, implement, or have been annotated with the class types - * listed by this annotation to the {@link jakarta.servlet.ServletContainerInitializer#onStartup} method of the + * listed by this annotation to the {@link javax.servlet.ServletContainerInitializer#onStartup} method of the * ServletContainerInitializer (if no matching classes are found, null must be passed instead) * - * @return the classes in which {@link jakarta.servlet.ServletContainerInitializer ServletContainerInitializer} has + * @return the classes in which {@link javax.servlet.ServletContainerInitializer ServletContainerInitializer} has * expressed interest */ Class[] value(); diff --git a/api/src/main/java/jakarta/servlet/annotation/HttpConstraint.java b/api/src/main/java/jakarta/servlet/annotation/HttpConstraint.java index c850776..ea7d473 100644 --- a/api/src/main/java/jakarta/servlet/annotation/HttpConstraint.java +++ b/api/src/main/java/jakarta/servlet/annotation/HttpConstraint.java @@ -15,10 +15,10 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.annotation; +package javax.servlet.annotation; -import jakarta.servlet.annotation.ServletSecurity.EmptyRoleSemantic; -import jakarta.servlet.annotation.ServletSecurity.TransportGuarantee; +import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic; +import javax.servlet.annotation.ServletSecurity.TransportGuarantee; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/api/src/main/java/jakarta/servlet/annotation/HttpMethodConstraint.java b/api/src/main/java/jakarta/servlet/annotation/HttpMethodConstraint.java index 0d4dd08..76e7797 100644 --- a/api/src/main/java/jakarta/servlet/annotation/HttpMethodConstraint.java +++ b/api/src/main/java/jakarta/servlet/annotation/HttpMethodConstraint.java @@ -15,10 +15,10 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.annotation; +package javax.servlet.annotation; -import jakarta.servlet.annotation.ServletSecurity.EmptyRoleSemantic; -import jakarta.servlet.annotation.ServletSecurity.TransportGuarantee; +import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic; +import javax.servlet.annotation.ServletSecurity.TransportGuarantee; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/api/src/main/java/jakarta/servlet/annotation/MultipartConfig.java b/api/src/main/java/jakarta/servlet/annotation/MultipartConfig.java index 187507f..63479ee 100644 --- a/api/src/main/java/jakarta/servlet/annotation/MultipartConfig.java +++ b/api/src/main/java/jakarta/servlet/annotation/MultipartConfig.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.annotation; +package javax.servlet.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -23,13 +23,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Annotation that may be specified on a {@link jakarta.servlet.Servlet} class, indicating that instances of the + * Annotation that may be specified on a {@link javax.servlet.Servlet} class, indicating that instances of the * Servlet expect requests that conform to the multipart/form-data MIME type. * *

    - * Servlets annotated with MultipartConfig may retrieve the {@link jakarta.servlet.http.Part} components of a - * given multipart/form-data request by calling {@link jakarta.servlet.http.HttpServletRequest#getPart getPart} - * or {@link jakarta.servlet.http.HttpServletRequest#getParts getParts}. + * Servlets annotated with MultipartConfig may retrieve the {@link javax.servlet.http.Part} components of a + * given multipart/form-data request by calling {@link javax.servlet.http.HttpServletRequest#getPart getPart} + * or {@link javax.servlet.http.HttpServletRequest#getParts getParts}. */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/api/src/main/java/jakarta/servlet/annotation/ServletSecurity.java b/api/src/main/java/jakarta/servlet/annotation/ServletSecurity.java index a44a85a..a84e366 100644 --- a/api/src/main/java/jakarta/servlet/annotation/ServletSecurity.java +++ b/api/src/main/java/jakarta/servlet/annotation/ServletSecurity.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.annotation; +package javax.servlet.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/api/src/main/java/jakarta/servlet/annotation/WebFilter.java b/api/src/main/java/jakarta/servlet/annotation/WebFilter.java index 245b035..34065ab 100644 --- a/api/src/main/java/jakarta/servlet/annotation/WebFilter.java +++ b/api/src/main/java/jakarta/servlet/annotation/WebFilter.java @@ -15,9 +15,9 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.annotation; +package javax.servlet.annotation; -import jakarta.servlet.DispatcherType; +import javax.servlet.DispatcherType; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -31,7 +31,7 @@ import java.lang.annotation.Target; * This annotation is processed by the container at deployment time, and the corresponding filter applied to the * specified URL patterns, servlets, and dispatcher types. * - * @see jakarta.servlet.Filter + * @see javax.servlet.Filter * * @since Servlet 3.0 */ @@ -114,8 +114,8 @@ public @interface WebFilter { * Declares whether the filter supports asynchronous operation mode. * * @return {@code true} if the filter supports asynchronous operation mode - * @see jakarta.servlet.ServletRequest#startAsync - * @see jakarta.servlet.ServletRequest#startAsync( jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) + * @see javax.servlet.ServletRequest#startAsync + * @see javax.servlet.ServletRequest#startAsync( javax.servlet.ServletRequest,javax.servlet.ServletResponse) */ boolean asyncSupported() default false; diff --git a/api/src/main/java/jakarta/servlet/annotation/WebInitParam.java b/api/src/main/java/jakarta/servlet/annotation/WebInitParam.java index 5aeb7e1..ae615eb 100644 --- a/api/src/main/java/jakarta/servlet/annotation/WebInitParam.java +++ b/api/src/main/java/jakarta/servlet/annotation/WebInitParam.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.annotation; +package javax.servlet.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/api/src/main/java/jakarta/servlet/annotation/WebListener.java b/api/src/main/java/jakarta/servlet/annotation/WebListener.java index 772355f..ee7750f 100644 --- a/api/src/main/java/jakarta/servlet/annotation/WebListener.java +++ b/api/src/main/java/jakarta/servlet/annotation/WebListener.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.annotation; +package javax.servlet.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -27,10 +27,10 @@ import java.lang.annotation.Target; * This annotation is used to declare a WebListener. * * Any class annotated with WebListener must implement one or more of the - * {@link jakarta.servlet.ServletContextListener}, {@link jakarta.servlet.ServletContextAttributeListener}, - * {@link jakarta.servlet.ServletRequestListener}, {@link jakarta.servlet.ServletRequestAttributeListener}, - * {@link jakarta.servlet.http.HttpSessionListener}, or {@link jakarta.servlet.http.HttpSessionAttributeListener}, or - * {@link jakarta.servlet.http.HttpSessionIdListener} interfaces. + * {@link javax.servlet.ServletContextListener}, {@link javax.servlet.ServletContextAttributeListener}, + * {@link javax.servlet.ServletRequestListener}, {@link javax.servlet.ServletRequestAttributeListener}, + * {@link javax.servlet.http.HttpSessionListener}, or {@link javax.servlet.http.HttpSessionAttributeListener}, or + * {@link javax.servlet.http.HttpSessionIdListener} interfaces. * * @since Servlet 3.0 */ diff --git a/api/src/main/java/jakarta/servlet/annotation/WebServlet.java b/api/src/main/java/jakarta/servlet/annotation/WebServlet.java index cc6169d..779913c 100644 --- a/api/src/main/java/jakarta/servlet/annotation/WebServlet.java +++ b/api/src/main/java/jakarta/servlet/annotation/WebServlet.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.annotation; +package javax.servlet.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -30,7 +30,7 @@ import java.lang.annotation.Target; * This annotation is processed by the container at deployment time, and the corresponding servlet made available at the * specified URL patterns. * - * @see jakarta.servlet.Servlet + * @see javax.servlet.Servlet * * @since Servlet 3.0 */ @@ -78,8 +78,8 @@ public @interface WebServlet { * Declares whether the servlet supports asynchronous operation mode. * * @return {@code true} if the servlet supports asynchronous operation mode - * @see jakarta.servlet.ServletRequest#startAsync - * @see jakarta.servlet.ServletRequest#startAsync( jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse) + * @see javax.servlet.ServletRequest#startAsync + * @see javax.servlet.ServletRequest#startAsync( javax.servlet.ServletRequest,javax.servlet.ServletResponse) */ boolean asyncSupported() default false; diff --git a/api/src/main/java/jakarta/servlet/descriptor/JspConfigDescriptor.java b/api/src/main/java/jakarta/servlet/descriptor/JspConfigDescriptor.java index f0af737..30c6229 100644 --- a/api/src/main/java/jakarta/servlet/descriptor/JspConfigDescriptor.java +++ b/api/src/main/java/jakarta/servlet/descriptor/JspConfigDescriptor.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.descriptor; +package javax.servlet.descriptor; import java.util.Collection; diff --git a/api/src/main/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java b/api/src/main/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java index 8fcb199..890b12b 100644 --- a/api/src/main/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java +++ b/api/src/main/java/jakarta/servlet/descriptor/JspPropertyGroupDescriptor.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.descriptor; +package javax.servlet.descriptor; import java.util.Collection; diff --git a/api/src/main/java/jakarta/servlet/descriptor/TaglibDescriptor.java b/api/src/main/java/jakarta/servlet/descriptor/TaglibDescriptor.java index d3bd173..f5346e9 100644 --- a/api/src/main/java/jakarta/servlet/descriptor/TaglibDescriptor.java +++ b/api/src/main/java/jakarta/servlet/descriptor/TaglibDescriptor.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.descriptor; +package javax.servlet.descriptor; /** * This interface provides access to the <taglib> related configuration of a web application. diff --git a/api/src/main/java/jakarta/servlet/http/Cookie.java b/api/src/main/java/jakarta/servlet/http/Cookie.java index d0b1002..b1b02a7 100644 --- a/api/src/main/java/jakarta/servlet/http/Cookie.java +++ b/api/src/main/java/jakarta/servlet/http/Cookie.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; import java.io.Serializable; import java.text.MessageFormat; @@ -60,7 +60,7 @@ public class Cookie implements Cloneable, Serializable { private static final String TSPECIALS; - private static final String LSTRING_FILE = "jakarta.servlet.http.LocalStrings"; + private static final String LSTRING_FILE = "javax.servlet.http.LocalStrings"; private static ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE); diff --git a/api/src/main/java/jakarta/servlet/http/HttpFilter.java b/api/src/main/java/jakarta/servlet/http/HttpFilter.java index 9990e06..6def723 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpFilter.java +++ b/api/src/main/java/jakarta/servlet/http/HttpFilter.java @@ -15,13 +15,13 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.http; +package javax.servlet.http; -import jakarta.servlet.FilterChain; -import jakarta.servlet.GenericFilter; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; +import javax.servlet.FilterChain; +import javax.servlet.GenericFilter; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import java.io.IOException; /** @@ -29,7 +29,7 @@ import java.io.IOException; *

    * Provides an abstract class to be subclassed to create an HTTP filter suitable for a Web site. A subclass of * HttpFilter should override - * {@link #doFilter(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.servlet.FilterChain) }. + * {@link #doFilter(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.FilterChain) }. *

    * *

    @@ -70,7 +70,7 @@ public abstract class HttpFilter extends GenericFilter { * The default implementation inspects the incoming {@code req} and {@code res} objects to determine if they are * instances of {@link HttpServletRequest} and {@link HttpServletResponse}, respectively. If not, a * {@link ServletException} is thrown. Otherwise, the protected - * {@link #doFilter(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, jakarta.servlet.FilterChain)} + * {@link #doFilter(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.FilterChain)} * method is called. *

    * diff --git a/api/src/main/java/jakarta/servlet/http/HttpServlet.java b/api/src/main/java/jakarta/servlet/http/HttpServlet.java index 8fcd11a..942b53d 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpServlet.java +++ b/api/src/main/java/jakarta/servlet/http/HttpServlet.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package jakarta.servlet.http; - -import jakarta.servlet.GenericServlet; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletOutputStream; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.WriteListener; +package javax.servlet.http; + +import javax.servlet.GenericServlet; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.WriteListener; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; @@ -78,7 +78,7 @@ public abstract class HttpServlet extends GenericServlet { private static final String HEADER_IFMODSINCE = "If-Modified-Since"; private static final String HEADER_LASTMOD = "Last-Modified"; - private static final String LSTRING_FILE = "jakarta.servlet.http.LocalStrings"; + private static final String LSTRING_FILE = "javax.servlet.http.LocalStrings"; private static ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE); /** @@ -108,7 +108,7 @@ public abstract class HttpServlet extends GenericServlet { * before the response body. * *

    - * Where possible, set the Content-Length header (with the {@link jakarta.servlet.ServletResponse#setContentLength} + * Where possible, set the Content-Length header (with the {@link javax.servlet.ServletResponse#setContentLength} * method), to allow the servlet container to use a persistent connection to return its response to the client, * improving performance. The content length is automatically set if the entire response fits inside the response * buffer. @@ -138,7 +138,7 @@ public abstract class HttpServlet extends GenericServlet { * * @throws ServletException if the request for the GET could not be handled * - * @see jakarta.servlet.ServletResponse#setContentType + * @see javax.servlet.ServletResponse#setContentType */ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { String protocol = req.getProtocol(); @@ -213,7 +213,7 @@ public abstract class HttpServlet extends GenericServlet { * before the response body. * *

    - * Where possible, set the Content-Length header (with the {@link jakarta.servlet.ServletResponse#setContentLength} + * Where possible, set the Content-Length header (with the {@link javax.servlet.ServletResponse#setContentLength} * method), to allow the servlet container to use a persistent connection to return its response to the client, * improving performance. The content length is automatically set if the entire response fits inside the response * buffer. @@ -238,8 +238,8 @@ public abstract class HttpServlet extends GenericServlet { * * @throws ServletException if the request for the POST could not be handled * - * @see jakarta.servlet.ServletOutputStream - * @see jakarta.servlet.ServletResponse#setContentType + * @see javax.servlet.ServletOutputStream + * @see javax.servlet.ServletResponse#setContentType */ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { String protocol = req.getProtocol(); @@ -477,7 +477,7 @@ public abstract class HttpServlet extends GenericServlet { /** * Receives standard HTTP requests from the public service method and dispatches them to the * doXXX methods defined in this class. This method is an HTTP-specific version of the - * {@link jakarta.servlet.Servlet#service} method. There's no need to override this method. + * {@link javax.servlet.Servlet#service} method. There's no need to override this method. * * @param req the {@link HttpServletRequest} object that contains the request the client made of the servlet * @@ -487,7 +487,7 @@ public abstract class HttpServlet extends GenericServlet { * * @throws ServletException if the HTTP request cannot be handled * - * @see jakarta.servlet.Servlet#service + * @see javax.servlet.Servlet#service */ protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { String method = req.getMethod(); @@ -570,7 +570,7 @@ public abstract class HttpServlet extends GenericServlet { * @throws ServletException if the HTTP request cannot be handled or if either parameter is not an instance of its * respective {@link HttpServletRequest} or {@link HttpServletResponse} counterparts. * - * @see jakarta.servlet.Servlet#service + * @see javax.servlet.Servlet#service */ @Override public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException { @@ -596,7 +596,7 @@ public abstract class HttpServlet extends GenericServlet { // file private class NoBodyResponse extends HttpServletResponseWrapper { - private static final ResourceBundle lStrings = ResourceBundle.getBundle("jakarta.servlet.http.LocalStrings"); + private static final ResourceBundle lStrings = ResourceBundle.getBundle("javax.servlet.http.LocalStrings"); private NoBodyOutputStream noBody; private PrintWriter writer; @@ -694,7 +694,7 @@ class NoBodyResponse extends HttpServletResponseWrapper { // file private class NoBodyOutputStream extends ServletOutputStream { - private static final String LSTRING_FILE = "jakarta.servlet.http.LocalStrings"; + private static final String LSTRING_FILE = "javax.servlet.http.LocalStrings"; private static ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE); private int contentLength = 0; diff --git a/api/src/main/java/jakarta/servlet/http/HttpServletMapping.java b/api/src/main/java/jakarta/servlet/http/HttpServletMapping.java index b04b684..1450618 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpServletMapping.java +++ b/api/src/main/java/jakarta/servlet/http/HttpServletMapping.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.http; +package javax.servlet.http; /** *

    diff --git a/api/src/main/java/jakarta/servlet/http/HttpServletRequest.java b/api/src/main/java/jakarta/servlet/http/HttpServletRequest.java index 5f84025..2753c03 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpServletRequest.java +++ b/api/src/main/java/jakarta/servlet/http/HttpServletRequest.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; -import jakarta.servlet.RequestDispatcher; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; import java.io.IOException; import java.util.*; /** * - * Extends the {@link jakarta.servlet.ServletRequest} interface to provide request information for HTTP servlets. + * Extends the {@link javax.servlet.ServletRequest} interface to provide request information for HTTP servlets. * *

    * The servlet container creates an HttpServletRequest object and passes it as an argument to the servlet's @@ -164,22 +164,22 @@ public interface HttpServletRequest extends ServletRequest { /** * Return the HttpServletMapping of the request. *

    - * The mapping returned depends on the current {@link jakarta.servlet.DispatcherType} as obtained from + * The mapping returned depends on the current {@link javax.servlet.DispatcherType} as obtained from * {@link #getDispatcherType()}: *

    - *
    {@link jakarta.servlet.DispatcherType#REQUEST}, {@link jakarta.servlet.DispatcherType#ASYNC}, - * {@link jakarta.servlet.DispatcherType#ERROR}
    + *
    {@link javax.servlet.DispatcherType#REQUEST}, {@link javax.servlet.DispatcherType#ASYNC}, + * {@link javax.servlet.DispatcherType#ERROR}
    *
    Return the mapping for the target of the dispatch i.e. the mapping for the current - * {@link jakarta.servlet.Servlet}.
    + * {@link javax.servlet.Servlet}. * - *
    {@link jakarta.servlet.DispatcherType#INCLUDE}
    + *
    {@link javax.servlet.DispatcherType#INCLUDE}
    *
    Return the mapping as prior to the current dispatch. i.e the mapping returned is unchanged by a call to
    * {@link RequestDispatcher#include(ServletRequest, ServletResponse)}. * - *
    {@link jakarta.servlet.DispatcherType#FORWARD}
    + *
    {@link javax.servlet.DispatcherType#FORWARD}
    *
    Return the mapping for the target of the dispatch i.e. the mapping for the current - * {@link jakarta.servlet.Servlet}, unless the {@link jakarta.servlet.RequestDispatcher} was obtained via - * {@link jakarta.servlet.ServletContext#getNamedDispatcher(String)}, in which case return the mapping as prior to the + * {@link javax.servlet.Servlet}, unless the {@link javax.servlet.RequestDispatcher} was obtained via + * {@link javax.servlet.ServletContext#getNamedDispatcher(String)}, in which case return the mapping as prior to the * current dispatch. i.e the mapping returned is changed during a call to * {@link RequestDispatcher#forward(ServletRequest, ServletResponse)} only if the dispatcher is not a named * dispatcher.
    @@ -302,13 +302,13 @@ public interface HttpServletRequest extends ServletRequest { *

    * It is possible that a servlet container may match a context by more than one context path. In such cases this method * will return the actual context path used by the request and it may differ from the path returned by the - * {@link jakarta.servlet.ServletContext#getContextPath()} method. The context path returned by - * {@link jakarta.servlet.ServletContext#getContextPath()} should be considered as the prime or preferred context path + * {@link javax.servlet.ServletContext#getContextPath()} method. The context path returned by + * {@link javax.servlet.ServletContext#getContextPath()} should be considered as the prime or preferred context path * of the application. * * @return a String specifying the portion of the request URI that indicates the context of the request * - * @see jakarta.servlet.ServletContext#getContextPath() + * @see javax.servlet.ServletContext#getContextPath() */ public String getContextPath(); @@ -407,7 +407,7 @@ public interface HttpServletRequest extends ServletRequest { * number, and server path, but it does not include query string parameters. * *

    - * If this request has been forwarded using {@link jakarta.servlet.RequestDispatcher#forward}, the server path in the + * If this request has been forwarded using {@link javax.servlet.RequestDispatcher#forward}, the server path in the * reconstructed URL must reflect the path used to obtain the RequestDispatcher, and not the server path specified by * the client. * @@ -610,8 +610,8 @@ public interface HttpServletRequest extends ServletRequest { * Part in the request is larger than maxFileSize, or there is no * @MultipartConfig or multipart-config in deployment descriptors * - * @see jakarta.servlet.annotation.MultipartConfig#maxFileSize - * @see jakarta.servlet.annotation.MultipartConfig#maxRequestSize + * @see javax.servlet.annotation.MultipartConfig#maxFileSize + * @see javax.servlet.annotation.MultipartConfig#maxRequestSize * * @since Servlet 3.0 */ @@ -631,8 +631,8 @@ public interface HttpServletRequest extends ServletRequest { * Part in the request is larger than maxFileSize, or there is no * @MultipartConfig or multipart-config in deployment descriptors * - * @see jakarta.servlet.annotation.MultipartConfig#maxFileSize - * @see jakarta.servlet.annotation.MultipartConfig#maxRequestSize + * @see javax.servlet.annotation.MultipartConfig#maxFileSize + * @see javax.servlet.annotation.MultipartConfig#maxRequestSize * * @since Servlet 3.0 */ @@ -651,8 +651,8 @@ public interface HttpServletRequest extends ServletRequest { * @exception IOException if an I/O error occurred during the upgrade * @exception ServletException if the given handlerClass fails to be instantiated * - * @see jakarta.servlet.http.HttpUpgradeHandler - * @see jakarta.servlet.http.WebConnection + * @see javax.servlet.http.HttpUpgradeHandler + * @see javax.servlet.http.WebConnection * * @since Servlet 3.1 */ diff --git a/api/src/main/java/jakarta/servlet/http/HttpServletRequestWrapper.java b/api/src/main/java/jakarta/servlet/http/HttpServletRequestWrapper.java index 469c540..96d23d5 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpServletRequestWrapper.java +++ b/api/src/main/java/jakarta/servlet/http/HttpServletRequestWrapper.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequestWrapper; +import javax.servlet.ServletException; +import javax.servlet.ServletRequestWrapper; import java.io.IOException; import java.util.*; @@ -31,7 +31,7 @@ import java.util.*; * This class implements the Wrapper or Decorator pattern. Methods default to calling through to the wrapped request * object. * - * @see jakarta.servlet.http.HttpServletRequest + * @see javax.servlet.http.HttpServletRequest * @since Servlet 2.3 */ public class HttpServletRequestWrapper extends ServletRequestWrapper implements HttpServletRequest { diff --git a/api/src/main/java/jakarta/servlet/http/HttpServletResponse.java b/api/src/main/java/jakarta/servlet/http/HttpServletResponse.java index 632a20a..47ba4e7 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpServletResponse.java +++ b/api/src/main/java/jakarta/servlet/http/HttpServletResponse.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; -import jakarta.servlet.ServletResponse; +import javax.servlet.ServletResponse; import java.io.IOException; import java.util.Collection; import java.util.Map; @@ -36,7 +36,7 @@ import java.util.function.Supplier; * * @author Various * - * @see jakarta.servlet.ServletResponse + * @see javax.servlet.ServletResponse * */ public interface HttpServletResponse extends ServletResponse { diff --git a/api/src/main/java/jakarta/servlet/http/HttpServletResponseWrapper.java b/api/src/main/java/jakarta/servlet/http/HttpServletResponseWrapper.java index a7c248b..10e4f1a 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpServletResponseWrapper.java +++ b/api/src/main/java/jakarta/servlet/http/HttpServletResponseWrapper.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; -import jakarta.servlet.ServletResponseWrapper; +import javax.servlet.ServletResponseWrapper; import java.io.IOException; import java.util.Collection; import java.util.Map; @@ -33,7 +33,7 @@ import java.util.function.Supplier; * @author Various * @since Servlet 2.3 * - * @see jakarta.servlet.http.HttpServletResponse + * @see javax.servlet.http.HttpServletResponse */ public class HttpServletResponseWrapper extends ServletResponseWrapper implements HttpServletResponse { diff --git a/api/src/main/java/jakarta/servlet/http/HttpSession.java b/api/src/main/java/jakarta/servlet/http/HttpSession.java index 8f627df..9729d4f 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpSession.java +++ b/api/src/main/java/jakarta/servlet/http/HttpSession.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; -import jakarta.servlet.ServletContext; +import javax.servlet.ServletContext; import java.util.Enumeration; /** diff --git a/api/src/main/java/jakarta/servlet/http/HttpSessionActivationListener.java b/api/src/main/java/jakarta/servlet/http/HttpSessionActivationListener.java index 21650e4..30a4370 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpSessionActivationListener.java +++ b/api/src/main/java/jakarta/servlet/http/HttpSessionActivationListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; import java.util.EventListener; diff --git a/api/src/main/java/jakarta/servlet/http/HttpSessionAttributeListener.java b/api/src/main/java/jakarta/servlet/http/HttpSessionAttributeListener.java index 9198bd6..4dbb998 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpSessionAttributeListener.java +++ b/api/src/main/java/jakarta/servlet/http/HttpSessionAttributeListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; import java.util.EventListener; @@ -25,8 +25,8 @@ import java.util.EventListener; * *

    * In order to receive these notification events, the implementation class must be either declared in the deployment - * descriptor of the web application, annotated with {@link jakarta.servlet.annotation.WebListener}, or registered via - * one of the addListener methods defined on {@link jakarta.servlet.ServletContext}. + * descriptor of the web application, annotated with {@link javax.servlet.annotation.WebListener}, or registered via + * one of the addListener methods defined on {@link javax.servlet.ServletContext}. * *

    * The order in which implementations of this interface are invoked is unspecified. diff --git a/api/src/main/java/jakarta/servlet/http/HttpSessionBindingEvent.java b/api/src/main/java/jakarta/servlet/http/HttpSessionBindingEvent.java index aa24337..53a37d2 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpSessionBindingEvent.java +++ b/api/src/main/java/jakarta/servlet/http/HttpSessionBindingEvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; /** * diff --git a/api/src/main/java/jakarta/servlet/http/HttpSessionBindingListener.java b/api/src/main/java/jakarta/servlet/http/HttpSessionBindingListener.java index 13a65ec..0d89f38 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpSessionBindingListener.java +++ b/api/src/main/java/jakarta/servlet/http/HttpSessionBindingListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; import java.util.EventListener; diff --git a/api/src/main/java/jakarta/servlet/http/HttpSessionContext.java b/api/src/main/java/jakarta/servlet/http/HttpSessionContext.java index 7a9d6c7..c73cb16 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpSessionContext.java +++ b/api/src/main/java/jakarta/servlet/http/HttpSessionContext.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; import java.util.Enumeration; diff --git a/api/src/main/java/jakarta/servlet/http/HttpSessionEvent.java b/api/src/main/java/jakarta/servlet/http/HttpSessionEvent.java index 4166869..6cbd10a 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpSessionEvent.java +++ b/api/src/main/java/jakarta/servlet/http/HttpSessionEvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; /** * This is the class representing event notifications for changes to sessions within a web application. diff --git a/api/src/main/java/jakarta/servlet/http/HttpSessionIdListener.java b/api/src/main/java/jakarta/servlet/http/HttpSessionIdListener.java index 657fa5d..dcbff80 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpSessionIdListener.java +++ b/api/src/main/java/jakarta/servlet/http/HttpSessionIdListener.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.http; +package javax.servlet.http; import java.util.EventListener; @@ -24,8 +24,8 @@ import java.util.EventListener; * *

    * In order to receive these notification events, the implementation class must be either declared in the deployment - * descriptor of the web application, annotated with {@link jakarta.servlet.annotation.WebListener}, or registered via - * one of the addListener methods defined on {@link jakarta.servlet.ServletContext}. + * descriptor of the web application, annotated with {@link javax.servlet.annotation.WebListener}, or registered via + * one of the addListener methods defined on {@link javax.servlet.ServletContext}. * *

    * The order in which implementations of this interface are invoked is unspecified. diff --git a/api/src/main/java/jakarta/servlet/http/HttpSessionListener.java b/api/src/main/java/jakarta/servlet/http/HttpSessionListener.java index 0d12db7..bc7bc64 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpSessionListener.java +++ b/api/src/main/java/jakarta/servlet/http/HttpSessionListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; import java.util.EventListener; @@ -25,8 +25,8 @@ import java.util.EventListener; * *

    * In order to receive these notification events, the implementation class must be either declared in the deployment - * descriptor of the web application, annotated with {@link jakarta.servlet.annotation.WebListener}, or registered via - * one of the addListener methods defined on {@link jakarta.servlet.ServletContext}. + * descriptor of the web application, annotated with {@link javax.servlet.annotation.WebListener}, or registered via + * one of the addListener methods defined on {@link javax.servlet.ServletContext}. * *

    * Implementations of this interface are invoked at their {@link #sessionCreated} method in the order in which they have diff --git a/api/src/main/java/jakarta/servlet/http/HttpUpgradeHandler.java b/api/src/main/java/jakarta/servlet/http/HttpUpgradeHandler.java index ea9e120..19c7fbe 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpUpgradeHandler.java +++ b/api/src/main/java/jakarta/servlet/http/HttpUpgradeHandler.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.http; +package javax.servlet.http; /** * This interface encapsulates the upgrade protocol processing. A HttpUpgradeHandler implementation would allow the diff --git a/api/src/main/java/jakarta/servlet/http/HttpUtils.java b/api/src/main/java/jakarta/servlet/http/HttpUtils.java index 572f853..fd6d9d6 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpUtils.java +++ b/api/src/main/java/jakarta/servlet/http/HttpUtils.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package jakarta.servlet.http; +package javax.servlet.http; -import jakarta.servlet.ServletInputStream; +import javax.servlet.ServletInputStream; import java.io.IOException; import java.util.Hashtable; import java.util.ResourceBundle; @@ -32,7 +32,7 @@ import java.util.StringTokenizer; @Deprecated public class HttpUtils { - private static final String LSTRING_FILE = "jakarta.servlet.http.LocalStrings"; + private static final String LSTRING_FILE = "javax.servlet.http.LocalStrings"; private static ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE); /** diff --git a/api/src/main/java/jakarta/servlet/http/MappingMatch.java b/api/src/main/java/jakarta/servlet/http/MappingMatch.java index 1246fcd..f5e1753 100644 --- a/api/src/main/java/jakarta/servlet/http/MappingMatch.java +++ b/api/src/main/java/jakarta/servlet/http/MappingMatch.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.http; +package javax.servlet.http; /** *

    diff --git a/api/src/main/java/jakarta/servlet/http/Part.java b/api/src/main/java/jakarta/servlet/http/Part.java index 50c1d7e..89f209c 100644 --- a/api/src/main/java/jakarta/servlet/http/Part.java +++ b/api/src/main/java/jakarta/servlet/http/Part.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.http; +package javax.servlet.http; import java.io.*; import java.util.*; @@ -75,7 +75,7 @@ public interface Part { * thus gaining a significant performance benefit. * * @param fileName The location into which the uploaded part should be stored. Relative paths are relative to - * {@link jakarta.servlet.MultipartConfigElement#getLocation()}. Absolute paths are used as provided. Note: that this is + * {@link javax.servlet.MultipartConfigElement#getLocation()}. Absolute paths are used as provided. Note: that this is * a system dependent string and URI notation may not be acceptable on all systems. For portability, this string should * be generated with the File or Path APIs. * diff --git a/api/src/main/java/jakarta/servlet/http/PushBuilder.java b/api/src/main/java/jakarta/servlet/http/PushBuilder.java index 821e857..cc6ba43 100644 --- a/api/src/main/java/jakarta/servlet/http/PushBuilder.java +++ b/api/src/main/java/jakarta/servlet/http/PushBuilder.java @@ -15,7 +15,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.http; +package javax.servlet.http; import java.util.Set; diff --git a/api/src/main/java/jakarta/servlet/http/WebConnection.java b/api/src/main/java/jakarta/servlet/http/WebConnection.java index a045f1e..6ebcca2 100644 --- a/api/src/main/java/jakarta/servlet/http/WebConnection.java +++ b/api/src/main/java/jakarta/servlet/http/WebConnection.java @@ -15,10 +15,10 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package jakarta.servlet.http; +package javax.servlet.http; -import jakarta.servlet.ServletInputStream; -import jakarta.servlet.ServletOutputStream; +import javax.servlet.ServletInputStream; +import javax.servlet.ServletOutputStream; import java.io.IOException; /**