Jakarta Servlet API transition
Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/servlet/CheckAccessLog.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/servlet/CheckAccessLog.java
index 2544071..5d9013b 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/servlet/CheckAccessLog.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/servlet/CheckAccessLog.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CheckAccessLog extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/servlet/CheckAccessLog.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/servlet/CheckAccessLog.java
index 10a79cf..a859212 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/servlet/CheckAccessLog.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/servlet/CheckAccessLog.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CheckAccessLog extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/servlet/CheckAccessLog.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/servlet/CheckAccessLog.java
index aaf2bb6..34a00c1 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/servlet/CheckAccessLog.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/servlet/CheckAccessLog.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CheckAccessLog extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/servlet/ServletTest.java
index a08b8c0..5dec147 100644
--- a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
diff --git a/appserver/tests/appserv-tests/devtests/web/bodyTag/servlet/mypack/MyBody.java b/appserver/tests/appserv-tests/devtests/web/bodyTag/servlet/mypack/MyBody.java
index 91fe1c2..2dce391 100644
--- a/appserver/tests/appserv-tests/devtests/web/bodyTag/servlet/mypack/MyBody.java
+++ b/appserver/tests/appserv-tests/devtests/web/bodyTag/servlet/mypack/MyBody.java
@@ -16,8 +16,8 @@
package mypack;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.PageContext;
public class MyBody extends BodyTagSupport {
diff --git a/appserver/tests/appserv-tests/devtests/web/broken_webapp/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/broken_webapp/servlet/ServletTest.java
index faa0f1c..5f5f378 100644
--- a/appserver/tests/appserv-tests/devtests/web/broken_webapp/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/broken_webapp/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/servlet/DispatchFrom.java b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/servlet/DispatchFrom.java
index dccca78..6f4dffb 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/servlet/DispatchFrom.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/servlet/DispatchFrom.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class DispatchFrom extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/servlet/DispatchTo.java b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/servlet/DispatchTo.java
index 9c2d767..9123c27 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/servlet/DispatchTo.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/servlet/DispatchTo.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class DispatchTo extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHang/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/cacheHang/servlet/test/TestServlet.java
index 9677d56..ee4d169 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHang/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHang/servlet/test/TestServlet.java
@@ -16,9 +16,9 @@
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
+import jakarta.servlet.http.*;
@WebServlet(name="hello", urlPatterns="/hello")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHang/servlet/test/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/cacheHang/servlet/test/TestServlet2.java
index 9fb6626..cc6b21e 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHang/servlet/test/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHang/servlet/test/TestServlet2.java
@@ -16,9 +16,9 @@
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
+import jakarta.servlet.http.*;
@WebServlet(name="hello2", urlPatterns="/hello2")
public class TestServlet2 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/helpers/MyCacheHelper.java b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/helpers/MyCacheHelper.java
index 2a7de64..1c18db2 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/helpers/MyCacheHelper.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/helpers/MyCacheHelper.java
@@ -23,8 +23,8 @@
import com.sun.appserv.web.cache.*;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
public class MyCacheHelper implements CacheHelper {
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/servlets/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/servlets/TestServlet.java
index 230a7ef..026f0b0 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/servlets/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/servlets/TestServlet.java
@@ -17,8 +17,8 @@
package servlets;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/ServletTest.java
index 214ed8b..35b8b61 100644
--- a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet{
diff --git a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/servlet/ServletTest.java
index ca72a59..9c65473 100644
--- a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/servlet/TestServlet.java
index 39bf8fe..6013b69 100644
--- a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/docroot/example/HelloWorldTag.java b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/docroot/example/HelloWorldTag.java
index e020f89..7a165a2 100644
--- a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/docroot/example/HelloWorldTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/docroot/example/HelloWorldTag.java
@@ -16,10 +16,10 @@
package example;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.SkipPageException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.*;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.SkipPageException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.*;
import java.io.IOException;
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/servlet/TestServlet.java
index fd66768..c22efda 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/servlet/TestServlet.java
@@ -17,8 +17,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/cometEcho/servlet/CometEchoServlet.java b/appserver/tests/appserv-tests/devtests/web/cometEcho/servlet/CometEchoServlet.java
index 9127480..9896c9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/cometEcho/servlet/CometEchoServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/cometEcho/servlet/CometEchoServlet.java
@@ -17,11 +17,11 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.glassfish.grizzly.comet.CometContext;
import org.glassfish.grizzly.comet.CometEngine;
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/servlet/TestServlet.java
index b56c794..aac9d12 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.apache.commons.digester.Digester;
import org.xml.sax.InputSource;
import mypackage.*;
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLogging/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/commonsLogging/servlet/From.java
index db39adb..f6445e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLogging/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLogging/servlet/From.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class From extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLogging/servlet/To.java b/appserver/tests/appserv-tests/devtests/web/commonsLogging/servlet/To.java
index bad0f05..f3144f2 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLogging/servlet/To.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLogging/servlet/To.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class To extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/servlet/TestServlet.java
index 79c6d53..8964c36 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/contentlength/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/contentlength/servlet/ServletTest.java
index d4d7797..78751a7 100644
--- a/appserver/tests/appserv-tests/devtests/web/contentlength/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contentlength/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
@@ -59,11 +59,11 @@
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/servlet/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/servlet/CreateSession.java
index 1465d72..21dd5c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/servlet/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/servlet/CreateSession.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/servlet/SetRequestedSessionCookiePathValve.java b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/servlet/SetRequestedSessionCookiePathValve.java
index d5ee1c6..3e55f89 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/servlet/SetRequestedSessionCookiePathValve.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/servlet/SetRequestedSessionCookiePathValve.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
import org.apache.catalina.valves.ValveBase;
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/ServletTest.java
index 52e1aa8..d21827c 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
@@ -51,11 +51,11 @@
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/TestListener.java b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/TestListener.java
index 840af00..5a99c0b 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/TestListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/TestListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
import org.apache.catalina.*;
public class TestListener implements LifecycleListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/ServletTest.java
index 52e1aa8..d21827c 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
@@ -51,11 +51,11 @@
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/TestListener.java b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/TestListener.java
index 840af00..5a99c0b 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/TestListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/TestListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
import org.apache.catalina.*;
public class TestListener implements LifecycleListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/ServletTest.java
index fa73a01..57f89be 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
@@ -48,11 +48,11 @@
System.out.println("[Servlet.doPost]");
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestListener.java b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestListener.java
index d5d5ecc..333af82 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
import org.apache.catalina.*;
public class TestListener implements LifecycleListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestServlet.java
index 8dd49bc..334ac3c 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/servlet/CreateCookie.java b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/servlet/CreateCookie.java
index bf7db8f..06e0e4a 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/servlet/CreateCookie.java
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/servlet/CreateCookie.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateCookie extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/servlet/GetCookie.java b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/servlet/GetCookie.java
index 152fd16..0e46a9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/servlet/GetCookie.java
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/servlet/GetCookie.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class GetCookie extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/servlet/CreateCookie.java b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/servlet/CreateCookie.java
index db90797..c8da7e1 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/servlet/CreateCookie.java
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/servlet/CreateCookie.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateCookie extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/servlet/GetCookie.java b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/servlet/GetCookie.java
index 768c99e..c8109d7 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/servlet/GetCookie.java
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/servlet/GetCookie.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class GetCookie extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/servlet/ServletTest.java
index a33ea2e..0f736a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/servlet/ServletTest.java
@@ -18,8 +18,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/CheckResult.java b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/CheckResult.java
index 09f2165..36572ef 100644
--- a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/CheckResult.java
+++ b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/CheckResult.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CheckResult extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/MyServletRequestListener.java b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/MyServletRequestListener.java
index 16c7199..03eb816 100644
--- a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/MyServletRequestListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/MyServletRequestListener.java
@@ -16,11 +16,11 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.ServletRequestListener;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletRequestListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
public class MyServletRequestListener implements ServletRequestListener {
public void requestInitialized(ServletRequestEvent sre) {
diff --git a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/servlet/From.java
index 653f17d..c809549 100644
--- a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/servlet/From.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class From extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/delegate/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/delegate/servlet/ServletTest.java
index a55a4af..ecea96b 100644
--- a/appserver/tests/appserv-tests/devtests/web/delegate/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/delegate/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet{
diff --git a/appserver/tests/appserv-tests/devtests/web/dirListing/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/dirListing/servlet/ServletTest.java
index 8ab08d2..860bcc4 100644
--- a/appserver/tests/appserv-tests/devtests/web/dirListing/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/dirListing/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
@@ -49,11 +49,11 @@
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/servlet/TestServlet.java
index cfb2294..7d500c4 100644
--- a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/servlet/TestServlet.java
index 434f1b7..1a76d80 100644
--- a/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/servlet/ServletTest.java
index d4d7797..78751a7 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
@@ -59,11 +59,11 @@
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/servlet/ServletTest.java
index d4d7797..78751a7 100644
--- a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
@@ -59,11 +59,11 @@
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/servlet/Foo.java b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/servlet/Foo.java
index 514cfaf..f2c6b99 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/servlet/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/servlet/Foo.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class Foo extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/servlet/TestException.java b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/servlet/TestException.java
index 4d7e18c..272a12e 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/servlet/TestException.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/servlet/TestException.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
/**
* Generic exception class to use for testing error page assertions.
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/servlet/TestServlet.java
index 08255a5..2e15030 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/servlet/TestServletException.java b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/servlet/TestServletException.java
index b04da5a..74874fb 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/servlet/TestServletException.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/servlet/TestServletException.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
public class TestServletException extends ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/HelloServlet.java b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/HelloServlet.java
index d1da1cf..ccad9ef 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/HelloServlet.java
@@ -23,11 +23,11 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/TestServlet.java
index ee81dbd..88ddcb5 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/build.xml b/appserver/tests/appserv-tests/devtests/web/explodedWar/build.xml
index 187e112..026f89a 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/build.xml
@@ -59,7 +59,7 @@
todir="${assemble.dir}/WEB-INF/lib/foo.jar/test"/>
<copy file="${web.xml}" todir="${assemble.dir}/WEB-INF"/>
<echo message="test.ServletContainerInitializerTest"
- file="${assemble.dir}/WEB-INF/lib/foo.jar/META-INF/services/javax.servlet.ServletContainerInitializer"/>
+ file="${assemble.dir}/WEB-INF/lib/foo.jar/META-INF/services/jakarta.servlet.ServletContainerInitializer"/>
<javac
srcdir="."
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest.java
index 0a4caa5..a71f636 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest.java
@@ -16,15 +16,15 @@
package test;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class FilterTest implements Filter{
public void destroy() {
System.out.println("[Filter.destroy]");
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, javax.servlet.ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
((HttpServletRequest)request).getSession(true).setAttribute("FILTER", "PASS");
@@ -32,7 +32,7 @@
}
- public void init(javax.servlet.FilterConfig filterConfig) throws javax.servlet.ServletException {
+ public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest2.java b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest2.java
index ba14ab0..ac702d5 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest2.java
@@ -16,9 +16,9 @@
package test;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter("/*")
public class FilterTest2 implements Filter{
@@ -27,7 +27,7 @@
System.out.println("[Filter.destroy]");
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, javax.servlet.ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
((HttpServletRequest)request).getSession(true).setAttribute("FILTER2", "PASS");
@@ -35,7 +35,7 @@
}
- public void init(javax.servlet.FilterConfig filterConfig) throws javax.servlet.ServletException {
+ public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletContainerInitializerTest.java b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletContainerInitializerTest.java
index e460921..e8ed9cd 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletContainerInitializerTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletContainerInitializerTest.java
@@ -17,8 +17,8 @@
package test;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
@HandlesTypes(WebServlet.class)
public class ServletContainerInitializerTest implements ServletContainerInitializer {
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletTest.java
index 44838a0..40d8be4 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletTest.java
@@ -17,9 +17,9 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
@WebServlet(name="/ServletTest", urlPatterns="/ServletTest")
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/servlet/test/TestServlet.java
index 287476f..3c6fa96 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/servlet/test/TestServlet.java
index 646f2c5..21dd752 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/servlet/TestFilter.java
index 166a8fa..48ff4c2 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/servlet/TestFilter.java
@@ -16,8 +16,8 @@
import java.io.IOException;
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(filterName="testFilter", urlPatterns="/*")
public class TestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/FilterTest.java
index 57a5e16..fcf3624 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/FilterTest.java
@@ -16,8 +16,8 @@
package test;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class FilterTest implements Filter{
private ServletContext context;
@@ -26,7 +26,7 @@
System.out.println("[Filter.destroy]");
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, javax.servlet.ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
@@ -35,7 +35,7 @@
}
- public void init(javax.servlet.FilterConfig filterConfig) throws javax.servlet.ServletException {
+ public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/ServletTest.java
index ef70056..a76f882 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/FilterTest.java
index 57a5e16..fcf3624 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/FilterTest.java
@@ -16,8 +16,8 @@
package test;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class FilterTest implements Filter{
private ServletContext context;
@@ -26,7 +26,7 @@
System.out.println("[Filter.destroy]");
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, javax.servlet.ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
@@ -35,7 +35,7 @@
}
- public void init(javax.servlet.FilterConfig filterConfig) throws javax.servlet.ServletException {
+ public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest.java
index 9fe46d3..d4a3174 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
@@ -73,11 +73,11 @@
rd.forward(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest2.java
index f517cce..db2cb50 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest2.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
@@ -50,11 +50,11 @@
rd.include(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest3.java
index 4b9b240..3e8d25b 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest3.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/servlet/TestServlet.java
index ae83dcf..6f733b3 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/servlet/AccessSession.java b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/servlet/AccessSession.java
index cfb57ed..e871aa1 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/servlet/AccessSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/servlet/AccessSession.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class AccessSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/FilterTest.java
index 19b7d9c..d4371f6 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/FilterTest.java
@@ -16,8 +16,8 @@
package test;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class FilterTest implements Filter{
private ServletContext context;
@@ -25,12 +25,12 @@
public void destroy() {
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, javax.servlet.ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
filterChain.doFilter(request, response);
}
- public void init(javax.servlet.FilterConfig filterConfig) throws javax.servlet.ServletException {
+ public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest.java
index 132c691..4cd933e 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest2.java
index 98a9d90..0a51ae2 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest2.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest2 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest3.java
index 86cf85d..26d5ca5 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest3.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest3 extends HttpServlet{
diff --git a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/docroot/process.jsp b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/docroot/process.jsp
index 786d58b..ff55bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/docroot/process.jsp
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/docroot/process.jsp
@@ -20,18 +20,18 @@
<%@ page import="java.util.*" %>
<%
-Object attrValue = request.getAttribute("javax.servlet.include.request_uri");
+Object attrValue = request.getAttribute("jakarta.servlet.include.request_uri");
if (!"/web-get-attribute-after-forward/process.jsp".equals(attrValue)) {
throw new Exception("Missing or wrong value for request attribute " +
- "javax.servlet.include.request_uri_name. Expected: " +
+ "jakarta.servlet.include.request_uri_name. Expected: " +
"\"/web-get-attribute-after-forward/process.jsp\", received: " +
attrValue);
}
-attrValue = request.getAttribute("javax.servlet.forward.request_uri");
+attrValue = request.getAttribute("jakarta.servlet.forward.request_uri");
if (!"/web-get-attribute-after-forward/forward.jsp".equals(attrValue)) {
throw new Exception("Missing or wrong value for request attribute " +
- "javax.servlet.forward.request_uri_name. Expected: " +
+ "jakarta.servlet.forward.request_uri_name. Expected: " +
"\"/web-get-attribute-after-forward/forward.jsp\", received: " +
attrValue);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/docroot/process.jsp b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/docroot/process.jsp
index 0162933..e1ca58a 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/docroot/process.jsp
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/docroot/process.jsp
@@ -19,9 +19,9 @@
<%@ page contentType="text/plain" %>
<%
-if (request.getAttribute("javax.servlet.include.query_string") == null){
+if (request.getAttribute("jakarta.servlet.include.query_string") == null){
throw new Exception("Missing request attribute " +
- "javax.servlet.include.query_string");
+ "jakarta.servlet.include.query_string");
}
%>
diff --git a/appserver/tests/appserv-tests/devtests/web/getLocalPort/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/getLocalPort/servlet/ServletTest.java
index 65a1379..68296c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/getLocalPort/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/getLocalPort/servlet/ServletTest.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/servlet/TestServlet.java
index 62a0971..bbbd28f 100644
--- a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index 9ee913f..03aeb46 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -24,11 +24,11 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
public class SFSBDriverServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index abbdbca..ed64b72 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -26,11 +26,11 @@
import java.util.ArrayList;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index 4b2a08c..a0b649a 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -26,11 +26,11 @@
import java.util.ArrayList;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index c4baf03..f81f933 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -26,11 +26,11 @@
import java.util.ArrayList;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/servlet/TestServlet.java
index 91f99d4..750cee5 100644
--- a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/servlet/ServletTest.java
index 2ae94c1..781bccf 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/servlet/ServletTest.java
@@ -18,8 +18,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/servlet/test/TestServlet.java
index cd4d5c7..0f21f56 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/servlet/test/TestServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/servlet/ServletTest.java
index b08f5c6..f31f884 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/servlet/ServletTest.java
@@ -18,12 +18,12 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/servlet/ParentServlet.java b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/servlet/ParentServlet.java
index 7929f19..d13c92b 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/servlet/ParentServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/servlet/ParentServlet.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.servlet.http.*;
+import jakarta.servlet.http.*;
public class ParentServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/servlet/TestServlet.java
index a0c8a35..cdb3647 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends ParentServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/servlet/test/TestServlet.java
index 11aad1a..65ccb10 100644
--- a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/WebTest.java b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/WebTest.java
index 89433a7..51f2b18 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/WebTest.java
@@ -20,7 +20,7 @@
/*
* Unit test for CR 4882996:
- * request.getAttribute("javax.servlet.error.request_uri") is not working ..
+ * request.getAttribute("jakarta.servlet.error.request_uri") is not working ..
*
* The following response body lines must be returned in order for this unit
* test to succeed:
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/docroot/404handler.jsp b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/docroot/404handler.jsp
index effe5d4..67ac9c3 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/docroot/404handler.jsp
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/docroot/404handler.jsp
@@ -16,7 +16,7 @@
--%>
-${requestScope["javax.servlet.error.request_uri"]}
-${requestScope["javax.servlet.error.status_code"]}
+${requestScope["jakarta.servlet.error.request_uri"]}
+${requestScope["jakarta.servlet.error.status_code"]}
${pageContext.request.requestURI}
${pageContext.request.requestURL}
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/WebTest.java b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/WebTest.java
index 1b2cb3d..93a7384 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/WebTest.java
@@ -20,7 +20,7 @@
/*
* Unit test for CR 4882996
- * (request.getAttribute("javax.servlet.error.request_uri") is not working).
+ * (request.getAttribute("jakarta.servlet.error.request_uri") is not working).
*
* The following response body lines must be returned in order for this unit
* test to succeed:
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/docroot/404handler.jsp b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/docroot/404handler.jsp
index effe5d4..67ac9c3 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/docroot/404handler.jsp
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/docroot/404handler.jsp
@@ -16,7 +16,7 @@
--%>
-${requestScope["javax.servlet.error.request_uri"]}
-${requestScope["javax.servlet.error.status_code"]}
+${requestScope["jakarta.servlet.error.request_uri"]}
+${requestScope["jakarta.servlet.error.status_code"]}
${pageContext.request.requestURI}
${pageContext.request.requestURL}
diff --git a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/servlet/ServletTest.java
index 1d6e81f..750862b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
diff --git a/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/servlet/TestServlet.java
index 7ada2fd..65fc018 100644
--- a/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.apache.catalina.connector.RequestFacade;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/servlet/taglib/EchoAttributesTag.java b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/servlet/taglib/EchoAttributesTag.java
index 7fe04de..82bc3e6 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/servlet/taglib/EchoAttributesTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/servlet/taglib/EchoAttributesTag.java
@@ -19,10 +19,10 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.tagext.DynamicAttributes;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.tagext.DynamicAttributes;
/**
* SimpleTag handler that echoes all its attributes
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/servlet/UpdateJsp.java b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/servlet/UpdateJsp.java
index 5b80d35..ce4a5b0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/servlet/UpdateJsp.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/servlet/UpdateJsp.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class UpdateJsp extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/servlet/org/apache/jsp/jsp/test_jsp.java b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/servlet/org/apache/jsp/jsp/test_jsp.java
index 446f495..6d94850 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/servlet/org/apache/jsp/jsp/test_jsp.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/servlet/org/apache/jsp/jsp/test_jsp.java
@@ -16,9 +16,9 @@
package org.apache.jsp.jsp;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.jsp.*;
public final class test_jsp extends org.apache.jasper.runtime.HttpJspBase
implements org.apache.jasper.runtime.JspSourceDependent {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/servlet/TestServlet.java
index 64aa0a9..8646efc 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/servlet/taglib/MyTag.java
index 7fbbdd2..ae209ba 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/servlet/taglib/MyTag.java
@@ -17,9 +17,9 @@
package taglib;
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
public class MyTag extends TagSupport {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/lib/taglib/HelloWorldSimpleTag.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/lib/taglib/HelloWorldSimpleTag.java
index 62a259d..78efcd4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/lib/taglib/HelloWorldSimpleTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/lib/taglib/HelloWorldSimpleTag.java
@@ -17,8 +17,8 @@
package taglib;
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.SimpleTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.SimpleTagSupport;
public class HelloWorldSimpleTag extends SimpleTagSupport {
public void doTag() throws JspException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/servlet/taglib/HelloWorldSimpleTag.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/servlet/taglib/HelloWorldSimpleTag.java
index 27ede4f..45386be 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/servlet/taglib/HelloWorldSimpleTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/servlet/taglib/HelloWorldSimpleTag.java
@@ -17,8 +17,8 @@
package taglib;
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.SimpleTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.SimpleTagSupport;
public class HelloWorldSimpleTag extends SimpleTagSupport {
public void doTag() throws JspException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/servlet/taglib/HelloWorldSimpleTag.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/servlet/taglib/HelloWorldSimpleTag.java
index 27ede4f..45386be 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/servlet/taglib/HelloWorldSimpleTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/servlet/taglib/HelloWorldSimpleTag.java
@@ -17,8 +17,8 @@
package taglib;
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.SimpleTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.SimpleTagSupport;
public class HelloWorldSimpleTag extends SimpleTagSupport {
public void doTag() throws JspException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/WebTest.java
index 9da6d1c..813439f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/WebTest.java
@@ -29,7 +29,7 @@
= "jsp-error-page-class-cast-exception";
private static final String EXPECTED
- = "javax.servlet.jsp.JspException: java.lang.Throwable: "
+ = "jakarta.servlet.jsp.JspException: java.lang.Throwable: "
+ "The cake fell in the mud";
private static SimpleReporterAdapter stat
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/docroot/foo_error.jsp b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/docroot/foo_error.jsp
index 1bd587d..835cc2a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/docroot/foo_error.jsp
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/docroot/foo_error.jsp
@@ -20,8 +20,8 @@
This is foo_error.jsp
<%
out.println("Status code:");
-out.println(request.getAttribute("javax.servlet.error.status_code"));
+out.println(request.getAttribute("jakarta.servlet.error.status_code"));
out.println("Exception:");
-out.println(request.getAttribute("javax.servlet.error.exception"));
+out.println(request.getAttribute("jakarta.servlet.error.exception"));
%>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/servlet/myfilter/MyFilter.java b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/servlet/myfilter/MyFilter.java
index 8a5c073..6a7ff29 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/servlet/myfilter/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/servlet/myfilter/MyFilter.java
@@ -17,8 +17,8 @@
package myfilter;
import java.io.IOException;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class MyFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/servlet/myfilter/MyServletResponseWrapper.java b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/servlet/myfilter/MyServletResponseWrapper.java
index ef1d819..9606c73 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/servlet/myfilter/MyServletResponseWrapper.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/servlet/myfilter/MyServletResponseWrapper.java
@@ -16,8 +16,8 @@
package myfilter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class MyServletResponseWrapper extends HttpServletResponseWrapper {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MySimpleTag.java b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MySimpleTag.java
index 9e6ae5d..66d8bd5 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MySimpleTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MySimpleTag.java
@@ -18,9 +18,9 @@
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.SimpleTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.SimpleTagSupport;
public class MySimpleTag extends SimpleTagSupport {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MyTagExtraInfo.java b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MyTagExtraInfo.java
index 2dda801..e80bda2 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MyTagExtraInfo.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MyTagExtraInfo.java
@@ -16,7 +16,7 @@
package taglib;
-import javax.servlet.jsp.tagext.*;
+import jakarta.servlet.jsp.tagext.*;
public class MyTagExtraInfo extends TagExtraInfo {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/WebTest.java
index 19423bd..4982bfd 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/WebTest.java
@@ -25,7 +25,7 @@
*
* This test case used to throw a java.lang.StringIndexOutOfBoundsException
* when reconstructing the URI of a JSP that is the target of a
- * RequestDispatcher.include() from the javax.servlet.include.XXX
+ * RequestDispatcher.include() from the jakarta.servlet.include.XXX
* request attributes.
*/
public class WebTest {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyExtraInfo.java b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyExtraInfo.java
index 44ebad9..14ac2f6 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyExtraInfo.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyExtraInfo.java
@@ -16,7 +16,7 @@
package taglib;
-import javax.servlet.jsp.tagext.*;
+import jakarta.servlet.jsp.tagext.*;
public class MyExtraInfo extends TagExtraInfo {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyTag.java
index 065ab98..ca1d351 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyTag.java
@@ -16,8 +16,8 @@
package taglib;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.*;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.*;
public class MyTag extends TagSupport {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/servlet/test/Test.java b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/servlet/test/Test.java
index 0a934e0..bea723b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/servlet/test/Test.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/servlet/test/Test.java
@@ -17,8 +17,8 @@
package test;
import jakarta.el.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
+import jakarta.servlet.jsp.*;
+import jakarta.servlet.jsp.tagext.*;
import java.io.*;
public class Test extends SimpleTagSupport {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/test_jsp.java b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/test_jsp.java
index d703118..88fdd2d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/test_jsp.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/test_jsp.java
@@ -16,9 +16,9 @@
package org.apache.jsp.jsp;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.jsp.*;
public final class test_jsp extends org.apache.jasper.runtime.HttpJspBase
implements org.apache.jasper.runtime.JspSourceDependent {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/taglib/MyListener.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/taglib/MyListener.java
index 2b78c64..ee5b0f7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/taglib/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/taglib/MyListener.java
@@ -16,9 +16,9 @@
package taglib;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
import javax.naming.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/test/TestServlet.java
index 32087c2..157e711 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/servlet/taglib/MySimpleTag.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/servlet/taglib/MySimpleTag.java
index 26cd708..8fc6444 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/servlet/taglib/MySimpleTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/servlet/taglib/MySimpleTag.java
@@ -18,9 +18,9 @@
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.SimpleTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.SimpleTagSupport;
import javax.naming.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/servlet/taglib/MyTag.java
index e1851ea..ce5a64b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/servlet/taglib/MyTag.java
@@ -19,9 +19,9 @@
import java.io.IOException;
import java.sql.Connection;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
import javax.naming.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/servlet/taglib/MyTag.java
index e1851ea..ce5a64b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/servlet/taglib/MyTag.java
@@ -19,9 +19,9 @@
import java.io.IOException;
import java.sql.Connection;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
import javax.naming.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/servlet/taglib/JspBodyContent.java b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/servlet/taglib/JspBodyContent.java
index 42ebda1..9396367 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/servlet/taglib/JspBodyContent.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/servlet/taglib/JspBodyContent.java
@@ -16,8 +16,8 @@
package taglib;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
public class JspBodyContent extends TagSupport {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/servlet/taglib/MyTag.java
index cbf7f14..ead8adb 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/servlet/taglib/MyTag.java
@@ -16,8 +16,8 @@
package taglib;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.*;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.*;
public class MyTag extends TagSupport {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/servlet/mypack/MySimpleTag.java b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/servlet/mypack/MySimpleTag.java
index a852eda..9e14b69 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/servlet/mypack/MySimpleTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/servlet/mypack/MySimpleTag.java
@@ -18,11 +18,11 @@
import java.io.IOException;
import java.io.StringWriter;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.SimpleTagSupport;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.JspFragment;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.SimpleTagSupport;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.JspFragment;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/servlet/taglib/MyTag.java
index 9b29866..1f53065 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/servlet/taglib/MyTag.java
@@ -18,8 +18,8 @@
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
import jakarta.annotation.Resource;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/servlet/taglib/MyTag.java
index 127fe39..440be8d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/servlet/taglib/MyTag.java
@@ -18,8 +18,8 @@
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
import jakarta.annotation.Resource;
import jakarta.annotation.PostConstruct;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/servlet/taglib/MyTag.java
index 9cca561..ed563bc 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/servlet/taglib/MyTag.java
@@ -18,7 +18,7 @@
import java.io.*;
import jakarta.annotation.PreDestroy;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.tagext.TagSupport;
public class MyTag extends TagSupport {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MySimpleTag.java b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MySimpleTag.java
index 9e6ae5d..66d8bd5 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MySimpleTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MySimpleTag.java
@@ -18,9 +18,9 @@
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.SimpleTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.SimpleTagSupport;
public class MySimpleTag extends SimpleTagSupport {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MyValidator.java b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MyValidator.java
index 6bcae84..2168757 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MyValidator.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MyValidator.java
@@ -19,9 +19,9 @@
import java.io.InputStream;
import java.io.IOException;
-import javax.servlet.jsp.tagext.PageData;
-import javax.servlet.jsp.tagext.TagLibraryValidator;
-import javax.servlet.jsp.tagext.ValidationMessage;
+import jakarta.servlet.jsp.tagext.PageData;
+import jakarta.servlet.jsp.tagext.TagLibraryValidator;
+import jakarta.servlet.jsp.tagext.ValidationMessage;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/servlet/taglib/MyTag.java
index d75647a..e83760d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/servlet/taglib/MyTag.java
@@ -17,8 +17,8 @@
package taglib;
import java.io.IOException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
public class MyTag extends TagSupport {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/servlet/taglib/MyTag.java
index d75647a..e83760d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/servlet/taglib/MyTag.java
@@ -17,8 +17,8 @@
package taglib;
import java.io.IOException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
public class MyTag extends TagSupport {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/servlet/mypack/MyBody.java b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/servlet/mypack/MyBody.java
index c60dccc..fb686e6 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/servlet/mypack/MyBody.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/servlet/mypack/MyBody.java
@@ -16,8 +16,8 @@
package mypack;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.PageContext;
public class MyBody extends BodyTagSupport {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/servlet/taglib/MyTag.java
index 133edc7..e3acf7f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/servlet/taglib/MyTag.java
@@ -17,9 +17,9 @@
package taglib;
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.TagSupport;
public class MyTag extends TagSupport {
diff --git a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/WebTest.java
index a956d52..f5e0202 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/WebTest.java
@@ -20,7 +20,7 @@
/*
* Unit test for https://glassfish.dev.java.net/issues/show_bug.cgi?id=871
- * ("[JSTL] Remove dependency of javax.servlet.jsp.jstl.fmt.LocaleSupport on
+ * ("[JSTL] Remove dependency of jakarta.servlet.jsp.jstl.fmt.LocaleSupport on
* RI classes"):
*
* Make sure this API still functions after removing its dependencies on the
diff --git a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/docroot/test1.jsp b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/docroot/test1.jsp
index c2c6f04..c6fc42a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/docroot/test1.jsp
+++ b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/docroot/test1.jsp
@@ -17,13 +17,13 @@
--%>
<%@ page import="java.util.*" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%
ResourceBundle rb = ResourceBundle.getBundle("TestResourceBundle",
new Locale("de"));
LocalizationContext lc = new LocalizationContext(rb);
- pageContext.setAttribute("javax.servlet.jsp.jstl.fmt.localizationContext.page",
+ pageContext.setAttribute("jakarta.servlet.jsp.jstl.fmt.localizationContext.page",
lc);
out.println(LocaleSupport.getLocalizedMessage(pageContext,
"greeting.morning"));
diff --git a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/docroot/test2.jsp b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/docroot/test2.jsp
index 5f5925c..f2a78ef 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/docroot/test2.jsp
+++ b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/docroot/test2.jsp
@@ -16,10 +16,10 @@
--%>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="jakarta.servlet.jsp.jstl.fmt.*" %>
<%
- pageContext.setAttribute("javax.servlet.jsp.jstl.fmt.localizationContext.page",
+ pageContext.setAttribute("jakarta.servlet.jsp.jstl.fmt.localizationContext.page",
"TestResourceBundle");
out.println(LocaleSupport.getLocalizedMessage(pageContext,
"greeting.evening"));
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/servlet/ServletTest.java
index 8ab08d2..860bcc4 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
@@ -49,11 +49,11 @@
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/FilterTest.java
index 575fc09..c004162 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/FilterTest.java
@@ -17,8 +17,8 @@
package test;
import java.io.IOException;
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(urlPatterns={"/test"})
public class FilterTest implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ListenerTest.java b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ListenerTest.java
index 55abdbd..81b588c 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ListenerTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ListenerTest.java
@@ -16,8 +16,8 @@
package test;
-import javax.servlet.*;
-import javax.servlet.annotation.WebListener;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebListener;
@WebListener
public class ListenerTest implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ServletTest.java
index b80a862..91ba6bc 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ServletTest.java
@@ -17,9 +17,9 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
@WebServlet("/test")
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/servlet/test/TestServlet.java
index 949a979..dfdb62c 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/servlet/test/TestServlet.java
@@ -16,9 +16,9 @@
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
+import jakarta.servlet.http.*;
@WebServlet(name="hello", urlPatterns="/hello")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/servlet/TestServlet.java
index ec401d8..9a56bf4 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/servlet/ServletTest.java
index aeb40fd..a39b525 100644
--- a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/servlet/ServletTest.java
@@ -19,10 +19,10 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/servlet/TestServlet.java
index 0007093..4b98587 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/servlet/TestServlet.java
index efefc71..e2372a7 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest.java
index cfe4e1e..ad99f3c 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest.java
@@ -18,8 +18,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest2.java
index 5cb51a2..83fdbef 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest2.java
@@ -18,8 +18,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest2 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorHttpService/servlet/StatusCodeServlet.java b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/servlet/StatusCodeServlet.java
index 11c305f..336bfbf 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorHttpService/servlet/StatusCodeServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/servlet/StatusCodeServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class StatusCodeServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/servlet/BadRequestServlet.java b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/servlet/BadRequestServlet.java
index 48ef34f..466a0fb 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/servlet/BadRequestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/servlet/BadRequestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class BadRequestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/servlet/TestServlet.java
index 1a2e30e..e2f10e7 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/servlet/BadRequestServlet.java b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/servlet/BadRequestServlet.java
index 48ef34f..466a0fb 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/servlet/BadRequestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/servlet/BadRequestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class BadRequestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/servlet/TestServlet.java
index b8a5b84..731715b 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/servlet/TestServlet.java
index c45c534..3e53dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/servlet/TestServlet.java
index c45c534..3e53dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/servlet/TestServlet.java
index c45c534..3e53dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/servlet/TestServlet.java
index a09f559..07daebc 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/servlet/TestServlet.java
index 46947df..194af75 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/FilterTest.java
index 57a5e16..fcf3624 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/FilterTest.java
@@ -16,8 +16,8 @@
package test;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class FilterTest implements Filter{
private ServletContext context;
@@ -26,7 +26,7 @@
System.out.println("[Filter.destroy]");
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, javax.servlet.ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
@@ -35,7 +35,7 @@
}
- public void init(javax.servlet.FilterConfig filterConfig) throws javax.servlet.ServletException {
+ public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest.java
index 9fe46d3..d4a3174 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
@@ -73,11 +73,11 @@
rd.forward(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest2.java
index f517cce..db2cb50 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest2.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
@@ -50,11 +50,11 @@
rd.include(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest3.java
index 4b9b240..3e8d25b 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest3.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest.java
index 3b7c8c6..0535fe4 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest2.java
index ddf9a78..68d876a 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest2.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest3.java
index ec15a6f..a92dab0 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest3.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest.java
index 18383c9..8edb3c2 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest.java
@@ -23,11 +23,11 @@
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest2.java
index 464e8bb..ae65275 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest2.java
@@ -24,10 +24,10 @@
import java.io.PrintWriter;
import java.util.Locale;
import java.text.Collator;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class ServletTest2 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/servlet/ServletTest.java
index 2ae94c1..781bccf 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/servlet/ServletTest.java
@@ -18,8 +18,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/servlet/ServletTest.java
index 2ae94c1..781bccf 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/servlet/ServletTest.java
@@ -18,8 +18,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/servlet/ServletTest.java
index 2ae94c1..781bccf 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/servlet/ServletTest.java
@@ -18,8 +18,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/Activator.java b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/Activator.java
index 61239cb..890612a 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/Activator.java
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/Activator.java
@@ -16,7 +16,7 @@
package sahoo.osgihttp.test1;
-import javax.servlet.http.*;
+import jakarta.servlet.http.*;
import java.io.*;
import java.net.*;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet1.java b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet1.java
index 2c822e2..f6535e7 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet1.java
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet1.java
@@ -18,12 +18,12 @@
import java.io.IOException;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class HelloWorldServlet1 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet2.java b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet2.java
index d779235..55499f9 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet2.java
@@ -18,12 +18,12 @@
import java.io.IOException;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class HelloWorldServlet2 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/servlet/TestServlet.java
index 31a8247..b4edaf6 100644
--- a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/servlet/ServletTest.java
index f276d9c..8bb7b98 100644
--- a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/servlet/ServletTest.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.net.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import com.sun.enterprise.security.ee.auth.login.ProgrammaticLogin;
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/servlet/TestServlet.java
index 8c64fe3..943d4fc 100644
--- a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.security.cert.X509Certificate;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
@@ -27,7 +27,7 @@
boolean passed = false;
X509Certificate[] certChain = (X509Certificate[])
- req.getAttribute("javax.servlet.request.X509Certificate");
+ req.getAttribute("jakarta.servlet.request.X509Certificate");
if (certChain != null && certChain.length == 1) {
String serial = certChain[0].getSerialNumber().toString(16);
if ("4276a40a".equals(serial)) {
diff --git a/appserver/tests/appserv-tests/devtests/web/queryString/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/queryString/servlet/ServletTest.java
index b006ceb..e49289f 100644
--- a/appserver/tests/appserv-tests/devtests/web/queryString/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/queryString/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
private static boolean isRedirected = false;
diff --git a/appserver/tests/appserv-tests/devtests/web/readLineIOException/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/readLineIOException/servlet/ServletTest.java
index 31078db..d63989a 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineIOException/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readLineIOException/servlet/ServletTest.java
@@ -23,10 +23,10 @@
import java.io.BufferedWriter;
import java.io.PrintWriter;
import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/readLineIOException/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/readLineIOException/servlet/ServletTest2.java
index aeede1a..9f8919f 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineIOException/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/readLineIOException/servlet/ServletTest2.java
@@ -27,10 +27,10 @@
import java.net.URL;
import java.net.HttpURLConnection;
import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class ServletTest2 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/servlet/EchoServlet.java b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/servlet/EchoServlet.java
index 29daaeb..d530493 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/servlet/EchoServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/servlet/EchoServlet.java
@@ -20,10 +20,10 @@
import java.io.IOException;
import java.io.Writer;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class EchoServlet extends HttpServlet {
protected void doPost(HttpServletRequest req, HttpServletResponse res)
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/FilterTest.java
index 57a5e16..fcf3624 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/FilterTest.java
@@ -16,8 +16,8 @@
package test;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class FilterTest implements Filter{
private ServletContext context;
@@ -26,7 +26,7 @@
System.out.println("[Filter.destroy]");
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, javax.servlet.ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
@@ -35,7 +35,7 @@
}
- public void init(javax.servlet.FilterConfig filterConfig) throws javax.servlet.ServletException {
+ public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest.java
index 9fe46d3..d4a3174 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
@@ -73,11 +73,11 @@
rd.forward(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest2.java
index f517cce..db2cb50 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest2.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
@@ -50,11 +50,11 @@
rd.include(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest3.java
index 4b9b240..3e8d25b 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest3.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/FilterTest.java
index 57a5e16..fcf3624 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/FilterTest.java
@@ -16,8 +16,8 @@
package test;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class FilterTest implements Filter{
private ServletContext context;
@@ -26,7 +26,7 @@
System.out.println("[Filter.destroy]");
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, javax.servlet.ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
@@ -35,7 +35,7 @@
}
- public void init(javax.servlet.FilterConfig filterConfig) throws javax.servlet.ServletException {
+ public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest.java
index 9fe46d3..d4a3174 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
@@ -73,11 +73,11 @@
rd.forward(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest2.java
index f517cce..db2cb50 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest2.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
@@ -50,11 +50,11 @@
rd.include(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest3.java
index 4b9b240..3e8d25b 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest3.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/servlet/TestServlet.java
index 9397db3..4e5b7eb 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
protected void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/From.java
index 0d10621..effdd97 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/From.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class From extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/To.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/To.java
index 01a38c9..d1ed378 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/To.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/To.java
@@ -19,8 +19,8 @@
import javax.crypto.*;
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class To extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/WebTest.java
index 4d8f1ad..fc0b994 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/WebTest.java
@@ -22,7 +22,7 @@
* Unit test for:
*
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=2210
- * ("ClassCastException: javax.servlet.http.NoBodyResponse, if target
+ * ("ClassCastException: jakarta.servlet.http.NoBodyResponse, if target
* servlet of a HEAD request performs rd.forward()")
*/
public class WebTest {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/From.java
index bd2d4e9..a73b2c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/From.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class From extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/To.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/To.java
index fa97032..5a0f5cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/To.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/To.java
@@ -19,8 +19,8 @@
import javax.crypto.*;
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class To extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/servlet/From.java
index b9f7c19..4537009 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/servlet/From.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class From extends GenericServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/servlet/To.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/servlet/To.java
index ba7d588..20c0a9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/servlet/To.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/servlet/To.java
@@ -19,8 +19,8 @@
import javax.crypto.*;
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class To extends GenericServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/From.java
index 0d10621..effdd97 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/From.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class From extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/To.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/To.java
index ee22250..ec86d5c 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/To.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/To.java
@@ -19,8 +19,8 @@
import javax.crypto.*;
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class To extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/From.java
index 0d10621..effdd97 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/From.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class From extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/To.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/To.java
index ffca7a2..65eb03c 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/To.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/To.java
@@ -19,8 +19,8 @@
import javax.crypto.*;
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class To extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/servlet/From.java
index 7d3b621..3ddf13a 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/servlet/From.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class From extends GenericServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/servlet/To.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/servlet/To.java
index ba7d588..20c0a9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/servlet/To.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/servlet/To.java
@@ -19,8 +19,8 @@
import javax.crypto.*;
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class To extends GenericServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/servlet/From.java
index 86d1fb2..1dea070 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/servlet/From.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class From extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/servlet/To.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/servlet/To.java
index c667054..2286789 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/servlet/To.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/servlet/To.java
@@ -15,14 +15,14 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class To extends HttpServlet {
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- if (req.getAttribute("javax.servlet.forward.request_uri") == null) {
+ if (req.getAttribute("jakarta.servlet.forward.request_uri") == null) {
throw new ServletException("Missing request attribute in " +
"first forward target");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/servlet/ToTo.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/servlet/ToTo.java
index 98e9458..d68178a 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/servlet/ToTo.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/servlet/ToTo.java
@@ -15,14 +15,14 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ToTo extends HttpServlet {
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- if (req.getAttribute("javax.servlet.forward.request_uri") == null) {
+ if (req.getAttribute("jakarta.servlet.forward.request_uri") == null) {
throw new ServletException("Missing request attribute in " +
"second forward target");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/servlet/HelloJapan.java b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/servlet/HelloJapan.java
index bcc6608..612937c 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/servlet/HelloJapan.java
+++ b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/servlet/HelloJapan.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.text.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class HelloJapan extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/servlet/HelloJapan.java b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/servlet/HelloJapan.java
index 561b62f..dc41b22 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/servlet/HelloJapan.java
+++ b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/servlet/HelloJapan.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class HelloJapan extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/servlet/ServletTest.java
index 07b356f..52c3a37 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/servlet/MyProtectedServlet.java b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/servlet/MyProtectedServlet.java
index 51f5a7b..2c332c3 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/servlet/MyProtectedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/servlet/MyProtectedServlet.java
@@ -23,8 +23,8 @@
import java.io.*;
import java.net.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
/**
*
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/TestServlet.java
index 530d7b8..fcb58fb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/TestServlet.java
@@ -16,9 +16,9 @@
import java.io.*;
import java.util.Enumeration;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.WebServlet;
@WebServlet("/")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter.java
index 2f487af..1e4daee 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter.java
@@ -20,14 +20,14 @@
import java.sql.SQLException;
import jakarta.annotation.Resource;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
import javax.sql.DataSource;
@WebFilter(urlPatterns={ "/" }, dispatcherTypes= { DispatcherType.REQUEST })
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2.java
index dceefbf..d79b440 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(urlPatterns={ "/abc" }, dispatcherTypes= { DispatcherType.REQUEST })
public class WFTestFilter2 implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2B.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2B.java
index 18844ba..4f9f684 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2B.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2B.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(urlPatterns={ "/" }, dispatcherTypes= { DispatcherType.REQUEST })
public class WFTestFilter2B implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter3.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter3.java
index 6cf415b..1972806 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter3.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter3.java
@@ -20,14 +20,14 @@
import java.sql.SQLException;
import jakarta.annotation.Resource;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
import javax.sql.DataSource;
@WebFilter(urlPatterns={ "/" }, dispatcherTypes= { DispatcherType.REQUEST })
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/servlet/test/TestServlet.java
index 0a5db8a..6be4342 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/servlet/test/TestServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/servlet/test/MyAsyncListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/servlet/test/MyAsyncListener.java
index 49f11a1..afd244a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/servlet/test/MyAsyncListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/servlet/test/MyAsyncListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyAsyncListener implements AsyncListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/servlet/test/TestServlet.java
index ce7d127..4f8c456 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
// for testing
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchFrom.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchFrom.java
index 79c7281..54f4eb0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchFrom.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchFrom.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class DispatchFrom extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchTo.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchTo.java
index cdd0aef..ced6548 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchTo.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchTo.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class DispatchTo extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/DispatchTarget.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/DispatchTarget.java
index b8bc7c8..04f65f5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/DispatchTarget.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/DispatchTarget.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class DispatchTarget extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/TestServlet.java
index 892bbb5..e44ddca 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/TestServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/servlet/ErrorPageServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/servlet/ErrorPageServlet.java
index 7fca416..f1f31a2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/servlet/ErrorPageServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/servlet/ErrorPageServlet.java
@@ -16,10 +16,10 @@
import java.io.IOException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/errorpage")
public class ErrorPageServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/servlet/ExceptionServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/servlet/ExceptionServlet.java
index 3956c8e..23ffa76 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/servlet/ExceptionServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/servlet/ExceptionServlet.java
@@ -14,10 +14,10 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/exception")
public class ExceptionServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/servlet/TestServlet.java
index ebd9567..d2b32eb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/servlet/TestServlet.java
@@ -16,14 +16,14 @@
import java.io.IOException;
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns={"/myurl"}, asyncSupported=true)
public class TestServlet extends HttpServlet implements AsyncListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/servlet/test/TestServlet.java
index 0fc72ed..32e6877 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/servlet/test/TestServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/servlet/test/MyFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/servlet/test/MyFilter.java
index 6bdeca0..21e5362 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/servlet/test/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/servlet/test/MyFilter.java
@@ -17,9 +17,9 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.*;
@WebFilter(urlPatterns = {"/test"}, asyncSupported = true)
public class MyFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/servlet/test/MyServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/servlet/test/MyServlet.java
index 94b1bf8..add8d9f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/servlet/test/MyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/servlet/test/MyServlet.java
@@ -17,9 +17,9 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.*;
@WebServlet(urlPatterns = {"/test"}, asyncSupported = true)
public class MyServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/servlet/test/TestServlet.java
index 098f1d1..b952906 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/servlet/test/TestServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet implements AsyncListener {
private static StringBuffer sb = new StringBuffer();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/servlet/test/TestServlet.java
index 432d380..7e6b19b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet implements AsyncListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestFilter.java
index 14c370a..b39a30e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestFilter.java
@@ -18,13 +18,13 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
+import jakarta.servlet.http.*;
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.annotation.WebInitParam;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.annotation.WebInitParam;
@WebFilter(urlPatterns={"/*"}, asyncSupported=true)
public class TestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestServlet1.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestServlet1.java
index 84778f6..e9b06d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestServlet1.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestServlet1.java
@@ -18,9 +18,9 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
+import jakarta.servlet.http.*;
@WebServlet(urlPatterns={"/test"}, asyncSupported=true)
public class TestServlet1 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestServlet2.java
index a5d2b61..925d912 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestServlet2.java
@@ -17,9 +17,9 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
+import jakarta.servlet.http.*;
@WebServlet(urlPatterns={"/test2"}, asyncSupported=true)
public class TestServlet2 extends HttpServlet implements AsyncListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/servlet/test/TestServlet.java
index f09f088..6b97f9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet implements AsyncListener {
private static StringBuffer sb = new StringBuffer();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/servlet/test/TestServlet.java
index 29a7747..04e4995 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/servlet/test/TestServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet implements AsyncListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/servlet/test/AsyncListenerTimeoutServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/servlet/test/AsyncListenerTimeoutServlet.java
index 8b34513..877ee62 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/servlet/test/AsyncListenerTimeoutServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/servlet/test/AsyncListenerTimeoutServlet.java
@@ -17,13 +17,13 @@
package test;
import java.io.IOException;
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class AsyncListenerTimeoutServlet extends HttpServlet implements AsyncListener {
private static StringBuffer sb = new StringBuffer();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/AsyncListenerImpl.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/AsyncListenerImpl.java
index 5a9c8eb..471a9f4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/AsyncListenerImpl.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/AsyncListenerImpl.java
@@ -17,9 +17,9 @@
package test;
import java.io.IOException;
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
public class AsyncListenerImpl implements AsyncListener {
private String path = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/AsyncListenerTimeoutServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/AsyncListenerTimeoutServlet.java
index 16dc58d..1ea87e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/AsyncListenerTimeoutServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/AsyncListenerTimeoutServlet.java
@@ -17,12 +17,12 @@
package test;
import java.io.IOException;
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns={"/AsyncListenerTimeoutServlet"}, asyncSupported=true)
public class AsyncListenerTimeoutServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/AsyncListenerTimeoutServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/AsyncListenerTimeoutServlet2.java
index a7943a7..c8a13f7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/AsyncListenerTimeoutServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/AsyncListenerTimeoutServlet2.java
@@ -17,12 +17,12 @@
package test;
import java.io.IOException;
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns={"/AsyncListenerTimeoutServlet2"}, asyncSupported=true)
public class AsyncListenerTimeoutServlet2 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/TestServlet.java
index 87c6c87..e42ebc4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/TestServlet.java
@@ -18,11 +18,11 @@
import java.io.PrintWriter;
import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/output")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/servlet/test/TestServlet.java
index 3e453b7..8eec401 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/servlet/test/TestServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/servlet/test/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/servlet/test/TestFilter.java
index ed89bcb..f103ff5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/servlet/test/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/servlet/test/TestFilter.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.*;
+import jakarta.servlet.*;
import javax.naming.*;
public class TestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/servlet/test/TestServlet.java
index 4884de7..d1bf15c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/servlet/test/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/servlet/test/TestFilter.java
index ed89bcb..f103ff5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/servlet/test/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/servlet/test/TestFilter.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.*;
+import jakarta.servlet.*;
import javax.naming.*;
public class TestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/servlet/test/TestServlet.java
index d0bae88..4293030 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/MyListener.java
index 095346e..fb8aeb5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/MyListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/NewFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/NewFilter.java
index 9ef5c16..7651494 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/NewFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/NewFilter.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.*;
+import jakarta.servlet.*;
import javax.naming.*;
public class NewFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/NewServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/NewServlet.java
index 3c39302..1035f78 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/NewServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/NewServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class NewServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/servlet/test/TestServlet.java
index c4a8d5a..bf19b7b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/BaseTestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/BaseTestServlet.java
index ee6e4b8..065dd65 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/BaseTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/BaseTestServlet.java
@@ -17,13 +17,13 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import static javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic.*;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import static jakarta.servlet.annotation.ServletSecurity.EmptyRoleSemantic.*;
@ServletSecurity(httpMethodConstraints={
@HttpMethodConstraint(value="POST", rolesAllowed={ "javaee" }),
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/BaseTestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/BaseTestServlet2.java
index 8bb97aa..d0cf276 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/BaseTestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/BaseTestServlet2.java
@@ -17,15 +17,15 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpConstraint;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/myurl2b")
@ServletSecurity(value=@HttpConstraint(rolesAllowed={ "javaee" }),
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/TestServlet.java
index 995ee83..3db7433 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/TestServlet.java
@@ -19,12 +19,12 @@
import jakarta.annotation.security.PermitAll;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/myurl")
@ServletSecurity(httpMethodConstraints={ @HttpMethodConstraint("OPTIONS") })
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/TestServlet2.java
index e386220..d80219c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/servlet/TestServlet2.java
@@ -17,11 +17,11 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/myurl2")
public class TestServlet2 extends BaseTestServlet2 {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet.java
index 9e63654..c80b281 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet.java
@@ -17,14 +17,14 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/myurl")
@ServletSecurity(httpMethodConstraints = { @HttpMethodConstraint("GET"),
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet2.java
index 7253a06..7e03bc6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet2.java
@@ -17,15 +17,15 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpConstraint;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/myurl2")
@ServletSecurity(value=@HttpConstraint(rolesAllowed={"javaee"}),
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet3.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet3.java
index d1530ee..c1dc482 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet3.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet3.java
@@ -17,14 +17,14 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/myurl3")
@ServletSecurity(@HttpConstraint(EmptyRoleSemantic.DENY))
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/servlet/SetHttpOnly.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/servlet/SetHttpOnly.java
index 3a4c683..c550000 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/servlet/SetHttpOnly.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/servlet/SetHttpOnly.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class SetHttpOnly extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/servlet/TestServlet.java
index ba1f44e..4c12533 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/AsyncDispatch.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/AsyncDispatch.java
index f927619..6821f6f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/AsyncDispatch.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/AsyncDispatch.java
@@ -21,15 +21,15 @@
import java.util.Timer;
import java.util.TimerTask;
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.DispatcherType;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns={"/asyncdispatch"}, asyncSupported=true)
public class AsyncDispatch extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward.java
index 6fb38a7..7772f1e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward.java
@@ -19,12 +19,12 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.DispatcherType;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns={"/dispatchforward"}, asyncSupported=true)
public class DispatchForward extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward0.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward0.java
index 85a08f3..4daa3bb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward0.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward0.java
@@ -19,12 +19,12 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.DispatcherType;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns={"/dispatchforward0"}, asyncSupported=true)
public class DispatchForward0 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/NamedDispatchForward0.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/NamedDispatchForward0.java
index 7e9cece..f7eead7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/NamedDispatchForward0.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/NamedDispatchForward0.java
@@ -19,12 +19,12 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.DispatcherType;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns={"/nameddispatchforward0"}, asyncSupported=true)
public class NamedDispatchForward0 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestFilter.java
index 8b3d108..863e187 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestFilter.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.annotation.WebInitParam;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.annotation.WebInitParam;
@WebFilter(urlPatterns={""}, initParams={ @WebInitParam(name="mesg", value="my filter") })
public class TestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestServlet.java
index de39c12..c8f8846 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestServlet.java
@@ -17,11 +17,11 @@
import java.io.IOException;
import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/WebTest.java
index ed97750..347c16f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/**
- * Unit test for javax.servlet.context.orderedLibs ServletContext
+ * Unit test for jakarta.servlet.context.orderedLibs ServletContext
* attribute.
*
* This unit test creates and deploys a WAR file that bundles two web
@@ -31,7 +31,7 @@
* with webFragment2 listed first, followed by webFragment1.
*
* Either ServletContextListener checks for the presence and contents of the
- * javax.servlet.context.orderedLibs ServletContext attribute and, if
+ * jakarta.servlet.context.orderedLibs ServletContext attribute and, if
* satisfied, registers a Servlet.
*
* The client then accesses each of the Servlets. If it fails to access either
@@ -57,7 +57,7 @@
public static void main(String[] args) {
stat.addDescription("Unit test for " +
- "javax.servlet.context.orderedLibs ServletContext attribute");
+ "jakarta.servlet.context.orderedLibs ServletContext attribute");
try {
new WebTest(args).doTest();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment1/WebFragmentServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment1/WebFragmentServlet.java
index aec1298..1049d7b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment1/WebFragmentServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment1/WebFragmentServlet.java
@@ -17,8 +17,8 @@
package webFragment1;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class WebFragmentServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment1/WebFragmentServletContextListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment1/WebFragmentServletContextListener.java
index c959170..453c584 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment1/WebFragmentServletContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment1/WebFragmentServletContextListener.java
@@ -17,7 +17,7 @@
package webFragment1;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class WebFragmentServletContextListener
implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment2/WebFragmentServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment2/WebFragmentServlet.java
index 9f6276c..4db17c6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment2/WebFragmentServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment2/WebFragmentServlet.java
@@ -17,8 +17,8 @@
package webFragment2;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class WebFragmentServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment2/WebFragmentServletContextListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment2/WebFragmentServletContextListener.java
index e2de983..f8656af 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment2/WebFragmentServletContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/servlet/webFragment2/WebFragmentServletContextListener.java
@@ -17,7 +17,7 @@
package webFragment2;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class WebFragmentServletContextListener
implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/servlet/test/TestServlet.java
index 1320a31..673ccb3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/servlet/test/TestServlet.java
@@ -18,12 +18,12 @@
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/test")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet.java
index 6e42d99..83fd2e6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet.java
@@ -18,11 +18,11 @@
import java.io.PrintWriter;
import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/myurl")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet2.java
index 9d32dc9..a4a0923 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet2.java
@@ -18,11 +18,11 @@
import java.io.PrintWriter;
import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/myurl2")
public class TestServlet2 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/TestServlet.java
index a98c225..abbd896 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/TestServlet.java
@@ -16,9 +16,9 @@
import java.io.*;
import java.util.Enumeration;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.WebServlet;
@WebServlet("/")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter.java
index 656dd52..d02ebdd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(urlPatterns={ "/" }, dispatcherTypes= { DispatcherType.REQUEST })
public class WFTestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter2.java
index f0fea1c..2dbb989 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter2.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(urlPatterns={ "/" }, dispatcherTypes= { DispatcherType.REQUEST })
public class WFTestFilter2 implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter3.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter3.java
index 878518c..5da6cf9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter3.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter3.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(urlPatterns={ "/" }, dispatcherTypes= { DispatcherType.REQUEST })
public class WFTestFilter3 implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/servlet/ServletTest.java
index 35a2c89..4562bb7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/servlet/ServletTest.java
@@ -19,9 +19,9 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.MultipartConfig;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.MultipartConfig;
@MultipartConfig(maxFileSize=20480)
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/src/main/java/test/ErrorTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/src/main/java/test/ErrorTest.java
index aa51b4f..f201e64 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/src/main/java/test/ErrorTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/src/main/java/test/ErrorTest.java
@@ -14,8 +14,8 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ErrorTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/src/upload.jsp b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/src/upload.jsp
index 3dfcbfb..f6cf297 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/src/upload.jsp
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/src/upload.jsp
@@ -16,7 +16,7 @@
--%>
-<%@ page import="javax.servlet.http.Part" %>
+<%@ page import="jakarta.servlet.http.Part" %>
Beginning
<%
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/TestServlet.java
index 530d7b8..fcb58fb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/TestServlet.java
@@ -16,9 +16,9 @@
import java.io.*;
import java.util.Enumeration;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.WebServlet;
@WebServlet("/")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter.java
index 14a546b..3ab24b9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(urlPatterns={ "/" }, dispatcherTypes= { DispatcherType.REQUEST })
public class WFTestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter2.java
index c3c3ed2..771d8d1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter2.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(urlPatterns={ "/" }, dispatcherTypes= { DispatcherType.REQUEST })
public class WFTestFilter2 implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter3.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter3.java
index 5f59035..e2ee839 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter3.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter3.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(urlPatterns={ "/" }, dispatcherTypes= { DispatcherType.REQUEST })
public class WFTestFilter3 implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter4.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter4.java
index c689172..4ae2928 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter4.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter4.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(urlPatterns={ "/" }, dispatcherTypes= { DispatcherType.REQUEST })
public class WFTestFilter4 implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter5.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter5.java
index 11d1d24..4535829 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter5.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter5.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(urlPatterns={ "/" }, dispatcherTypes= { DispatcherType.REQUEST })
public class WFTestFilter5 implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/servlet/TestServlet.java
index df544dc..44f75a0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/servlet/TestServlet.java
@@ -21,13 +21,13 @@
import java.util.Set;
import java.util.TreeSet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/test")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/servlet/TestServlet.java
index fa2dcf1..efdd1fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/servlet/TestServlet.java
@@ -19,11 +19,11 @@
import java.util.Set;
import java.util.TreeSet;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/test")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/applib1/com/sun/devtests/web/applib/ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/applib1/com/sun/devtests/web/applib/ServContInit.java
index 0ea35ad..5165f41 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/applib1/com/sun/devtests/web/applib/ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/applib1/com/sun/devtests/web/applib/ServContInit.java
@@ -17,8 +17,8 @@
package com.sun.devtests.web.applib;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
@HandlesTypes(WebServlet.class)
public class ServContInit implements ServletContainerInitializer {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/servlet/Test1Servlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/servlet/Test1Servlet.java
index 9c361ab..86a4250 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/servlet/Test1Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/servlet/Test1Servlet.java
@@ -19,9 +19,9 @@
import java.io.IOException;
import java.util.Enumeration;
-import javax.servlet.*;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
@WebServlet("/mytest1")
public class Test1Servlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
index 24ce6a6..a39597d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
@@ -17,8 +17,8 @@
package com.sun.devtests.web;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
@HandlesTypes(WebServlet.class)
public class SharedLib1ServContInit implements ServletContainerInitializer {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
index 2cccaca..275c90a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
@@ -17,8 +17,8 @@
package com.sun.devtests.web;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
public class SharedLib2ServContInit implements ServletContainerInitializer {
public SharedLib2ServContInit() {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
index 5a59aee..1d863d1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
@@ -17,8 +17,8 @@
package com.sun.devtests.web;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
@HandlesTypes(WebFilter.class)
public class SharedLib3ServContInit implements ServletContainerInitializer {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/Test1Servlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/Test1Servlet.java
index f2c10d5..74eea7d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/Test1Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/Test1Servlet.java
@@ -19,9 +19,9 @@
import java.io.IOException;
import java.util.Enumeration;
-import javax.servlet.*;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
@WebServlet("/mytest1")
public class Test1Servlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
index a19cc70..30d4787 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
@@ -17,8 +17,8 @@
package com.sun.devtests.web;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
import com.sun.devtests.web.common.*;
@HandlesTypes(CommonInterface.class)
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
index cc12f68..0fc60c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
@@ -17,8 +17,8 @@
package com.sun.devtests.web;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
@HandlesTypes(WebServlet.class)
public class SharedLib1ServContInit implements ServletContainerInitializer {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
index e3b8df9..9157c83 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
@@ -17,8 +17,8 @@
package com.sun.devtests.web;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
public class SharedLib2ServContInit implements ServletContainerInitializer {
public SharedLib2ServContInit() {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
index 8f53ae4..e3a4541 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
@@ -17,8 +17,8 @@
package com.sun.devtests.web;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
@HandlesTypes(WebFilter.class)
public class SharedLib3ServContInit implements ServletContainerInitializer {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib4/com/sun/devtests/web/SharedLib4ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib4/com/sun/devtests/web/SharedLib4ServContInit.java
index c8887f2..a3523f5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib4/com/sun/devtests/web/SharedLib4ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib4/com/sun/devtests/web/SharedLib4ServContInit.java
@@ -17,8 +17,8 @@
package com.sun.devtests.web;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
@HandlesTypes(jakarta.jws.WebService.class)
public class SharedLib4ServContInit implements ServletContainerInitializer {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/applib1/com/sun/devtests/web/applib/ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/applib1/com/sun/devtests/web/applib/ServContInit.java
index b4e4d8e..783e1a1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/applib1/com/sun/devtests/web/applib/ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/applib1/com/sun/devtests/web/applib/ServContInit.java
@@ -17,8 +17,8 @@
package com.sun.devtests.web.applib;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
@HandlesTypes(WebServlet.class)
public class ServContInit implements ServletContainerInitializer {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/servlet/Test1Servlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/servlet/Test1Servlet.java
index d95e771..591a548 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/servlet/Test1Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/servlet/Test1Servlet.java
@@ -19,9 +19,9 @@
import java.io.IOException;
import java.util.Enumeration;
-import javax.servlet.*;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
@WebServlet("/mytest1")
public class Test1Servlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/applib2/com/sun/devtests/web/applib/ServCont2Init.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/applib2/com/sun/devtests/web/applib/ServCont2Init.java
index b4ea91e..4beae3e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/applib2/com/sun/devtests/web/applib/ServCont2Init.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/applib2/com/sun/devtests/web/applib/ServCont2Init.java
@@ -17,8 +17,8 @@
package com.sun.devtests.web.applib;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.*;
@HandlesTypes(WebFilter.class)
public class ServCont2Init implements ServletContainerInitializer {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/Test2Servlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/Test2Servlet.java
index a79c5d6..fbd7903 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/Test2Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/Test2Servlet.java
@@ -19,9 +19,9 @@
import java.io.IOException;
import java.util.Enumeration;
-import javax.servlet.*;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
@WebServlet("/mytest2")
public class Test2Servlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/TestFilter.java
index b034cc6..b4e473f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/TestFilter.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.annotation.WebInitParam;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.annotation.WebInitParam;
@WebFilter(urlPatterns={"/mytest2"}, initParams={ @WebInitParam(name="mesg", value="my filter") })
public class TestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/servlet/test/MyServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/servlet/test/MyServlet.java
index 343aeea..db26ec9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/servlet/test/MyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/servlet/test/MyServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class MyServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/servlet/test/MyServletContainerInitializer.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/servlet/test/MyServletContainerInitializer.java
index 465d641..1ebd49f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/servlet/test/MyServletContainerInitializer.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/servlet/test/MyServletContainerInitializer.java
@@ -17,7 +17,7 @@
package test;
import java.util.Set;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyServletContainerInitializer
implements ServletContainerInitializer {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/servlet/test/MyServletContextListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/servlet/test/MyServletContextListener.java
index 16c16fe..73d6a55 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/servlet/test/MyServletContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/servlet/test/MyServletContextListener.java
@@ -16,7 +16,7 @@
package test;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyServletContextListener
implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/servlet/test/MyServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/servlet/test/MyServlet.java
index 2374050..9b5b310 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/servlet/test/MyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/servlet/test/MyServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class MyServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/servlet/test/MyServletContextListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/servlet/test/MyServletContextListener.java
index b6a7fc9..3b14a7e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/servlet/test/MyServletContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/servlet/test/MyServletContextListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyServletContextListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/servlet/test/NewServletRequestListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/servlet/test/NewServletRequestListener.java
index eea8842..098e34b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/servlet/test/NewServletRequestListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/servlet/test/NewServletRequestListener.java
@@ -17,7 +17,7 @@
package test;
import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class NewServletRequestListener implements ServletRequestListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/MyListener.java
index d68178e..cf19216 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/MyListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/NewFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/NewFilter.java
index 7e4da2b..2dd841d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/NewFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/NewFilter.java
@@ -17,7 +17,7 @@
package test;
import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class NewFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/NewServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/NewServlet.java
index d6dfbcb..56d60b6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/NewServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/NewServlet.java
@@ -20,8 +20,8 @@
import jakarta.annotation.Resource;
import jakarta.annotation.Resources;
import javax.naming.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.sql.DataSource;
@Resource(name="myDataSource4", type=DataSource.class)
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/MyListener.java
index 52a43f0..fe890bd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/MyListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/NewFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/NewFilter.java
index 948dcce..1b934a5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/NewFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/NewFilter.java
@@ -17,7 +17,7 @@
package test;
import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class NewFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/NewServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/NewServlet.java
index 5aa6806..583dd2d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/NewServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/NewServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class NewServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/MyListener.java
index cbb0665..daed16f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/MyListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/NewFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/NewFilter.java
index d0dd1ad..8717a60 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/NewFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/NewFilter.java
@@ -17,7 +17,7 @@
package test;
import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class NewFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/NewServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/NewServlet.java
index cd7a54c..c532450 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/NewServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/NewServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class NewServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/servlet/test/MyListener.java
index 2f32159..6ad5715 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/servlet/test/MyListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/servlet/test/NewServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/servlet/test/NewServlet.java
index bb5da55..0450387 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/servlet/test/NewServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/servlet/test/NewServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class NewServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyFilter.java
index 6e4a92f..f9c647a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyFilter.java
@@ -17,7 +17,7 @@
package test;
import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyListener.java
index f206581..c79c625 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyServlet.java
index f4b705d..e8342ea 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class MyServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyListener.java
index 058a577..9dcb272 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyServlet.java
index 2e91f24..27c03fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class MyServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/MyListener.java
index e62e1d4..c885d23 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/MyListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewFilter.java
index fed170d..6aa405f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewFilter.java
@@ -17,7 +17,7 @@
package test;
import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
import javax.naming.*;
import jakarta.annotation.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewServlet.java
index bd68701..6bf76e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewServlet.java
@@ -20,8 +20,8 @@
import jakarta.annotation.Resource;
import jakarta.annotation.Resources;
import javax.naming.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.sql.DataSource;
@Resource(name="myDataSource4", type=DataSource.class)
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/servlet/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/servlet/MyListener.java
index 1061c15..9ce8c8f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/servlet/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/servlet/MyListener.java
@@ -16,11 +16,11 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
-import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
+import jakarta.servlet.annotation.ServletSecurity.TransportGuarantee;
-@javax.servlet.annotation.WebListener
+@jakarta.servlet.annotation.WebListener
public class MyListener implements ServletContextListener {
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/servlet/NewServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/servlet/NewServlet.java
index ba4f8d1..542f321 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/servlet/NewServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/servlet/NewServlet.java
@@ -17,10 +17,10 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class NewServlet extends HttpServlet {
private String initParamValue;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/servlet/NewServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/servlet/NewServlet2.java
index 9d8e1bd..e25559c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/servlet/NewServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/servlet/NewServlet2.java
@@ -17,14 +17,14 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpConstraint;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@ServletSecurity(value=@HttpConstraint(rolesAllowed={ "javaee" }),
httpMethodConstraints={ @HttpMethodConstraint("GET"),
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/servlet/TestServlet.java
index d6720d9..3ae8453 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/servlet/TestServlet.java
index 25268a8..570466d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.net.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/servlet/TestServlet.java
index 92979d4..9af101b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/servlet/TestServlet.java
@@ -17,8 +17,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/MyListener.java
index c1275c5..dc11f03 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/MyListener.java
@@ -16,7 +16,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/TestServlet.java
index 20c8e6b..df10137 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/servlet/DispatchFrom.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/servlet/DispatchFrom.java
index d492fc2..3e1bdec 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/servlet/DispatchFrom.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/servlet/DispatchFrom.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class DispatchFrom extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/servlet/EmptyStringTarget.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/servlet/EmptyStringTarget.java
index 7d76de3..3d40854 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/servlet/EmptyStringTarget.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/servlet/EmptyStringTarget.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class EmptyStringTarget extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/servlet/MyDefault.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/servlet/MyDefault.java
index 1866beb..bc524f3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/servlet/MyDefault.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/servlet/MyDefault.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class MyDefault extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/ErrorTarget.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/ErrorTarget.java
index 689bac0..5fdee80 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/ErrorTarget.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/ErrorTarget.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ErrorTarget extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/ForwardTarget.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/ForwardTarget.java
index a35b2ca..1ef80d5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/ForwardTarget.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/ForwardTarget.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ForwardTarget extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/From.java
index 27295d4..81d554f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/From.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class From extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/IncludeTarget.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/IncludeTarget.java
index 6fff10a..afc80d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/IncludeTarget.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/servlet/IncludeTarget.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class IncludeTarget extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/servlet/ServletRequestListener1.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/servlet/ServletRequestListener1.java
index 5795c3b..4e9ad45 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/servlet/ServletRequestListener1.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/servlet/ServletRequestListener1.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.servlet.*;
+import jakarta.servlet.*;
public class ServletRequestListener1 implements ServletRequestListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/servlet/ServletRequestListener2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/servlet/ServletRequestListener2.java
index c01e0ac..5cd829d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/servlet/ServletRequestListener2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/servlet/ServletRequestListener2.java
@@ -14,7 +14,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.servlet.*;
+import jakarta.servlet.*;
public class ServletRequestListener2 implements ServletRequestListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/servlet/TestServlet.java
index daeb2ee..7d5fa9b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/servlet/test/TestServlet.java
index 39dc4aa..6b8edf4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/MyListener.java
index f0c44ca..279ad17 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/MyListener.java
@@ -16,10 +16,10 @@
import java.io.*;
import java.net.*;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.SessionCookieConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.SessionCookieConfig;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/TestServlet.java
index 2ec611f..d868fa1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
index b33f8b0..67b4f0c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/ConfigListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/ConfigListener.java
index 2d59e4d..1cf262c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/ConfigListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/ConfigListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class ConfigListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/CreateSession.java
index 2910ddb..de51e35 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/CreateSession.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/ConfigListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/ConfigListener.java
index 9776084..a42ca1a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/ConfigListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/ConfigListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class ConfigListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/CreateSession.java
index 21232c1..897957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/CreateSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/ResumeSession.java
index 404cc24..593bc24 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/ResumeSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class ResumeSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/CreateSession.java
index 21232c1..897957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/CreateSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/ResumeSession.java
index 404cc24..593bc24 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/ResumeSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class ResumeSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/CreateSession.java
index 21232c1..897957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/CreateSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/ResumeSession.java
index 404cc24..593bc24 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/ResumeSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class ResumeSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/servlet/test/MyListener.java
index 4a58132..aaa8cda 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/servlet/test/MyListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/servlet/test/RedirectFrom.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/servlet/test/RedirectFrom.java
index 97ae02d..3944ff4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/servlet/test/RedirectFrom.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/servlet/test/RedirectFrom.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class RedirectFrom extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/servlet/test/RedirectTo.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/servlet/test/RedirectTo.java
index 89be42b..502bb72 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/servlet/test/RedirectTo.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/servlet/test/RedirectTo.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class RedirectTo extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/servlet/test/MyListener.java
index 80dd01e..4cf96b3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/servlet/test/MyListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/servlet/test/RedirectFrom.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/servlet/test/RedirectFrom.java
index 97ae02d..3944ff4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/servlet/test/RedirectFrom.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/servlet/test/RedirectFrom.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class RedirectFrom extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/servlet/test/RedirectTo.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/servlet/test/RedirectTo.java
index 89be42b..502bb72 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/servlet/test/RedirectTo.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/servlet/test/RedirectTo.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class RedirectTo extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectFrom.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectFrom.java
index 97ae02d..3944ff4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectFrom.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectFrom.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class RedirectFrom extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectTo.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectTo.java
index 89be42b..502bb72 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectTo.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectTo.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class RedirectTo extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/servlet/TestServlet.java
index c4c737f..88617e7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/servlet/TestServlet.java
@@ -17,14 +17,14 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import static javax.servlet.annotation.ServletSecurity.TransportGuarantee.*;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import static jakarta.servlet.annotation.ServletSecurity.TransportGuarantee.*;
@WebServlet("/myurl")
@ServletSecurity(httpMethodConstraints={
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/servlet/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/servlet/TestServlet2.java
index 469fc54..e00ece5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/servlet/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/servlet/TestServlet2.java
@@ -17,15 +17,15 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import static javax.servlet.annotation.ServletSecurity.TransportGuarantee.*;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpConstraint;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import static jakarta.servlet.annotation.ServletSecurity.TransportGuarantee.*;
@WebServlet("/myurl2")
@ServletSecurity(value=@HttpConstraint(transportGuarantee=CONFIDENTIAL),
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/servlet/TestServlet3.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/servlet/TestServlet3.java
index 24695fa..59aef16 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/servlet/TestServlet3.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/servlet/TestServlet3.java
@@ -17,15 +17,15 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpConstraint;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.ServletSecurity.TransportGuarantee;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/myurl3")
@ServletSecurity(value=@HttpConstraint(rolesAllowed={ "javaee" } ),
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter.java
index e64ad23..642c75d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.annotation.WebInitParam;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.annotation.WebInitParam;
@WebFilter(urlPatterns={"/mytest"}, initParams={ @WebInitParam(name="mesg", value="my filter") })
public class TestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter2.java
index c825e7f..45dc3c2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter2.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.annotation.WebInitParam;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.annotation.WebInitParam;
@WebFilter(servletNames={"testServ"}, initParams={ @WebInitParam(name="mesg", value="my filter2") })
public class TestFilter2 implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestServlet.java
index 0e00410..38d97d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestServlet.java
@@ -17,11 +17,11 @@
import java.io.IOException;
import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(name="testServ", urlPatterns={"/mytest"})
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/TestServlet.java
index 5de5d10..79ec3ba 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/TestServlet.java
@@ -17,9 +17,9 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.WebServlet;
@WebServlet("/mytest")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/TestServlet2.java
index a8d9ffd..50ecda7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/TestServlet2.java
@@ -18,9 +18,9 @@
import java.io.*;
import jakarta.annotation.Resource;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.WebServlet;
@WebServlet("/mytest2")
public class TestServlet2 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestFilter.java
index 65b033f..9bd6c72 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestFilter.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(urlPatterns={ "/wftest", "/test2" }, dispatcherTypes= { DispatcherType.FORWARD, DispatcherType.REQUEST })
public class WFTestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestServlet.java
index 4cd9b89..2def3cd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestServlet.java
@@ -18,10 +18,10 @@
import java.io.*;
import java.util.Enumeration;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.WebInitParam;
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.WebInitParam;
+import jakarta.servlet.annotation.WebServlet;
@WebServlet(name="wftestServlet", urlPatterns={"/t"}, initParams={ @WebInitParam(name="mesg", value="hello a"), @WebInitParam(name="mesg3", value="hello3 a") })
public class WFTestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestServlet2.java
index deea8bd..8e9bed9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestServlet2.java
@@ -19,9 +19,9 @@
import java.io.*;
import java.util.Enumeration;
import jakarta.annotation.Resource;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.WebServlet;
@WebServlet(name="wftestServlet2", urlPatterns={"/wftest2"})
public class WFTestServlet2 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestServlet3.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestServlet3.java
index 519ea20..0e2da44 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestServlet3.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestServlet3.java
@@ -18,9 +18,9 @@
import java.io.*;
import java.util.Enumeration;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.WebServlet;
@WebServlet(name="wftestServlet3", urlPatterns={"/test2"})
public class WFTestServlet3 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/TestServlet.java
index bc2420f..539a79d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/TestServlet.java
@@ -18,9 +18,9 @@
import java.io.*;
import jakarta.ejb.EJB;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.WebServlet;
import wftest.WFStatelessBean;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/servlet/Bean.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/servlet/Bean.java
index 819e674..dc027a0 100755
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/servlet/Bean.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/servlet/Bean.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.util.Scanner;
import jakarta.faces.bean.ManagedBean;
-import javax.servlet.http.Part;
+import jakarta.servlet.http.Part;
@ManagedBean
public class Bean {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServlet.java
index d6db7b3..cbd709f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServlet.java
@@ -18,12 +18,12 @@
import java.io.PrintWriter;
import java.util.Enumeration;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/mytest")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServletContextListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServletContextListener.java
index 6120070..78205ce 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServletContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServletContextListener.java
@@ -14,11 +14,11 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
-@javax.servlet.annotation.WebListener
+@jakarta.servlet.annotation.WebListener
public class TestServletContextListener implements ServletContextListener {
public void contextInitialized(ServletContextEvent sce) {
System.out.println(">>> contextInitialized");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/servlet/TestServlet.java
index 764c7ac..e349cbd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/servlet/TestServlet.java
@@ -18,12 +18,12 @@
import java.io.PrintWriter;
import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebInitParam;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebInitParam;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(name="mytest",
urlPatterns={"/myurl"},
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestFilter.java
index 1f646a8..ccb5be0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestFilter.java
@@ -18,13 +18,13 @@
import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter("/mytest")
public class TestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestServlet.java
index 529a5f4..46b0a28 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestServlet.java
@@ -20,12 +20,12 @@
import java.io.PrintWriter;
import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebInitParam;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebInitParam;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(name="testServlet", urlPatterns={"/mytest"}, initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") })
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestFilter.java
index 4c9dc7d..9299fa7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestFilter.java
@@ -18,13 +18,13 @@
import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter("/mytest")
public class TestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestServlet.java
index 529a5f4..46b0a28 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestServlet.java
@@ -20,12 +20,12 @@
import java.io.PrintWriter;
import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebInitParam;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebInitParam;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(name="testServlet", urlPatterns={"/mytest"}, initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") })
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/WFTestFilter.java
index 79a3a9b..a5d6833 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/WFTestFilter.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(urlPatterns={ "/mytest2" }, dispatcherTypes= { DispatcherType.FORWARD, DispatcherType.REQUEST })
public class WFTestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/servlet/TestServlet.java
index e8e62d3..93e784b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/servlet/TestServlet.java
@@ -18,13 +18,13 @@
import java.io.PrintWriter;
import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns={"/myurl", "/myurl2"})
@ServletSecurity(httpMethodConstraints={ @HttpMethodConstraint("GET"),
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestFilter.java
index 0711619..da86db7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestFilter.java
@@ -18,13 +18,13 @@
import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter("/mytest")
public class TestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet.java
index 529a5f4..46b0a28 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet.java
@@ -20,12 +20,12 @@
import java.io.PrintWriter;
import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebInitParam;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebInitParam;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(name="testServlet", urlPatterns={"/mytest"}, initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") })
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet2.java
index 39cdbf3..e40cb0a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet2.java
@@ -20,12 +20,12 @@
import java.io.PrintWriter;
import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebInitParam;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebInitParam;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(name="testServlet2", urlPatterns={"/mytest2"}, initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") })
public class TestServlet2 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/WFTestFilter.java
index 82f6a9e..b5fc608 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/WFTestFilter.java
@@ -18,14 +18,14 @@
import java.io.IOException;
-import javax.servlet.DispatcherType;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
@WebFilter(filterName="wfFilter", urlPatterns={ "/mytest2" }, dispatcherTypes= { DispatcherType.FORWARD, DispatcherType.REQUEST })
public class WFTestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/servlet/TestServlet.java
index acf6429..9fece89 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/servlet/TestServlet.java
@@ -17,13 +17,13 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/myurl")
@ServletSecurity(@HttpConstraint(rolesAllowed={"**"}))
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/servlet/test/TestHttpSessionIdListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/servlet/test/TestHttpSessionIdListener.java
index dcf7b14..314e15f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/servlet/test/TestHttpSessionIdListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/servlet/test/TestHttpSessionIdListener.java
@@ -18,10 +18,10 @@
import java.io.IOException;
-import javax.servlet.annotation.WebListener;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionIdListener;
+import jakarta.servlet.annotation.WebListener;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionIdListener;
@WebListener
public class TestHttpSessionIdListener implements HttpSessionIdListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/servlet/test/TestServlet.java
index 55f3d36..d9e509d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/servlet/test/TestServlet.java
@@ -18,12 +18,12 @@
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/test")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/servlet/TestServlet.java
index bd22ca7..d73b236 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/servlet/TestServlet.java
@@ -17,10 +17,10 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class TestServlet extends HttpServlet {
protected void doGet(HttpServletRequest req, HttpServletResponse res)
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/servlet/test/TestServlet.java
index 85b7dbf..e368d0f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/servlet/test/TestServlet.java
@@ -19,17 +19,17 @@
import java.io.IOException;
import java.util.Arrays;
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns="/test", asyncSupported=true)
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/servlet/test/TestServlet.java
index f7be1b7..b90ba03 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/servlet/test/TestServlet.java
@@ -23,18 +23,18 @@
import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue;
-import javax.servlet.AsyncContext;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns="/test", asyncSupported=true)
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet.java
index c8edb76..495366e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet.java
@@ -19,15 +19,15 @@
import java.io.IOException;
import java.util.Arrays;
-import javax.servlet.AsyncContext;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns="/test", asyncSupported=true)
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet2.java
index 0fce64a..e9c8f41 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet2.java
@@ -18,11 +18,11 @@
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns="/test2")
public class TestServlet2 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/servlet/test/TestServlet.java
index 4f81ff9..918b5b4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/servlet/test/TestServlet.java
@@ -19,14 +19,14 @@
import java.io.IOException;
import java.util.Arrays;
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns="/test", asyncSupported=true)
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/servlet/ServletTest.java
index 8277215..667f510 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/servlet/ServletTest.java
@@ -19,10 +19,10 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.MultipartConfig;
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.MultipartConfig;
+import jakarta.servlet.annotation.WebServlet;
@WebServlet("/ServletTest")
@MultipartConfig(maxFileSize=200)
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/servlet/test/TestServlet.java
index 37b6f79..5e01484 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/servlet/test/TestServlet.java
@@ -18,12 +18,12 @@
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/test")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/servlet/test/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/servlet/test/TestServlet2.java
index a53738c..d3d0045 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/servlet/test/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/servlet/test/TestServlet2.java
@@ -18,12 +18,12 @@
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/test2")
public class TestServlet2 extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/TestServlet.java
index 2bcea0c..453b25e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/TestServlet.java
@@ -19,14 +19,14 @@
import jakarta.annotation.security.RunAs;
import jakarta.ejb.EJB;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.HttpConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/myurl")
@RunAs("staff")
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/servlet/test/TestServlet.java
index 1a73e03..8932bcd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/servlet/test/TestServlet.java
@@ -18,12 +18,12 @@
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/test")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/EchoHttpUpgradeHandler.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/EchoHttpUpgradeHandler.java
index 14bcdc5..00ca28e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/EchoHttpUpgradeHandler.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/EchoHttpUpgradeHandler.java
@@ -18,12 +18,12 @@
import java.io.IOException;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.WebConnection;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.WebConnection;
public class EchoHttpUpgradeHandler implements HttpUpgradeHandler {
private String delimiter = "\\";
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/TestServlet.java
index a54aba9..678d375 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/TestServlet.java
@@ -18,13 +18,13 @@
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/test")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNHttpUpgradeHandler.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNHttpUpgradeHandler.java
index 16530a2..a9ea7c4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNHttpUpgradeHandler.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNHttpUpgradeHandler.java
@@ -18,9 +18,9 @@
import jakarta.inject.Inject;
import javax.naming.InitialContext;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.WebConnection;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.WebConnection;
/**
* The protocol is as follows:
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ReadListenerImpl.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ReadListenerImpl.java
index c0670d7..b9fade1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ReadListenerImpl.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ReadListenerImpl.java
@@ -21,10 +21,10 @@
import java.util.StringTokenizer;
import javax.naming.InitialContext;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.WebConnection;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.WebConnection;
/**
* The protocol is as follows:
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/TestServlet.java
index 8ca1b91..4b55b4e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/TestServlet.java
@@ -18,11 +18,11 @@
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet("/test")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/servlet/test/MyServletContextListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/servlet/test/MyServletContextListener.java
index 4e1c313..5315f12 100755
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/servlet/test/MyServletContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/servlet/test/MyServletContextListener.java
@@ -16,10 +16,10 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.annotation.WebListener;
@WebListener
public class MyServletContextListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/servlet/TestFilter.java
index 0f7abd2..1a92d57 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/servlet/TestFilter.java
@@ -20,14 +20,14 @@
import java.util.Map;
import java.util.function.Supplier;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebFilter("/mytest")
public class TestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/servlet/TestServlet.java
index d74697b..1e175ca 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/servlet/TestServlet.java
@@ -19,9 +19,9 @@
import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;
-import javax.servlet.*;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
@WebServlet("/mytest")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/servlet/MyServletContextListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/servlet/MyServletContextListener.java
index ee7d035..a7aeb11 100755
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/servlet/MyServletContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/servlet/MyServletContextListener.java
@@ -14,10 +14,10 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.annotation.WebListener;
@WebListener
public class MyServletContextListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/servlet/TestServlet.java
index 22a2e03..5a2ea79 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/servlet/TestServlet.java
@@ -16,9 +16,9 @@
import java.io.*;
import java.util.Locale;
-import javax.servlet.*;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
@WebServlet("/TestServlet")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AAsyncDispatchToC.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AAsyncDispatchToC.java
index 8465848..9770aa2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AAsyncDispatchToC.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AAsyncDispatchToC.java
@@ -15,13 +15,13 @@
*/
import java.io.IOException;
-import javax.servlet.AsyncContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletMapping;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletMapping;
public class AAsyncDispatchToC extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AForwardToB.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AForwardToB.java
index f03929c..f87be65 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AForwardToB.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AForwardToB.java
@@ -16,13 +16,13 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.AsyncContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletMapping;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletMapping;
public class AForwardToB extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AIncludesB.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AIncludesB.java
index 3a94fa4..13d4a9f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AIncludesB.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AIncludesB.java
@@ -16,12 +16,12 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletMapping;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletMapping;
public class AIncludesB extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToC.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToC.java
index c411e3e..c934db6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToC.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToC.java
@@ -16,13 +16,13 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.AsyncContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletMapping;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletMapping;
public class BForwardToC extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToCNamedDispatcher.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToCNamedDispatcher.java
index f26ff66..7371975 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToCNamedDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToCNamedDispatcher.java
@@ -16,13 +16,13 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.AsyncContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletMapping;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletMapping;
public class BForwardToCNamedDispatcher extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeCNamedDispatcher.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeCNamedDispatcher.java
index bf99e85..4579c0d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeCNamedDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeCNamedDispatcher.java
@@ -16,13 +16,13 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.AsyncContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletMapping;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletMapping;
public class BIncludeCNamedDispatcher extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java
index 403f57e..0ff75b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java
@@ -16,13 +16,13 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.AsyncContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletMapping;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletMapping;
public class BIncludeDispatchServletNamedDispatcher extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludesC.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludesC.java
index e99ac05..9abc7ca 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludesC.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludesC.java
@@ -16,12 +16,12 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletMapping;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletMapping;
public class BIncludesC extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/DispatchServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/DispatchServlet.java
index f1f45d7..be850ad 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/DispatchServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/DispatchServlet.java
@@ -15,13 +15,13 @@
*/
import java.io.IOException;
-import javax.servlet.AsyncContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletMapping;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletMapping;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@WebServlet(asyncSupported = true, name="fa5raP", value = "/DispatchServlet", loadOnStartup = 1)
public class DispatchServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/ServletC.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/ServletC.java
index 35aa8c8..23aad83 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/ServletC.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/ServletC.java
@@ -16,13 +16,13 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.AsyncContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletMapping;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletMapping;
public class ServletC extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/FooMethodServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/FooMethodServlet.java
index 752065b..cd1a6c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/FooMethodServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/FooMethodServlet.java
@@ -19,16 +19,16 @@
import java.io.IOException;
import java.util.Arrays;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.PushBuilder;
-import static javax.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.PushBuilder;
+import static jakarta.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
@WebServlet(urlPatterns="/foo/*")
public class FooMethodServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/TestServlet.java
index d9bd78f..35a38e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/TestServlet.java
@@ -19,16 +19,16 @@
import java.io.IOException;
import java.util.Arrays;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.PushBuilder;
-import static javax.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.PushBuilder;
+import static jakarta.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
@WebServlet(urlPatterns="/test")
@ServletSecurity(httpMethodConstraints={
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/servlet/test/TestServlet.java
index bb5899b..248e6cc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/servlet/test/TestServlet.java
@@ -19,13 +19,13 @@
import java.io.IOException;
import java.util.Arrays;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.PushBuilder;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.PushBuilder;
@WebServlet(urlPatterns="/test")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/servlet/test/TestServlet.java
index d913044..44391fe 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/servlet/test/TestServlet.java
@@ -19,19 +19,19 @@
import java.io.IOException;
import java.util.Arrays;
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.PushBuilder;
-import static javax.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.PushBuilder;
+import static jakarta.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
@WebServlet(urlPatterns="/test")
@ServletSecurity(httpMethodConstraints={
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/servlet/test/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/servlet/test/TestServlet2.java
index 7a64cba..f5c4086 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/servlet/test/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/servlet/test/TestServlet2.java
@@ -19,15 +19,15 @@
import java.io.IOException;
import java.util.Arrays;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import static javax.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import static jakarta.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
@WebServlet(urlPatterns="/test2")
@ServletSecurity(httpMethodConstraints={
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/NOTfacesServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/NOTfacesServlet.java
index 70ac89c..f069065 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/NOTfacesServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/NOTfacesServlet.java
@@ -19,15 +19,15 @@
import java.io.IOException;
import java.util.Arrays;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.PushBuilder;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.PushBuilder;
@WebServlet(urlPatterns="/NOTfaces/*")
public class NOTfacesServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/TestServlet.java
index 88b9272..26dfd7b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/TestServlet.java
@@ -19,16 +19,16 @@
import java.io.IOException;
import java.util.Arrays;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.PushBuilder;
-import static javax.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.PushBuilder;
+import static jakarta.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
@WebServlet(urlPatterns="/test")
@ServletSecurity(httpMethodConstraints={
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/servlet/test/TestServlet.java
index eb1adf7..e6f5d85 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/servlet/test/TestServlet.java
@@ -19,19 +19,19 @@
import java.io.IOException;
import java.util.Arrays;
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.PushBuilder;
-import static javax.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.PushBuilder;
+import static jakarta.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
@WebServlet(urlPatterns="/test")
@ServletSecurity(httpMethodConstraints={
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/servlet/test/TestServlet.java
index 368a4e3..4897de9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/servlet/test/TestServlet.java
@@ -19,16 +19,16 @@
import java.io.IOException;
import java.util.Arrays;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.annotation.HttpMethodConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.PushBuilder;
-import static javax.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.annotation.HttpMethodConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.PushBuilder;
+import static jakarta.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL;
@WebServlet(urlPatterns="/test")
@ServletSecurity(httpMethodConstraints={
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/servlet/TestServlet.java
index 22a2e03..5a2ea79 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/servlet/TestServlet.java
@@ -16,9 +16,9 @@
import java.io.*;
import java.util.Locale;
-import javax.servlet.*;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
@WebServlet("/TestServlet")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/CheckResult.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/CheckResult.java
index 63f9417..c08940d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/CheckResult.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/CheckResult.java
@@ -17,9 +17,9 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
@WebServlet(urlPatterns="/CheckResult")
public class CheckResult extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/CreateSession.java
index fa13e98..c0992eb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/CreateSession.java
@@ -17,9 +17,9 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
@WebServlet(urlPatterns="/CreateSession")
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyHttpSessionListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyHttpSessionListener.java
index ee28d6e..fb15b6d 100755
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyHttpSessionListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyHttpSessionListener.java
@@ -16,11 +16,11 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.annotation.WebListener;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionListener;
-import javax.servlet.http.HttpSessionEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.annotation.WebListener;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSessionEvent;
@WebListener
public class MyHttpSessionListener implements HttpSessionListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyObject.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyObject.java
index 78c7997..b7eaf9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyObject.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyObject.java
@@ -16,10 +16,10 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionBindingListener;
-import javax.servlet.http.HttpSessionBindingEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionBindingListener;
+import jakarta.servlet.http.HttpSessionBindingEvent;
public class MyObject implements HttpSessionBindingListener {
/*
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyServletContextListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyServletContextListener.java
index c136b4d..5c5decd 100755
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyServletContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyServletContextListener.java
@@ -16,10 +16,10 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.annotation.WebListener;
@WebListener
public class MyServletContextListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/servlet/TestServlet.java
index 64333d8..f7e7505 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/servlet/TestServlet.java
@@ -19,9 +19,9 @@
import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;
-import javax.servlet.*;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.*;
@WebServlet("/TestServlet")
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/servlet/test/TestServlet.java
index 378ba22..954809e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import jakarta.annotation.PreDestroy;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletChainedException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletChainedException/WebTest.java
index df23e14..a34c114 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletChainedException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletChainedException/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for Servlet 2.5 Issue #23 ("javax.servlet.ServletException does
+ * Unit test for Servlet 2.5 Issue #23 ("jakarta.servlet.ServletException does
* not correctly chain exceptions").
* See https://servlet-spec-eg.dev.java.net/issues/show_bug.cgi?id=23 for
* details.
diff --git a/appserver/tests/appserv-tests/devtests/web/servletChainedException/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletChainedException/servlet/test/TestServlet.java
index 8975e23..6025751 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletChainedException/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletChainedException/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/ServletTest.java
index 6e9fb1d..fc1266e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet{
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/StaticListener.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/StaticListener.java
index 60f3fdb..c5c44be 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/StaticListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/StaticListener.java
@@ -16,8 +16,8 @@
package test;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class StaticListener implements ServletContextAttributeListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/shared/test/StaticListener.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/shared/test/StaticListener.java
index 60f3fdb..c5c44be 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/shared/test/StaticListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/shared/test/StaticListener.java
@@ -16,8 +16,8 @@
package test;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class StaticListener implements ServletContextAttributeListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/servlet/test/MyListener.java
index 113deca..de0f167 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/servlet/test/MyListener.java
@@ -18,7 +18,7 @@
import java.io.*;
import jakarta.annotation.PreDestroy;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class MyListener implements ServletContextAttributeListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/servlet/test/MyListener.java
index 8e2123c..3cdf061 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/servlet/test/MyListener.java
@@ -17,9 +17,9 @@
package test;
import java.io.*;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/servlet/test/TestServlet.java
index d3b70d5..268a2ce 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/servlet/TestServlet.java
index 1ece6d9..96623e7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/servlet/TestServlet.java
index ab768c4..3a85e82 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/servlet/test/MyListener.java
index 8bd2a10..de6dd05 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/servlet/test/MyListener.java
@@ -18,9 +18,9 @@
import java.io.*;
import jakarta.annotation.PreDestroy;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
public class MyListener implements ServletContextListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/servlet/TestServlet.java
index 1cf173d..93b66a5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/servlet/TestServlet.java
index 4b6adef..2f0ec05 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/servlet/Filter_A.java b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/servlet/Filter_A.java
index e881e96..ef89f49 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/servlet/Filter_A.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/servlet/Filter_A.java
@@ -15,7 +15,7 @@
*/
import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class Filter_A implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/servlet/Filter_B.java b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/servlet/Filter_B.java
index 56c2d94..b7466c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/servlet/Filter_B.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/servlet/Filter_B.java
@@ -15,7 +15,7 @@
*/
import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
public class Filter_B implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/servlet/TestServlet.java
index 126b29f..23249ea 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestFilter.java
index 196fa70..65aae70 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestFilter.java
@@ -18,7 +18,7 @@
import java.io.*;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.*;
+import jakarta.servlet.*;
import javax.naming.*;
public class TestFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestServlet.java
index 95d967f..e510f63 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/servlet/TestServlet.java
index 17f61cb..86836c3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/servlet/TestServlet.java
index 0a6b135..c0f337e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/servlet/TestServlet.java
@@ -18,11 +18,11 @@
import java.io.PrintWriter;
import java.util.Enumeration;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class TestServlet extends HttpServlet {
private volatile Integer i = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/servlet/test/TestServlet.java
index 3936597..30919b2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/servlet/test/TestServlet.java
index 3d02de2..d716bed 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/servlet/test/TestServlet.java
index 565447b..b6a71d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/servlet/test/TestServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.net.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/servlet/test/TestServlet.java
index ff1d155..c7595d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/servlet/test/MyFilter.java b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/servlet/test/MyFilter.java
index f25ab48..113c0e7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/servlet/test/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/servlet/test/MyFilter.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class MyFilter implements Filter {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/servlet/test/TestServlet.java
index 01a5aaf..a7492de 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/servlet/TestServlet.java
index 72d4b0a..5fce8dc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/servlet/test/TestServlet.java
index 3e0e191..2b62350 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/MyListener.java
index e574285..e2751a1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/MyListener.java
@@ -16,9 +16,9 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextAttributeListener;
-import javax.servlet.ServletContextAttributeEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextAttributeListener;
+import jakarta.servlet.ServletContextAttributeEvent;
import javax.naming.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/TestServlet.java
index 5679c2e..809498b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/MyListener.java
index 44c8b84..57d6466 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/MyListener.java
@@ -16,9 +16,9 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
import javax.naming.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/TestServlet.java
index 32087c2..157e711 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/myfilter/MyFilter.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/myfilter/MyFilter.java
index b9b0f07..214c30a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/myfilter/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/myfilter/MyFilter.java
@@ -17,7 +17,7 @@
package myfilter;
import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
import javax.naming.*;
import jakarta.annotation.*;
import javax.sql.DataSource;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/test/TestServlet.java
index 32087c2..157e711 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/WebTest.java
index 42425b0..0161bd6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/WebTest.java
@@ -20,7 +20,7 @@
/*
* Unit test for resource injection into
- * javax.servlet.http.HttpSessionAttributeListener
+ * jakarta.servlet.http.HttpSessionAttributeListener
*/
public class WebTest {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/MyListener.java
index 860517c..976aa13 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/MyListener.java
@@ -16,10 +16,10 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionAttributeListener;
-import javax.servlet.http.HttpSessionBindingEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionAttributeListener;
+import jakarta.servlet.http.HttpSessionBindingEvent;
import javax.naming.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/TestServlet.java
index 74271f3..c27e9a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/WebTest.java
index e51a399..9c7ba9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/WebTest.java
@@ -20,7 +20,7 @@
/*
* Unit test for resource injection into
- * javax.servlet.http.HttpSessionListener
+ * jakarta.servlet.http.HttpSessionListener
*/
public class WebTest {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/MyListener.java
index f8c5ce1..82c13ed 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/MyListener.java
@@ -16,10 +16,10 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionListener;
-import javax.servlet.http.HttpSessionEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSessionEvent;
import javax.naming.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/TestServlet.java
index baf2d98..9432758 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/MyListener.java
index 9c2742b..9b255d5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/MyListener.java
@@ -16,10 +16,10 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestAttributeListener;
-import javax.servlet.ServletRequestAttributeEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletRequestAttributeListener;
+import jakarta.servlet.ServletRequestAttributeEvent;
import javax.naming.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/TestServlet.java
index b97cf50..1116b40 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/MyListener.java
index a9ab570..d6af67b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/MyListener.java
@@ -16,10 +16,10 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestListener;
-import javax.servlet.ServletRequestEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletRequestListener;
+import jakarta.servlet.ServletRequestEvent;
import javax.naming.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/TestServlet.java
index ea13d43..4cc8719 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/servlet/test/TestServlet.java
index 9362041..105a0ca 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/servlet/test/TestServlet.java
index 9362041..105a0ca 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
import jakarta.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/servlet/test/TestServlet.java
index e538ff1..3056911 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/WebTest.java
index 2604d62..124badc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/WebTest.java
@@ -30,9 +30,9 @@
* request attributes mandated by the Servlet spec when the request is over
* HTTPS with SSL client auth turned on, namely:
*
- * javax.servlet.request.cipher_suite
- * javax.servlet.request.key_size
- * javax.servlet.request.X509Certificate
+ * jakarta.servlet.request.cipher_suite
+ * jakarta.servlet.request.key_size
+ * jakarta.servlet.request.X509Certificate
*
* even if none of these attributes have been requested explicitly by a call
* to ServletRequest.getAttribute().
@@ -45,13 +45,13 @@
private static final String TEST_NAME = "servlet-ssl-request-attributes";
private static final String SSL_CIPHER_SUITE
- = "javax.servlet.request.cipher_suite";
+ = "jakarta.servlet.request.cipher_suite";
private static final String SSL_KEY_SIZE
- = "javax.servlet.request.key_size";
+ = "jakarta.servlet.request.key_size";
private static final String SSL_CERTIFICATE
- = "javax.servlet.request.X509Certificate";
+ = "jakarta.servlet.request.X509Certificate";
private static final String SSL_SESSION_ID
- = "javax.servlet.request.ssl_session_id";
+ = "jakarta.servlet.request.ssl_session_id";
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
diff --git a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/servlet/TestServlet.java
index dee6021..a04aa9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/servlet/ServletTest.java
index b71f5e0..b7c9637 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/servlet/ServletTest.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.net.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet implements HttpSessionListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/servlet/test/MyHttpSessionListener.java b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/servlet/test/MyHttpSessionListener.java
index 6cf1c1a..7766383 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/servlet/test/MyHttpSessionListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/servlet/test/MyHttpSessionListener.java
@@ -16,10 +16,10 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionListener;
-import javax.servlet.http.HttpSessionEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSessionEvent;
public class MyHttpSessionListener implements HttpSessionListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/servlet/test/TestServlet.java
index e64fecd..851bf59 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/CheckResult.java b/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/CheckResult.java
index 07ef38a..4bb4645 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/CheckResult.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/CheckResult.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CheckResult extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/CreateSession.java
index 225308e..d2554a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/CreateSession.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyHttpSessionListener.java b/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyHttpSessionListener.java
index b42289b..35d00b9 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyHttpSessionListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyHttpSessionListener.java
@@ -16,10 +16,10 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionListener;
-import javax.servlet.http.HttpSessionEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSessionEvent;
public class MyHttpSessionListener implements HttpSessionListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyObject.java b/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyObject.java
index 5f52eb6..fd0610c 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyObject.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyObject.java
@@ -16,10 +16,10 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionBindingListener;
-import javax.servlet.http.HttpSessionBindingEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionBindingListener;
+import jakarta.servlet.http.HttpSessionBindingEvent;
public class MyObject implements HttpSessionBindingListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/servlet/test/CreateSession.java
index 6ea2090..a233a91 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/servlet/test/CreateSession.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/servlet/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/servlet/CreateSession.java
index 29bb67c..7504789 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/servlet/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/servlet/CreateSession.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/servlet/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/servlet/CreateSession.java
index 29bb67c..7504789 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/servlet/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/servlet/CreateSession.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/servlet/test/RedirectFrom.java b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/servlet/test/RedirectFrom.java
index 97ae02d..3944ff4 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/servlet/test/RedirectFrom.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/servlet/test/RedirectFrom.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class RedirectFrom extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/servlet/test/RedirectTo.java b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/servlet/test/RedirectTo.java
index a48f847..4c96ecd 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/servlet/test/RedirectTo.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/servlet/test/RedirectTo.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class RedirectTo extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/servlet/TestServlet.java
index b0ee40e..2e22d39 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/servlet/CheckSession.java b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/servlet/CheckSession.java
index 663b962..56581b8 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/servlet/CheckSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/servlet/CheckSession.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CheckSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/servlet/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/servlet/CreateSession.java
index 3ea0def..f1115ee 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/servlet/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/servlet/CreateSession.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/CreateSession.java
index 21232c1..897957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/CreateSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/ResumeSession.java
index acd3af0..21fb832 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/ResumeSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class ResumeSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/servlet/test/ResumeSession.java
index ef93d7e..1eb7517 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/servlet/test/ResumeSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class ResumeSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/CreateSession.java
index 21232c1..897957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/CreateSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/ResumeSession.java
index 435aa61..f6d8fab 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/ResumeSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class ResumeSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
index 21232c1..897957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
index b6a2b9e..18ed3aa 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class ResumeSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/servlet/test/RedirectFrom.java b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/servlet/test/RedirectFrom.java
index 97ae02d..3944ff4 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/servlet/test/RedirectFrom.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/servlet/test/RedirectFrom.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class RedirectFrom extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/servlet/test/RedirectTo.java b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/servlet/test/RedirectTo.java
index a48f847..4c96ecd 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/servlet/test/RedirectTo.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/servlet/test/RedirectTo.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class RedirectTo extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/servlet/test/CreateSession.java
index 4ab4a54..0407ec1 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/servlet/test/CreateSession.java
@@ -19,11 +19,11 @@
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
public class CreateSession extends HttpServlet {
@Override
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/servlet/test/ResumeSession.java
index c47e289..4d437d2 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/servlet/test/ResumeSession.java
@@ -19,11 +19,11 @@
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
public class ResumeSession extends HttpServlet {
@Override
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/servlet/test/TestServlet.java
index 60a997e..a9f146d 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/servlet/CheckSession.java b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/servlet/CheckSession.java
index 0ad61e2..2f9f4b7 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/servlet/CheckSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/servlet/CheckSession.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CheckSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/servlet/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/servlet/CreateSession.java
index 6359310..eb572f5 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/servlet/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/servlet/CreateSession.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/servlet/TestServlet.java
index c11ac74..f27c7cd 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/servlet/CheckSession.java b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/servlet/CheckSession.java
index d5197d9..eed247d 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/servlet/CheckSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/servlet/CheckSession.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CheckSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/servlet/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/servlet/CreateSession.java
index efb559a..1c2833b 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/servlet/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/servlet/CreateSession.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/servlet/SetHeadersServlet.java b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/servlet/SetHeadersServlet.java
index 05c2574..9bfd1b7 100644
--- a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/servlet/SetHeadersServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/servlet/SetHeadersServlet.java
@@ -17,10 +17,10 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class SetHeadersServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/servlet/TestServlet.java
index 4111b4a..d58a3a7 100644
--- a/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/setWebContextParam/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/servlet/TestServlet.java
index 97f6527..22ce669 100644
--- a/appserver/tests/appserv-tests/devtests/web/setWebContextParam/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/servlet/TestServlet.java
@@ -18,11 +18,11 @@
import java.io.PrintWriter;
import java.util.Enumeration;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class TestServlet extends HttpServlet {
public void service(HttpServletRequest req, HttpServletResponse res)
diff --git a/appserver/tests/appserv-tests/devtests/web/singleengine/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/singleengine/servlet/ServletTest.java
index 8ab08d2..860bcc4 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleengine/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/singleengine/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
@@ -49,11 +49,11 @@
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/FilterTest.java
index 57a5e16..fcf3624 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/FilterTest.java
@@ -16,8 +16,8 @@
package test;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class FilterTest implements Filter{
private ServletContext context;
@@ -26,7 +26,7 @@
System.out.println("[Filter.destroy]");
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, javax.servlet.ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
@@ -35,7 +35,7 @@
}
- public void init(javax.servlet.FilterConfig filterConfig) throws javax.servlet.ServletException {
+ public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest.java
index 8c003cc..8d111ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet implements HttpSessionListener {
@@ -52,11 +52,11 @@
rd.forward(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest2.java
index f517cce..db2cb50 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest2.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
@@ -50,11 +50,11 @@
rd.include(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest3.java
index 54dc989..c5a381a 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest3.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest3 extends HttpServlet{
diff --git a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/servlet/TestServlet.java
index 570f772..5588468 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
@@ -25,7 +25,7 @@
throws IOException, ServletException {
Object cert = req.getAttribute(
- "javax.servlet.request.X509Certificate");
+ "jakarta.servlet.request.X509Certificate");
String clName = null;
if (cert != null) {
clName = cert.getClass().getName();
diff --git a/appserver/tests/appserv-tests/devtests/web/sslCookie/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/sslCookie/servlet/ServletTest.java
index 2fd7ee5..bdf5138 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslCookie/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslCookie/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet implements HttpSessionListener {
@@ -62,11 +62,11 @@
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/FilterTest.java
index 57a5e16..fcf3624 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/FilterTest.java
@@ -16,8 +16,8 @@
package test;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class FilterTest implements Filter{
private ServletContext context;
@@ -26,7 +26,7 @@
System.out.println("[Filter.destroy]");
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, javax.servlet.ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
@@ -35,7 +35,7 @@
}
- public void init(javax.servlet.FilterConfig filterConfig) throws javax.servlet.ServletException {
+ public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest.java
index 8c003cc..8d111ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet implements HttpSessionListener {
@@ -52,11 +52,11 @@
rd.forward(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest2.java
index f517cce..db2cb50 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest2.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
@@ -50,11 +50,11 @@
rd.include(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest3.java
index 54dc989..c5a381a 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest3.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest3 extends HttpServlet{
diff --git a/appserver/tests/appserv-tests/devtests/web/sslServerName/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/sslServerName/servlet/ServletTest.java
index 2ae94c1..781bccf 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslServerName/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslServerName/servlet/ServletTest.java
@@ -18,8 +18,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/FilterTest.java
index 57a5e16..fcf3624 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/FilterTest.java
@@ -16,8 +16,8 @@
package test;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class FilterTest implements Filter{
private ServletContext context;
@@ -26,7 +26,7 @@
System.out.println("[Filter.destroy]");
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, javax.servlet.ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
@@ -35,7 +35,7 @@
}
- public void init(javax.servlet.FilterConfig filterConfig) throws javax.servlet.ServletException {
+ public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest.java
index 9fe46d3..d4a3174 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
@@ -73,11 +73,11 @@
rd.forward(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest2.java
index f517cce..db2cb50 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest2.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
@@ -50,11 +50,11 @@
rd.include(request, response);
}
- public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
- public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+ public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
}
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest3.java
index 4b9b240..3e8d25b 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest3.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
diff --git a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/src/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/src/servlet/ServletTest.java
index 2f96c64..e854149 100644
--- a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/src/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/src/servlet/ServletTest.java
@@ -17,10 +17,10 @@
package servlet;
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/traceEnabled/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/traceEnabled/servlet/ServletTest.java
index d713d0e..2874750 100644
--- a/appserver/tests/appserv-tests/devtests/web/traceEnabled/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/traceEnabled/servlet/ServletTest.java
@@ -17,8 +17,8 @@
package test;
import java.io.IOException;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/trailerHeader/servlet/EchoHeaderServlet.java b/appserver/tests/appserv-tests/devtests/web/trailerHeader/servlet/EchoHeaderServlet.java
index 74d679a..5103dcd 100644
--- a/appserver/tests/appserv-tests/devtests/web/trailerHeader/servlet/EchoHeaderServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/trailerHeader/servlet/EchoHeaderServlet.java
@@ -18,10 +18,10 @@
import java.io.InputStream;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class EchoHeaderServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
diff --git a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/servlet/ServletTest.java
index 9f1313e..2e827b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
diff --git a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/servlet/ServletTest.java
index 2ae94c1..781bccf 100644
--- a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/servlet/ServletTest.java
@@ -18,8 +18,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/lib/glassfish-valves/valves/GlassFishValveImpl.java b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/lib/glassfish-valves/valves/GlassFishValveImpl.java
index 57de9c9..7e7f20e 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/lib/glassfish-valves/valves/GlassFishValveImpl.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/lib/glassfish-valves/valves/GlassFishValveImpl.java
@@ -17,8 +17,8 @@
package valves;
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
import org.apache.catalina.valves.ValveBase;
diff --git a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/servlet/TestServlet.java
index 7b0269d..f2a658d 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/GlassFishValveImpl.java b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/GlassFishValveImpl.java
index 9381182..4add5a0 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/GlassFishValveImpl.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/GlassFishValveImpl.java
@@ -17,7 +17,7 @@
package valves;
import java.io.IOException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
import org.glassfish.web.valve.GlassFishValve;
diff --git a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_1.java b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_1.java
index 91a98a6..b9aaf64 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_1.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_1.java
@@ -17,7 +17,7 @@
package valves;
import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
import org.apache.catalina.connector.*;
import org.apache.catalina.valves.*;
diff --git a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_2.java b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_2.java
index 4176a87..ef2df6e 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_2.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_2.java
@@ -17,7 +17,7 @@
package valves;
import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
import org.apache.catalina.connector.*;
import org.apache.catalina.valves.*;
diff --git a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/servlet/TestServlet.java
index 3fe41f2..b4da45f 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve1.java b/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve1.java
index a09f53c..31d4a8f 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve1.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve1.java
@@ -17,7 +17,7 @@
package valves;
import java.io.IOException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
import org.glassfish.web.valve.GlassFishValve;
diff --git a/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve2.java b/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve2.java
index 8222a89..ef48b6b 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve2.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve2.java
@@ -17,7 +17,7 @@
package valves;
import java.io.IOException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
import org.glassfish.web.valve.GlassFishValve;
diff --git a/appserver/tests/appserv-tests/devtests/web/valveWithParams/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/valveWithParams/servlet/TestServlet.java
index 89f884a..7ffe967 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveWithParams/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveWithParams/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/servlet/TestServlet.java
index a7106b9..7c30820 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/CheckRequestPath.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/CheckRequestPath.java
index b415661..1449e96 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/CheckRequestPath.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/CheckRequestPath.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CheckRequestPath extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/DispatchFrom.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/DispatchFrom.java
index f585ba1..491de2a 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/DispatchFrom.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/DispatchFrom.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class DispatchFrom extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/DispatchTo.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/DispatchTo.java
index f472e79..f9be3f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/DispatchTo.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/DispatchTo.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class DispatchTo extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/servlet/ServletTest.java
index 2ae94c1..781bccf 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/servlet/ServletTest.java
@@ -18,8 +18,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/servlet/HelloWorldSimpleTag.java b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/servlet/HelloWorldSimpleTag.java
index 27ede4f..45386be 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/servlet/HelloWorldSimpleTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/servlet/HelloWorldSimpleTag.java
@@ -17,8 +17,8 @@
package taglib;
import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.SimpleTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.SimpleTagSupport;
public class HelloWorldSimpleTag extends SimpleTagSupport {
public void doTag() throws JspException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/servlet/CheckAccessLog.java b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/servlet/CheckAccessLog.java
index 289b524..b6cc341 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/servlet/CheckAccessLog.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/servlet/CheckAccessLog.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CheckAccessLog extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/servlet/MyServlet.java b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/servlet/MyServlet.java
index a39e973..eea1b21 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/servlet/MyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/servlet/MyServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class MyServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/servlet/ServletTest.java
index aa5a3f5..0b9e2e9 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/servlet/TestServlet.java
index 31434e7..3d9ac5f 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/servlet/custom/ErrorReportValve.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/servlet/custom/ErrorReportValve.java
index e615843..f3406ab 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/servlet/custom/ErrorReportValve.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/servlet/custom/ErrorReportValve.java
@@ -17,7 +17,7 @@
package custom;
import java.io.IOException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
import org.glassfish.web.valve.GlassFishValve;
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/GlassFishValveImpl.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/GlassFishValveImpl.java
index 9381182..4add5a0 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/GlassFishValveImpl.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/GlassFishValveImpl.java
@@ -17,7 +17,7 @@
package valves;
import java.io.IOException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
import org.glassfish.web.valve.GlassFishValve;
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_1.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_1.java
index 91a98a6..b9aaf64 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_1.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_1.java
@@ -17,7 +17,7 @@
package valves;
import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
import org.apache.catalina.connector.*;
import org.apache.catalina.valves.*;
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_2.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_2.java
index 4176a87..ef2df6e 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_2.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_2.java
@@ -17,7 +17,7 @@
package valves;
import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
import org.apache.catalina.connector.*;
import org.apache.catalina.valves.*;
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/servlet/TestServlet.java
index bbcb738..9c96672 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/servlet/TestServlet.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/servlet/test/TestServlet.java
index 25386c3..9530344 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/servlet/test/TestServlet.java
index 360087c..4d84aaf 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/servlet/test/TestServlet.java
index 5ae917c..f310f8b 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/servlet/test/TestServlet.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.net.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/servlet/test/TestServlet.java
index 110ae75..ccad543 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/servlet/test/TestServlet.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/servlet/test/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/servlet/test/ServletTest.java
index 4bd664c..b939583 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/servlet/test/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/servlet/test/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet{
private static final String PASS = "WLDelegateTest::PASS";
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
index bb0645e..7948418 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
@@ -22,9 +22,9 @@
import jakarta.ejb.EJB;
import jakarta.jms.Queue;
import javax.naming.InitialContext;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.WebServlet;
import javax.sql.DataSource;
@WebServlet("/mytest")
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/TestServlet.java
index 95ba9dd..a6e98ea 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/TestServlet.java
@@ -19,11 +19,11 @@
import java.io.*;
import jakarta.annotation.security.RunAs;
import jakarta.ejb.EJB;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.annotation.HttpConstraint;
-import javax.servlet.annotation.ServletSecurity;
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
+import jakarta.servlet.annotation.HttpConstraint;
+import jakarta.servlet.annotation.ServletSecurity;
+import jakarta.servlet.annotation.WebServlet;
@WebServlet("/mytest")
@ServletSecurity(@HttpConstraint(rolesAllowed={"javaee"}))
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
index b33f8b0..67b4f0c 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/CheckResult.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/CheckResult.java
index 07ef38a..4bb4645 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/CheckResult.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/CheckResult.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CheckResult extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/CreateSession.java
index b5b00f4..2488df3 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/CreateSession.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyHttpSessionListener.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyHttpSessionListener.java
index b42289b..35d00b9 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyHttpSessionListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyHttpSessionListener.java
@@ -16,10 +16,10 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionListener;
-import javax.servlet.http.HttpSessionEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSessionEvent;
public class MyHttpSessionListener implements HttpSessionListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyObject.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyObject.java
index 5f52eb6..fd0610c 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyObject.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyObject.java
@@ -16,10 +16,10 @@
package test;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionBindingListener;
-import javax.servlet.http.HttpSessionBindingEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionBindingListener;
+import jakarta.servlet.http.HttpSessionBindingEvent;
public class MyObject implements HttpSessionBindingListener {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectFrom.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectFrom.java
index 97ae02d..3944ff4 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectFrom.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectFrom.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class RedirectFrom extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectTo.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectTo.java
index 89be42b..502bb72 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectTo.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/servlet/test/RedirectTo.java
@@ -17,8 +17,8 @@
package test;
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class RedirectTo extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
index 21232c1..897957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class CreateSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
index b6a2b9e..18ed3aa 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
@@ -18,8 +18,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.*;
public class ResumeSession extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/servlet/TestServlet.java
index 69b071e..17f2dca 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/servlet/TestServlet.java
@@ -16,8 +16,8 @@
import java.io.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java
index 3926b58..07a1d8d 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java
@@ -17,10 +17,10 @@
package test;
import jakarta.inject.Inject;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
-@javax.servlet.annotation.WebListener
+@jakarta.servlet.annotation.WebListener
public class TestHttpSessionListener implements HttpSessionListener {
@Inject MyBean myBean;
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/provider/TestHttpServletServerAuthModule.java b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/provider/TestHttpServletServerAuthModule.java
index 0b631af..d248131 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/provider/TestHttpServletServerAuthModule.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/src/test/provider/TestHttpServletServerAuthModule.java
@@ -26,10 +26,10 @@
import javax.security.auth.message.MessageInfo;
import javax.security.auth.message.MessagePolicy;
import javax.security.auth.message.module.ServerAuthModule;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
@SuppressWarnings("rawtypes")
public class TestHttpServletServerAuthModule implements ServerAuthModule {
diff --git a/appserver/tests/appserv-tests/devtests/web/win2kLock/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/win2kLock/servlet/ServletTest.java
index d5e65ab..2d4408c 100644
--- a/appserver/tests/appserv-tests/devtests/web/win2kLock/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/win2kLock/servlet/ServletTest.java
@@ -19,8 +19,8 @@
import java.io.*;
import java.net.*;
import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.net.URL;
import java.util.ArrayList;
diff --git a/appserver/tests/appserv-tests/devtests/web/yasson/servlet/TransformToJson.java b/appserver/tests/appserv-tests/devtests/web/yasson/servlet/TransformToJson.java
index 34ada76..a88e5c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/yasson/servlet/TransformToJson.java
+++ b/appserver/tests/appserv-tests/devtests/web/yasson/servlet/TransformToJson.java
@@ -15,8 +15,8 @@
*/
import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.json.bind.*;
public class TransformToJson extends HttpServlet {
