diff --git a/api/src/main/java/jakarta/servlet/AsyncContext.java b/api/src/main/java/jakarta/servlet/AsyncContext.java index 2f96200..b9e3b82 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. 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..652e79c 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; diff --git a/api/src/main/java/jakarta/servlet/GenericServlet.java b/api/src/main/java/jakarta/servlet/GenericServlet.java index eb3b42a..662a0e0 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; 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..70fc1aa 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; 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..14bf368 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; diff --git a/api/src/main/java/jakarta/servlet/Servlet.java b/api/src/main/java/jakarta/servlet/Servlet.java index 3e9bfa4..ca48dd2 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; 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..d895ad0 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; diff --git a/api/src/main/java/jakarta/servlet/ServletContext.java b/api/src/main/java/jakarta/servlet/ServletContext.java index 7b61ed0..4ddcffc 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; 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..d530d49 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; 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..f214a17 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; 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..c497e03 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; diff --git a/api/src/main/java/jakarta/servlet/ServletRegistration.java b/api/src/main/java/jakarta/servlet/ServletRegistration.java index cd24cea..8f2e9f1 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.*; diff --git a/api/src/main/java/jakarta/servlet/ServletRequest.java b/api/src/main/java/jakarta/servlet/ServletRequest.java index 8dbfba7..afa71cb 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.*; 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..e1c1797 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; 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..35ffd2a 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; diff --git a/api/src/main/java/jakarta/servlet/ServletRequestWrapper.java b/api/src/main/java/jakarta/servlet/ServletRequestWrapper.java index 73b94ab..3a0f70d 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; 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..ab5d2eb 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; 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..39fb121 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. 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..03b1450 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; diff --git a/api/src/main/java/jakarta/servlet/annotation/HandlesTypes.java b/api/src/main/java/jakarta/servlet/annotation/HandlesTypes.java index 96f6510..54c615a 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; 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..4c3dd40 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; 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..968f997 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; 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..73af9e5 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; diff --git a/api/src/main/java/jakarta/servlet/annotation/WebServlet.java b/api/src/main/java/jakarta/servlet/annotation/WebServlet.java index cc6169d..622351c 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; 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..74da0d1 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; diff --git a/api/src/main/java/jakarta/servlet/http/HttpFilter.java b/api/src/main/java/jakarta/servlet/http/HttpFilter.java index 9990e06..4bf48e7 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; /** diff --git a/api/src/main/java/jakarta/servlet/http/HttpServlet.java b/api/src/main/java/jakarta/servlet/http/HttpServlet.java index 8fcd11a..93dbb3a 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; 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..75271b9 100644 --- a/api/src/main/java/jakarta/servlet/http/HttpServletRequest.java +++ b/api/src/main/java/jakarta/servlet/http/HttpServletRequest.java @@ -16,11 +16,11 @@ * 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.*; diff --git a/api/src/main/java/jakarta/servlet/http/HttpServletRequestWrapper.java b/api/src/main/java/jakarta/servlet/http/HttpServletRequestWrapper.java index 469c540..30b128d 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.*; diff --git a/api/src/main/java/jakarta/servlet/http/HttpServletResponse.java b/api/src/main/java/jakarta/servlet/http/HttpServletResponse.java index 632a20a..e899d4c 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; diff --git a/api/src/main/java/jakarta/servlet/http/HttpServletResponseWrapper.java b/api/src/main/java/jakarta/servlet/http/HttpServletResponseWrapper.java index a7c248b..ecbe88c 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; 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..ebca3db 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; 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..769a323 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; diff --git a/api/src/main/java/jakarta/servlet/http/HttpSessionListener.java b/api/src/main/java/jakarta/servlet/http/HttpSessionListener.java index 0d12db7..f73f7b7 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; 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..7245876 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; 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..a719274 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.*; 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; /**