uriParams;
protected EndpointConfig endpointConfig;
- public AbstractJavaxWebSocketServerFrameHandlerTest()
+ public AbstractJakartaWebSocketServerFrameHandlerTest()
{
endpointConfig = new BasicClientEndpointConfig();
encoders = new AvailableEncoders(endpointConfig);
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AltFilterTest.java
similarity index 90%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AltFilterTest.java
index e6c93a0ce177..12de92d2dc5e 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AltFilterTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.util.ArrayList;
import java.util.List;
@@ -28,9 +28,9 @@
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
-import org.eclipse.jetty.websocket.javax.tests.WSServer;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.echo.BasicEchoSocket;
+import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer;
+import org.eclipse.jetty.websocket.jakarta.tests.WSServer;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoSocket;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -52,7 +52,7 @@ public void testEcho() throws Exception
{
WSServer wsb = new WSServer(testdir.getPath(), "app");
wsb.copyWebInf("alt-filter-web.xml");
- // the endpoint (extends javax.websocket.Endpoint)
+ // the endpoint (extends jakarta.websocket.Endpoint)
wsb.copyClass(BasicEchoSocket.class);
try
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AnnotatedServerEndpointTest.java
similarity index 88%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AnnotatedServerEndpointTest.java
index d81f71df0bb5..2ae57015230f 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AnnotatedServerEndpointTest.java
@@ -16,25 +16,25 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
-import org.eclipse.jetty.websocket.javax.tests.coders.DateDecoder;
-import org.eclipse.jetty.websocket.javax.tests.coders.TimeEncoder;
-import org.eclipse.jetty.websocket.javax.tests.server.configs.EchoSocketConfigurator;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.ConfiguredEchoSocket;
+import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.tests.coders.DateDecoder;
+import org.eclipse.jetty.websocket.jakarta.tests.coders.TimeEncoder;
+import org.eclipse.jetty.websocket.jakarta.tests.server.configs.EchoSocketConfigurator;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.ConfiguredEchoSocket;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointConfigContextListener.java
similarity index 81%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointConfigContextListener.java
index 4dbb670e9e98..10628828665f 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointConfigContextListener.java
@@ -16,18 +16,18 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import javax.websocket.DeploymentException;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpointConfig;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.echo.BasicEchoEndpoint;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoEndpoint;
/**
- * Example of adding a server WebSocket (extending {@link javax.websocket.Endpoint}) programmatically via config
+ * Example of adding a server WebSocket (extending {@link jakarta.websocket.Endpoint}) programmatically via config
*/
public class BasicEchoEndpointConfigContextListener implements ServletContextListener
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointContextListener.java
similarity index 81%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointContextListener.java
index fdbfe9136345..8d7b2b2260ba 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointContextListener.java
@@ -16,18 +16,18 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import javax.websocket.DeploymentException;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpointConfig;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.pong.PongMessageEndpoint;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.pong.PongMessageEndpoint;
/**
- * Example of adding a server WebSocket (extending {@link javax.websocket.Endpoint}) programmatically directly.
+ * Example of adding a server WebSocket (extending {@link jakarta.websocket.Endpoint}) programmatically directly.
*
* NOTE: this shouldn't work as the endpoint has no path associated with it.
*/
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketConfigContextListener.java
similarity index 79%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketConfigContextListener.java
index 7b0185b6a67f..fde5eb868adc 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketConfigContextListener.java
@@ -16,18 +16,18 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import javax.websocket.DeploymentException;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpointConfig;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.echo.BasicEchoSocket;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoSocket;
/**
- * Example of adding a server socket (which extends {@link javax.websocket.Endpoint}) programmatically via the {@link ServerContainer#addEndpoint(ServerEndpointConfig)}
+ * Example of adding a server socket (which extends {@link jakarta.websocket.Endpoint}) programmatically via the {@link ServerContainer#addEndpoint(ServerEndpointConfig)}
*/
public class BasicEchoSocketConfigContextListener implements ServletContextListener
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketContextListener.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketContextListener.java
index 3c80ed9a3136..ef9110cea70d 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketContextListener.java
@@ -16,14 +16,14 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import javax.websocket.DeploymentException;
-import javax.websocket.server.ServerContainer;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.echo.BasicEchoSocket;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.server.ServerContainer;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoSocket;
/**
* Example of adding a server socket (annotated) programmatically directly with no config
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BinaryStreamTest.java
similarity index 91%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BinaryStreamTest.java
index 25361f40d458..8b2a0ab378e8 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BinaryStreamTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.io.InputStream;
@@ -26,19 +26,19 @@
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.BlockingQueue;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.tests.DataUtils;
-import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.tests.DataUtils;
+import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ConfiguratorTest.java
similarity index 94%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ConfiguratorTest.java
index 884a4b21f968..3b5b658b1fee 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ConfiguratorTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -37,18 +37,18 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Extension;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Extension;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.HandshakeRequest;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.log.Log;
@@ -58,10 +58,10 @@
import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.core.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
-import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketCreator;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
-import org.eclipse.jetty.websocket.javax.tests.Timeouts;
-import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker;
+import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketCreator;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.tests.Timeouts;
+import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameHandlerTracker;
import org.hamcrest.Matcher;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
@@ -253,8 +253,8 @@ public static class AddrConfigurator extends ServerEndpointConfig.Configurator
@Override
public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response)
{
- InetSocketAddress local = (InetSocketAddress)sec.getUserProperties().get(JavaxWebSocketCreator.PROP_LOCAL_ADDRESS);
- InetSocketAddress remote = (InetSocketAddress)sec.getUserProperties().get(JavaxWebSocketCreator.PROP_REMOTE_ADDRESS);
+ InetSocketAddress local = (InetSocketAddress)sec.getUserProperties().get(JakartaWebSocketCreator.PROP_LOCAL_ADDRESS);
+ InetSocketAddress remote = (InetSocketAddress)sec.getUserProperties().get(JakartaWebSocketCreator.PROP_REMOTE_ADDRESS);
sec.getUserProperties().put("found.local", local);
sec.getUserProperties().put("found.remote", remote);
@@ -271,8 +271,8 @@ public static class AddressSocket
public String onMessage(Session session, String msg)
{
StringBuilder response = new StringBuilder();
- appendPropValue(session, response, "javax.websocket.endpoint.localAddress");
- appendPropValue(session, response, "javax.websocket.endpoint.remoteAddress");
+ appendPropValue(session, response, "jakarta.websocket.endpoint.localAddress");
+ appendPropValue(session, response, "jakarta.websocket.endpoint.remoteAddress");
appendPropValue(session, response, "found.local");
appendPropValue(session, response, "found.remote");
return response.toString();
@@ -566,8 +566,8 @@ public void testUserPropsAddress() throws Exception
StringWriter expected = new StringWriter();
PrintWriter out = new PrintWriter(expected);
// local <-> remote are opposite on server (duh)
- out.printf("[javax.websocket.endpoint.localAddress] = %s%n", toSafeAddr(expectedRemote));
- out.printf("[javax.websocket.endpoint.remoteAddress] = %s%n", toSafeAddr(expectedLocal));
+ out.printf("[jakarta.websocket.endpoint.localAddress] = %s%n", toSafeAddr(expectedRemote));
+ out.printf("[jakarta.websocket.endpoint.remoteAddress] = %s%n", toSafeAddr(expectedLocal));
out.printf("[found.local] = %s%n", toSafeAddr(expectedRemote));
out.printf("[found.remote] = %s%n", toSafeAddr(expectedLocal));
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ContainerProviderServerTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ContainerProviderServerTest.java
similarity index 82%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ContainerProviderServerTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ContainerProviderServerTest.java
index 849d329c8d76..e2993e58f2b3 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ContainerProviderServerTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ContainerProviderServerTest.java
@@ -16,26 +16,26 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.nio.file.Path;
import java.util.concurrent.TimeUnit;
-import javax.websocket.CloseReason;
-import javax.websocket.ContainerProvider;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.eclipse.jetty.websocket.javax.tests.EventSocket;
-import org.eclipse.jetty.websocket.javax.tests.WSServer;
+import org.eclipse.jetty.websocket.jakarta.tests.EventSocket;
+import org.eclipse.jetty.websocket.jakarta.tests.WSServer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static javax.websocket.CloseReason.CloseCodes.NORMAL_CLOSURE;
+import static jakarta.websocket.CloseReason.CloseCodes.NORMAL_CLOSURE;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -76,7 +76,7 @@ public void stopServer() throws Exception
}
@Test
- public void testJavaxWsContainerInServer() throws Exception
+ public void testJakartaWsContainerInServer() throws Exception
{
WebSocketContainer client = ContainerProvider.getWebSocketContainer();
EventSocket clientSocket = new EventSocket();
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/DeploymentExceptionTest.java
similarity index 79%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/DeploymentExceptionTest.java
index e8abab0ecc65..01f3b81e710d 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/DeploymentExceptionTest.java
@@ -16,26 +16,26 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Stream;
-import javax.websocket.DeploymentException;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidCloseIntSocket;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidErrorErrorSocket;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidErrorIntSocket;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidOpenCloseReasonSocket;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidOpenIntSocket;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidOpenSessionIntSocket;
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.InvalidCloseIntSocket;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.InvalidErrorErrorSocket;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.InvalidErrorIntSocket;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.InvalidOpenCloseReasonSocket;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.InvalidOpenIntSocket;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.InvalidOpenSessionIntSocket;
import org.eclipse.jetty.websocket.util.InvalidSignatureException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -97,7 +97,7 @@ public void testDeployInvalidSignature(Class> pojo) throws Exception
{
ServletContextHandler context = new ServletContextHandler();
context.setServer(server);
- JavaxWebSocketServletContainerInitializer.configure(context, null);
+ JakartaWebSocketServletContainerInitializer.configure(context, null);
contexts.addHandler(context);
try
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/EndpointViaConfigTest.java
similarity index 88%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/EndpointViaConfigTest.java
index 0d0b712eadee..c31bb9b2a996 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/EndpointViaConfigTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.net.URI;
import java.util.concurrent.Future;
@@ -34,8 +34,8 @@
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
-import org.eclipse.jetty.websocket.javax.tests.WSServer;
-import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker;
+import org.eclipse.jetty.websocket.jakarta.tests.WSServer;
+import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameHandlerTracker;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -43,8 +43,8 @@
import static org.hamcrest.Matchers.is;
/**
- * Example of an {@link javax.websocket.Endpoint} extended echo server added programmatically via the
- * {@link javax.websocket.server.ServerContainer#addEndpoint(javax.websocket.server.ServerEndpointConfig)}
+ * Example of an {@link jakarta.websocket.Endpoint} extended echo server added programmatically via the
+ * {@link jakarta.websocket.server.ServerContainer#addEndpoint(jakarta.websocket.server.ServerEndpointConfig)}
*/
@ExtendWith(WorkDirExtension.class)
public class EndpointViaConfigTest
@@ -58,7 +58,7 @@ public void testEcho() throws Exception
{
WSServer wsb = new WSServer(testdir.getPath(), "app");
wsb.copyWebInf("basic-echo-endpoint-config-web.xml");
- // the endpoint (extends javax.websocket.Endpoint)
+ // the endpoint (extends jakarta.websocket.Endpoint)
wsb.copyClass(BasicEchoEndpoint.class);
// the configuration (adds the endpoint)
wsb.copyClass(BasicEchoEndpointConfigContextListener.class);
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/IdleTimeoutContextListener.java
similarity index 80%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/IdleTimeoutContextListener.java
index df799eae4984..8316b6067226 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/IdleTimeoutContextListener.java
@@ -16,18 +16,18 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import javax.websocket.DeploymentException;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpointConfig;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.idletimeout.OnOpenIdleTimeoutEndpoint;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.idletimeout.OnOpenIdleTimeoutEndpoint;
/**
- * Example of adding a server WebSocket (extending {@link javax.websocket.Endpoint}) programmatically via config
+ * Example of adding a server WebSocket (extending {@link jakarta.websocket.Endpoint}) programmatically via config
*/
public class IdleTimeoutContextListener implements ServletContextListener
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/IdleTimeoutTest.java
similarity index 94%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/IdleTimeoutTest.java
index 9dc378e99eaf..313c025b93f5 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/IdleTimeoutTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.nio.channels.ClosedChannelException;
@@ -32,8 +32,8 @@
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
-import org.eclipse.jetty.websocket.javax.tests.WSServer;
+import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer;
+import org.eclipse.jetty.websocket.jakarta.tests.WSServer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -53,7 +53,7 @@ public static void setupServer() throws Exception
{
server = new WSServer(MavenTestingUtils.getTargetTestingPath(IdleTimeoutTest.class.getName()), "app");
server.copyWebInf("idle-timeout-config-web.xml");
- // the endpoint (extends javax.websocket.Endpoint)
+ // the endpoint (extends jakarta.websocket.Endpoint)
server.copyClass(IdleTimeoutOnOpenEndpoint.class);
// the configuration that adds the endpoint
server.copyClass(IdleTimeoutContextListener.class);
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/InputStreamEchoTest.java
similarity index 89%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/InputStreamEchoTest.java
index 14effe53593c..49fc4d260156 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/InputStreamEchoTest.java
@@ -16,31 +16,31 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
/**
- * Test various {@link javax.websocket.Decoder.BinaryStream Decoder.BinaryStream} echo behavior of Java InputStreams
+ * Test various {@link jakarta.websocket.Decoder.BinaryStream Decoder.BinaryStream} echo behavior of Java InputStreams
*/
public class InputStreamEchoTest
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandlerOnMessageTextStreamTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandlerOnMessageTextStreamTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java
index 781172066728..85a03e03c11c 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandlerOnMessageTextStreamTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java
@@ -16,40 +16,40 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.io.Reader;
import java.net.URI;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
-import javax.websocket.OnMessage;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler;
-import org.eclipse.jetty.websocket.javax.common.UpgradeRequest;
-import org.eclipse.jetty.websocket.javax.common.UpgradeRequestAdapter;
-import org.eclipse.jetty.websocket.javax.tests.WSEventTracker;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandler;
+import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequest;
+import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequestAdapter;
+import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-public class JavaxWebSocketFrameHandlerOnMessageTextStreamTest extends AbstractJavaxWebSocketServerFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnMessageTextStreamTest extends AbstractJakartaWebSocketServerFrameHandlerTest
{
@SuppressWarnings("Duplicates")
- private T performOnMessageInvocation(T socket, Consumer func) throws Exception
+ private T performOnMessageInvocation(T socket, Consumer func) throws Exception
{
UpgradeRequest request = new UpgradeRequestAdapter(URI.create("http://localhost:8080/msg/foo"));
// Establish endpoint function
- JavaxWebSocketFrameHandler frameHandler = container.newFrameHandler(socket, request);
+ JakartaWebSocketFrameHandler frameHandler = container.newFrameHandler(socket, request);
frameHandler.onOpen(new CoreSession.Empty(), Callback.NOOP);
func.accept(frameHandler);
return socket;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JettyServerEndpointConfiguratorTest.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JettyServerEndpointConfiguratorTest.java
index 2b1cd0eb5e5b..c975649a6cbc 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JettyServerEndpointConfiguratorTest.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.util.Iterator;
import java.util.ServiceLoader;
-import javax.websocket.server.ServerEndpointConfig;
-import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator;
+import jakarta.websocket.server.ServerEndpointConfig;
+import org.eclipse.jetty.websocket.jakarta.server.config.ContainerDefaultConfigurator;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -38,7 +38,7 @@ public class JettyServerEndpointConfiguratorTest
@Test
public void testServiceLoader()
{
- ServiceLoader loader = ServiceLoader.load(javax.websocket.server.ServerEndpointConfig.Configurator.class);
+ ServiceLoader loader = ServiceLoader.load(jakarta.websocket.server.ServerEndpointConfig.Configurator.class);
assertThat("loader", loader, notNullValue());
Iterator iter = loader.iterator();
assertThat("loader.iterator", iter, notNullValue());
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JsrBatchModeTest.java
similarity index 89%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JsrBatchModeTest.java
index 1f7ad6ee2f30..245ad830d747 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JsrBatchModeTest.java
@@ -16,23 +16,23 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.net.URI;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ContainerProvider;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.RemoteEndpoint;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpointConfig;
-
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
+
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.RemoteEndpoint;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -44,7 +44,7 @@ public class JsrBatchModeTest
{
public static class BasicEchoEndpoint extends Endpoint implements MessageHandler.Whole
{
- private javax.websocket.Session session;
+ private jakarta.websocket.Session session;
@Override
public void onMessage(String msg)
@@ -54,7 +54,7 @@ public void onMessage(String msg)
}
@Override
- public void onOpen(javax.websocket.Session session, EndpointConfig config)
+ public void onOpen(jakarta.websocket.Session session, EndpointConfig config)
{
this.session = session;
this.session.addMessageHandler(this);
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JsrEchoTest.java
similarity index 93%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JsrEchoTest.java
index 64798e6a4bed..a1c54fd5078b 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JsrEchoTest.java
@@ -16,25 +16,25 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Stream;
-import javax.websocket.CloseReason;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeAnnotatedTest.java
similarity index 90%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeAnnotatedTest.java
index 66d21d6a25d1..ba37c1e4b088 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeAnnotatedTest.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import javax.websocket.OnMessage;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
import org.eclipse.jetty.util.Callback;
@@ -34,8 +34,8 @@
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
-import org.eclipse.jetty.websocket.javax.tests.WSServer;
-import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker;
+import org.eclipse.jetty.websocket.jakarta.tests.WSServer;
+import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameHandlerTracker;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -43,7 +43,7 @@
import static org.hamcrest.Matchers.is;
/**
- * Test Echo of Large messages, targeting the {@link javax.websocket.Session#setMaxTextMessageBufferSize(int)} functionality
+ * Test Echo of Large messages, targeting the {@link jakarta.websocket.Session#setMaxTextMessageBufferSize(int)} functionality
*/
@ExtendWith(WorkDirExtension.class)
public class LargeAnnotatedTest
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeContainerTest.java
similarity index 91%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeContainerTest.java
index 541cc93b6487..d0675ad9ef85 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeContainerTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.net.URI;
import java.nio.charset.StandardCharsets;
@@ -33,8 +33,8 @@
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
-import org.eclipse.jetty.websocket.javax.tests.WSServer;
-import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker;
+import org.eclipse.jetty.websocket.jakarta.tests.WSServer;
+import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameHandlerTracker;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -42,7 +42,7 @@
import static org.hamcrest.Matchers.is;
/**
- * Test Echo of Large messages, targeting the {@link javax.websocket.WebSocketContainer#setDefaultMaxTextMessageBufferSize(int)} functionality
+ * Test Echo of Large messages, targeting the {@link jakarta.websocket.WebSocketContainer#setDefaultMaxTextMessageBufferSize(int)} functionality
*/
@ExtendWith(WorkDirExtension.class)
public class LargeContainerTest
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeEchoContextListener.java
similarity index 92%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeEchoContextListener.java
index 8f911b49656f..78d210f7e855 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeEchoContextListener.java
@@ -16,11 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import javax.websocket.server.ServerContainer;
+
+import jakarta.websocket.server.ServerContainer;
/**
* Configure the Large Text Message Size via the Container
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/MemoryUsageTest.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/MemoryUsageTest.java
index 55688823c0c9..12fd0f852ef6 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/MemoryUsageTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
@@ -24,18 +24,18 @@
import java.net.URI;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ContainerProvider;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -49,7 +49,7 @@ public class MemoryUsageTest
{
public static class BasicEndpoint extends Endpoint implements MessageHandler.Whole
{
- private javax.websocket.Session session;
+ private jakarta.websocket.Session session;
@Override
public void onMessage(String msg)
@@ -59,7 +59,7 @@ public void onMessage(String msg)
}
@Override
- public void onOpen(javax.websocket.Session session, EndpointConfig config)
+ public void onOpen(jakarta.websocket.Session session, EndpointConfig config)
{
this.session = session;
this.session.addMessageHandler(this);
@@ -78,7 +78,7 @@ public void prepare() throws Exception
server.addConnector(connector);
ServletContextHandler contextHandler = new ServletContextHandler(server, "/", true, false);
- JavaxWebSocketServletContainerInitializer.configure(contextHandler, (context, container) ->
+ JakartaWebSocketServletContainerInitializer.configure(contextHandler, (context, container) ->
{
ServerEndpointConfig config = ServerEndpointConfig.Builder.create(BasicEndpoint.class, "/").build();
container.addEndpoint(config);
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/OnMessageReturnTest.java
similarity index 89%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/OnMessageReturnTest.java
index 074205796b0d..583f602e69cf 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/OnMessageReturnTest.java
@@ -16,18 +16,18 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.net.URI;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
-import javax.websocket.CloseReason;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
import org.eclipse.jetty.util.Callback;
@@ -36,8 +36,8 @@
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
-import org.eclipse.jetty.websocket.javax.tests.WSServer;
-import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker;
+import org.eclipse.jetty.websocket.jakarta.tests.WSServer;
+import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameHandlerTracker;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -50,7 +50,7 @@ public class OnMessageReturnTest
@ServerEndpoint(value = "/echoreturn")
public static class EchoReturnEndpoint
{
- private javax.websocket.Session session = null;
+ private jakarta.websocket.Session session = null;
public CloseReason close = null;
public LinkedBlockingQueue messageQueue = new LinkedBlockingQueue<>();
@@ -68,7 +68,7 @@ public String onMessage(String message)
}
@OnOpen
- public void onOpen(javax.websocket.Session session)
+ public void onOpen(jakarta.websocket.Session session)
{
this.session = session;
}
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PartialEchoTest.java
similarity index 93%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PartialEchoTest.java
index 1cc20fbde058..5f32aa52caac 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PartialEchoTest.java
@@ -16,24 +16,24 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PingPongTest.java
similarity index 94%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PingPongTest.java
index 4d548a2f05b2..c41d5e35c8e0 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PingPongTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.net.URI;
import java.nio.file.Path;
@@ -35,9 +35,9 @@
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
-import org.eclipse.jetty.websocket.javax.tests.Timeouts;
-import org.eclipse.jetty.websocket.javax.tests.WSServer;
-import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker;
+import org.eclipse.jetty.websocket.jakarta.tests.Timeouts;
+import org.eclipse.jetty.websocket.jakarta.tests.WSServer;
+import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameHandlerTracker;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PongContextListener.java
similarity index 81%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PongContextListener.java
index 28ebee0ac022..aa6f74699d8b 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PongContextListener.java
@@ -16,18 +16,18 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import javax.websocket.DeploymentException;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpointConfig;
-import javax.websocket.server.ServerEndpointConfig.Configurator;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.pong.PongMessageEndpoint;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.server.HandshakeRequest;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.server.ServerEndpointConfig.Configurator;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.pong.PongMessageEndpoint;
public class PongContextListener implements ServletContextListener
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PongSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PongSocket.java
index 63231b8492d7..c31ef9368c18 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PongSocket.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.nio.charset.StandardCharsets;
-import javax.websocket.EndpointConfig;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.PongMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PrimitivesBinaryEchoTest.java
similarity index 91%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PrimitivesBinaryEchoTest.java
index ea89adc46f42..0813c5411917 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PrimitivesBinaryEchoTest.java
@@ -16,25 +16,25 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Stream;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.Hex;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.params.ParameterizedTest;
@@ -42,7 +42,7 @@
import org.junit.jupiter.params.provider.MethodSource;
/**
- * Test various {@link javax.websocket.Decoder.Binary Decoder.Binary} / {@link javax.websocket.Encoder.Binary Encoder.Binary} echo behavior of Java Primitives
+ * Test various {@link jakarta.websocket.Decoder.Binary Decoder.Binary} / {@link jakarta.websocket.Encoder.Binary Encoder.Binary} echo behavior of Java Primitives
*/
public class PrimitivesBinaryEchoTest
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PrimitivesTextEchoTest.java
similarity index 96%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PrimitivesTextEchoTest.java
index b62f4406b26d..a5410562d869 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PrimitivesTextEchoTest.java
@@ -16,24 +16,24 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Stream;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.params.ParameterizedTest;
@@ -41,7 +41,7 @@
import org.junit.jupiter.params.provider.MethodSource;
/**
- * Test various {@link javax.websocket.Decoder.Text Decoder.Text} / {@link javax.websocket.Encoder.Text Encoder.Text} echo behavior of Java Primitives
+ * Test various {@link jakarta.websocket.Decoder.Text Decoder.Text} / {@link jakarta.websocket.Encoder.Text Encoder.Text} echo behavior of Java Primitives
*/
public class PrimitivesTextEchoTest
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ReaderEchoTest.java
similarity index 88%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ReaderEchoTest.java
index 9461c0198d70..a00b0d008449 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ReaderEchoTest.java
@@ -16,31 +16,31 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
/**
- * Test various {@link javax.websocket.Decoder.TextStream Decoder.TextStream} and {@link javax.websocket.Encoder.TextStream Encoder.TextStream} echo behavior of Java Readers
+ * Test various {@link jakarta.websocket.Decoder.TextStream Decoder.TextStream} and {@link jakarta.websocket.Encoder.TextStream Encoder.TextStream} echo behavior of Java Readers
*/
public class ReaderEchoTest
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ServerDecoderTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ServerDecoderTest.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ServerDecoderTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ServerDecoderTest.java
index f64f11814fc2..88cb602cecf7 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ServerDecoderTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ServerDecoderTest.java
@@ -16,27 +16,27 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.net.URI;
import java.util.Collections;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ContainerProvider;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.websocket.javax.common.decoders.StringDecoder;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
-import org.eclipse.jetty.websocket.javax.tests.EventSocket;
-import org.eclipse.jetty.websocket.javax.tests.WSEndpointTracker;
+import org.eclipse.jetty.websocket.jakarta.common.decoders.StringDecoder;
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
+import org.eclipse.jetty.websocket.jakarta.tests.EventSocket;
+import org.eclipse.jetty.websocket.jakarta.tests.WSEndpointTracker;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -111,7 +111,7 @@ public void startServer() throws Exception
ServletContextHandler servletContextHandler = new ServletContextHandler(null, "/");
server.setHandler(servletContextHandler);
- JavaxWebSocketServletContainerInitializer.configure(servletContextHandler, ((servletContext, serverContainer) ->
+ JakartaWebSocketServletContainerInitializer.configure(servletContextHandler, ((servletContext, serverContainer) ->
{
serverContainer.addEndpoint(AnnotatedEndpoint.class);
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/SessionTest.java
similarity index 95%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/SessionTest.java
index 91ab10a03ed1..18b650d046c3 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/SessionTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.net.URI;
@@ -26,21 +26,21 @@
import java.util.Map;
import java.util.function.Consumer;
import java.util.stream.Stream;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.OnMessage;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.params.ParameterizedTest;
@@ -53,7 +53,7 @@ public class SessionTest
public static class SessionInfoSocket
{
@OnMessage
- public String onMessage(javax.websocket.Session session, String message)
+ public String onMessage(jakarta.websocket.Session session, String message)
{
if ("pathParams".equalsIgnoreCase(message))
{
@@ -105,10 +105,10 @@ public String onMessage(javax.websocket.Session session, String message)
public static class SessionInfoEndpoint extends Endpoint implements MessageHandler.Whole
{
- private javax.websocket.Session session;
+ private jakarta.websocket.Session session;
@Override
- public void onOpen(javax.websocket.Session session, EndpointConfig config)
+ public void onOpen(jakarta.websocket.Session session, EndpointConfig config)
{
this.session = session;
this.session.addMessageHandler(this);
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/SessionTrackingTest.java
similarity index 92%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/SessionTrackingTest.java
index 2e78d05929ba..89b8aa773aa6 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/SessionTrackingTest.java
@@ -16,20 +16,20 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.util.Collection;
import java.util.concurrent.TimeUnit;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.util.BlockingArrayQueue;
-import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainer;
-import org.eclipse.jetty.websocket.javax.tests.EventSocket;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainer;
+import org.eclipse.jetty.websocket.jakarta.tests.EventSocket;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -77,7 +77,7 @@ public void onMessage(Session session, String msg) throws IOException
}
private static LocalServer server;
- private static JavaxWebSocketClientContainer client;
+ private static JakartaWebSocketClientContainer client;
@BeforeAll
public static void startServer() throws Exception
@@ -86,7 +86,7 @@ public static void startServer() throws Exception
server.start();
server.getServerContainer().addEndpoint(SessionTrackingSocket.class);
- client = new JavaxWebSocketClientContainer();
+ client = new JakartaWebSocketClientContainer();
client.start();
}
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/StreamTest.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/StreamTest.java
index 9af2bb1e614b..d81546f9b09e 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/StreamTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.File;
import java.io.FileInputStream;
@@ -29,33 +29,33 @@
import java.time.Duration;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.CloseReason;
-import javax.websocket.CloseReason.CloseCode;
-import javax.websocket.CloseReason.CloseCodes;
-import javax.websocket.ContainerProvider;
-import javax.websocket.EndpointConfig;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.CloseReason.CloseCode;
+import jakarta.websocket.CloseReason.CloseCodes;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.HandshakeRequest;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.toolchain.test.FS;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
-import org.eclipse.jetty.websocket.javax.tests.Sha1Sum;
+import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainerProvider;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.tests.Sha1Sum;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -137,7 +137,7 @@ private void upload(String filename) throws Exception
}
finally
{
- JavaxWebSocketClientContainerProvider.stop(client);
+ JakartaWebSocketClientContainerProvider.stop(client);
}
}
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/TextStreamTest.java
similarity index 93%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/TextStreamTest.java
index e420db47bbc3..d2fe72e431b3 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/TextStreamTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.io.Reader;
@@ -30,17 +30,17 @@
import java.util.Random;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ContainerProvider;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.util.BlockingArrayQueue;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.StringUtil;
@@ -49,11 +49,11 @@
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
-import org.eclipse.jetty.websocket.javax.tests.DataUtils;
-import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
-import org.eclipse.jetty.websocket.javax.tests.WSEndpointTracker;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession;
+import org.eclipse.jetty.websocket.jakarta.tests.DataUtils;
+import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.tests.WSEndpointTracker;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -229,7 +229,7 @@ public void testMessageOrderingDoNotReadToEOF() throws Exception
QueuedTextStreamer serverEndpoint = Objects.requireNonNull(serverEndpoints.poll(5, TimeUnit.SECONDS));
int serverInputBufferSize = 1024;
- JavaxWebSocketSession serverSession = (JavaxWebSocketSession)serverEndpoint.session;
+ JakartaWebSocketSession serverSession = (JakartaWebSocketSession)serverEndpoint.session;
serverSession.getCoreSession().setInputBufferSize(serverInputBufferSize);
// Write some initial data.
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/UriTemplateParameterTest.java
similarity index 89%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/UriTemplateParameterTest.java
index 21fdae4b7def..586da39401dd 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/UriTemplateParameterTest.java
@@ -16,23 +16,23 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
-import org.eclipse.jetty.websocket.javax.tests.LocalServer;
+import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer;
+import org.eclipse.jetty.websocket.jakarta.tests.LocalServer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebAppClassLoaderTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/WebAppClassLoaderTest.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebAppClassLoaderTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/WebAppClassLoaderTest.java
index 9e40e26ab78c..cbbb82fecb03 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebAppClassLoaderTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/WebAppClassLoaderTest.java
@@ -16,28 +16,28 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.nio.file.Path;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.CloseReason;
-import javax.websocket.ContainerProvider;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
-import org.eclipse.jetty.websocket.javax.tests.EventSocket;
-import org.eclipse.jetty.websocket.javax.tests.WSServer;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession;
+import org.eclipse.jetty.websocket.jakarta.tests.EventSocket;
+import org.eclipse.jetty.websocket.jakarta.tests.WSServer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
@@ -131,7 +131,7 @@ public void testForWebAppClassLoader(String event) throws Exception
EventSocket clientSocket = new EventSocket();
Session session = client.connectToServer(clientSocket, server.getWsUri().resolve("/app/echo"));
session.getBasicRemote().sendText("trigger onMessage -> onError -> onClose");
- ((JavaxWebSocketSession)session).abort();
+ ((JakartaWebSocketSession)session).abort();
assertTrue(clientSocket.closeLatch.await(5, TimeUnit.SECONDS));
awaitServerClose();
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/WebSocketServerContainerExecutorTest.java
similarity index 80%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/WebSocketServerContainerExecutorTest.java
index 081037827e15..d555c056f577 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/WebSocketServerContainerExecutorTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server;
+package org.eclipse.jetty.websocket.jakarta.tests.server;
import java.io.IOException;
import java.io.InputStream;
@@ -30,27 +30,27 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.ContainerProvider;
-import javax.websocket.EndpointConfig;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
-import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer;
-import org.eclipse.jetty.websocket.javax.tests.WSURI;
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
+import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketServerContainer;
+import org.eclipse.jetty.websocket.jakarta.tests.WSURI;
import org.junit.jupiter.api.Test;
-import static org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer.HTTPCLIENT_ATTRIBUTE;
+import static org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer.HTTPCLIENT_ATTRIBUTE;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.sameInstance;
@@ -122,9 +122,9 @@ public static class ServerConnectServlet extends HttpServlet
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
// Server specific technique
- javax.websocket.server.ServerContainer container =
- (javax.websocket.server.ServerContainer)
- req.getServletContext().getAttribute("javax.websocket.server.ServerContainer");
+ jakarta.websocket.server.ServerContainer container =
+ (jakarta.websocket.server.ServerContainer)
+ req.getServletContext().getAttribute("jakarta.websocket.server.ServerContainer");
try
{
URI wsURI = WSURI.toWebsocket(req.getRequestURL()).resolve("/echo");
@@ -142,9 +142,9 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
}
}
- private Executor getJavaxServerContainerExecutor(ServletContextHandler servletContextHandler)
+ private Executor getJakartaServerContainerExecutor(ServletContextHandler servletContextHandler)
{
- JavaxWebSocketServerContainer serverContainer = JavaxWebSocketServerContainer.getContainer(
+ JakartaWebSocketServerContainer serverContainer = JakartaWebSocketServerContainer.getContainer(
servletContextHandler.getServletContext());
return serverContainer.getExecutor();
}
@@ -161,14 +161,14 @@ public void testClientExecutor() throws Exception
//set httpClient on server
HttpClient httpClient = new HttpClient();
- httpClient.setName("Javax-WebSocketServer@" + Integer.toHexString(httpClient.hashCode()));
+ httpClient.setName("Jakarta-WebSocketServer@" + Integer.toHexString(httpClient.hashCode()));
httpClient.setExecutor(executor);
server.addBean(httpClient, true);
server.setAttribute(HTTPCLIENT_ATTRIBUTE, httpClient);
// Using JSR356 Server Techniques to connectToServer()
contextHandler.addServlet(ServerConnectServlet.class, "/connect");
- JavaxWebSocketServletContainerInitializer.configure(contextHandler, (context, container) ->
+ JakartaWebSocketServletContainerInitializer.configure(contextHandler, (context, container) ->
container.addEndpoint(EchoSocket.class));
try
@@ -177,7 +177,7 @@ public void testClientExecutor() throws Exception
String response = doGet(server.getURI().resolve("/connect"));
assertThat("Response", response, startsWith("Connected to ws://"));
- Executor containerExecutor = getJavaxServerContainerExecutor(contextHandler);
+ Executor containerExecutor = getJakartaServerContainerExecutor(contextHandler);
assertThat(containerExecutor, sameInstance(executor));
}
finally
@@ -198,7 +198,7 @@ public void testServerExecutor() throws Exception
// Using JSR356 Server Techniques to connectToServer()
contextHandler.addServlet(ServerConnectServlet.class, "/connect");
- JavaxWebSocketServletContainerInitializer.configure(contextHandler, (context, container) ->
+ JakartaWebSocketServletContainerInitializer.configure(contextHandler, (context, container) ->
container.addEndpoint(EchoSocket.class));
try
{
@@ -206,7 +206,7 @@ public void testServerExecutor() throws Exception
String response = doGet(server.getURI().resolve("/connect"));
assertThat("Response", response, startsWith("Connected to ws://"));
- Executor containerExecutor = getJavaxServerContainerExecutor(contextHandler);
+ Executor containerExecutor = getJakartaServerContainerExecutor(contextHandler);
assertThat(containerExecutor, sameInstance(executor));
}
finally
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/configs/EchoSocketConfigurator.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/configs/EchoSocketConfigurator.java
index 1037e6e8e3d8..8b41fb643ba8 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/configs/EchoSocketConfigurator.java
@@ -16,12 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.configs;
+package org.eclipse.jetty.websocket.jakarta.tests.server.configs;
import java.util.Collections;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerEndpointConfig;
+
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.server.HandshakeRequest;
+import jakarta.websocket.server.ServerEndpointConfig;
public class EchoSocketConfigurator extends ServerEndpointConfig.Configurator
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java
index f0e10464f7a5..2fe70eb98957 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java
@@ -16,11 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
import java.nio.ByteBuffer;
-import javax.websocket.OnMessage;
-import javax.websocket.server.ServerEndpoint;
+
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/basic")
public class BasicBinaryMessageByteBufferSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseReasonSessionSocket.java
similarity index 82%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseReasonSessionSocket.java
index d749fade6084..e26003e52f45 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseReasonSessionSocket.java
@@ -16,12 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.CloseReason;
-import javax.websocket.OnClose;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/echo/close/reason/session")
public class BasicCloseReasonSessionSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseReasonSocket.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseReasonSocket.java
index 2f88a7b2e6de..e03bd519b3a6 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseReasonSocket.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.CloseReason;
-import javax.websocket.OnClose;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/echo/close/reason")
public class BasicCloseReasonSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseSessionReasonSocket.java
similarity index 82%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseSessionReasonSocket.java
index 1c9c8c98083f..c4348f48a151 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseSessionReasonSocket.java
@@ -16,12 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.CloseReason;
-import javax.websocket.OnClose;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/echo/close/session/reason")
public class BasicCloseSessionReasonSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseSocket.java
index a3ea2a243d6f..890909268e4e 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseSocket.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnClose;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/echo/close")
public class BasicCloseSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicEchoSocket.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicEchoSocket.java
index 35a8c754c000..901b21dd551a 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicEchoSocket.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
/**
* Annotated echo socket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSessionSocket.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSessionSocket.java
index 72465a614dce..7ee0698c7487 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSessionSocket.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnError;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/echo/error/session")
public class BasicErrorSessionSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSessionThrowableSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSessionThrowableSocket.java
index 0ca9f6e090af..5a2d797e0c0e 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSessionThrowableSocket.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnError;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/echo/error/session/throwable")
public class BasicErrorSessionThrowableSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSocket.java
index 4219628a1eac..560beef881e2 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSocket.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnError;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/echo/error")
public class BasicErrorSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorThrowableSessionSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorThrowableSessionSocket.java
index b504bb6af19e..4800f124a4c5 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorThrowableSessionSocket.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnError;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/echo/error/throwable/session")
public class BasicErrorThrowableSessionSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorThrowableSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorThrowableSocket.java
index a5a2df0495de..e664e9b04756 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorThrowableSocket.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnError;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/echo/error/throwable")
public class BasicErrorThrowableSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenCloseSessionSocket.java
similarity index 82%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenCloseSessionSocket.java
index 0100981b7a66..556b111c9e87 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenCloseSessionSocket.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.CloseReason;
-import javax.websocket.OnClose;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/basic")
public class BasicOpenCloseSessionSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenCloseSocket.java
similarity index 83%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenCloseSocket.java
index f7f7eece16ed..853ef5c4e47f 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenCloseSocket.java
@@ -16,12 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.CloseReason;
-import javax.websocket.OnClose;
-import javax.websocket.OnOpen;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/basic")
public class BasicOpenCloseSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenSessionSocket.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenSessionSocket.java
index deff1f6761ff..38201b8e34e0 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenSessionSocket.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/echo/onOpen/session")
public class BasicOpenSessionSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenSocket.java
index d5bd497cc1a0..d70e36923e87 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenSocket.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnOpen;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/echo/onOpen")
public class BasicOpenSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicPongMessageSocket.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicPongMessageSocket.java
index 418a5d40d07f..5dabd084ca42 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicPongMessageSocket.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnMessage;
-import javax.websocket.PongMessage;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/echo/pong")
public class BasicPongMessageSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicTextMessageStringSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicTextMessageStringSocket.java
index f4ddd4bf9acc..ed8fb9149ea7 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicTextMessageStringSocket.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnMessage;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/basic")
public class BasicTextMessageStringSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/ByteBufferSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/ByteBufferSocket.java
index 03c129ec7dbb..305f5ce69162 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/ByteBufferSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
import java.io.IOException;
import java.nio.ByteBuffer;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.log.Log;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/ConfiguredEchoSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/ConfiguredEchoSocket.java
index 7e4c15cff58b..cc9912e93242 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/ConfiguredEchoSocket.java
@@ -16,20 +16,20 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
import java.nio.ByteBuffer;
import java.util.Locale;
-import javax.websocket.EndpointConfig;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
-import org.eclipse.jetty.websocket.javax.tests.coders.DateDecoder;
-import org.eclipse.jetty.websocket.javax.tests.coders.TimeEncoder;
-import org.eclipse.jetty.websocket.javax.tests.server.configs.EchoSocketConfigurator;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
+import org.eclipse.jetty.websocket.jakarta.tests.coders.DateDecoder;
+import org.eclipse.jetty.websocket.jakarta.tests.coders.TimeEncoder;
+import org.eclipse.jetty.websocket.jakarta.tests.server.configs.EchoSocketConfigurator;
import static java.util.Comparator.naturalOrder;
import static java.util.stream.Collectors.joining;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/DateTextSocket.java
similarity index 83%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/DateTextSocket.java
index adcf19f2b69b..220461f91208 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/DateTextSocket.java
@@ -16,21 +16,21 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
import java.io.IOException;
import java.util.Date;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.websocket.javax.tests.coders.DateDecoder;
-import org.eclipse.jetty.websocket.javax.tests.coders.DateEncoder;
+import org.eclipse.jetty.websocket.jakarta.tests.coders.DateDecoder;
+import org.eclipse.jetty.websocket.jakarta.tests.coders.DateEncoder;
@ServerEndpoint(value = "/echo/beans/date", decoders = {DateDecoder.class}, encoders = {DateEncoder.class})
public class DateTextSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java
index fe1dadcdace5..fbe8e7cdb555 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java
@@ -16,12 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
public class IdleTimeoutOnOpenEndpoint extends Endpoint implements MessageHandler.Whole
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/IdleTimeoutOnOpenSocket.java
similarity index 83%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/IdleTimeoutOnOpenSocket.java
index a0f500739412..e418084270a1 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/IdleTimeoutOnOpenSocket.java
@@ -16,14 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
-
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.websocket.core.exception.WebSocketTimeoutException;
@ServerEndpoint(value = "/idle-onopen-socket")
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidCloseIntSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidCloseIntSocket.java
index 9bf08efa13cc..9fd2bced1d00 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidCloseIntSocket.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnClose;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/invalid")
public class InvalidCloseIntSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidErrorErrorSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidErrorErrorSocket.java
index a30d53d1a4b1..ad9f73931689 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidErrorErrorSocket.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnError;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/invalid")
public class InvalidErrorErrorSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidErrorIntSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidErrorIntSocket.java
index e9641d6df64c..5457224b279c 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidErrorIntSocket.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnError;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/invalid")
public class InvalidErrorIntSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenCloseReasonSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenCloseReasonSocket.java
index 81f8182896f2..e959606e443a 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenCloseReasonSocket.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.CloseReason;
-import javax.websocket.OnOpen;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/invalid")
public class InvalidOpenCloseReasonSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenIntSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenIntSocket.java
index 2ceb4b482c88..c10008f3c5e3 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenIntSocket.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnOpen;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/invalid")
public class InvalidOpenIntSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenSessionIntSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenSessionIntSocket.java
index d1b087d94eae..66dc3857cad2 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenSessionIntSocket.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/invalid")
public class InvalidOpenSessionIntSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/StatelessTextMessageStringSocket.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/StatelessTextMessageStringSocket.java
index b1004a0b2250..122111bfd159 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/StatelessTextMessageStringSocket.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/stateless")
public class StatelessTextMessageStringSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/TrackingSocket.java
similarity index 93%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/TrackingSocket.java
index 1ef52879c42d..1fd7f7d5e43c 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/TrackingSocket.java
@@ -16,12 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingDeque;
-import javax.websocket.CloseReason;
+
+import jakarta.websocket.CloseReason;
public abstract class TrackingSocket
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/binary/ByteBufferSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/binary/ByteBufferSocket.java
index 0fd4a8328910..5b93981c439b 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/binary/ByteBufferSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.binary;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.binary;
import java.io.IOException;
import java.nio.ByteBuffer;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.log.Log;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/BasicEchoEndpoint.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/BasicEchoEndpoint.java
index 83356059e812..375bef5f879b 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/BasicEchoEndpoint.java
@@ -16,12 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
/**
* Example of websocket endpoint based on extending {@link Endpoint}
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/BasicEchoSocket.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/BasicEchoSocket.java
index 810630e94741..c055ecb0f863 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/BasicEchoSocket.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
/**
* Annotated echo socket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoAsyncTextSocket.java
similarity index 82%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoAsyncTextSocket.java
index aeec2baefe9e..d4f8acfbd180 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoAsyncTextSocket.java
@@ -16,12 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint("/echo/text/async")
public class EchoAsyncTextSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoBasicTextSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoBasicTextSocket.java
index 705771aebbef..683dd5e42251 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoBasicTextSocket.java
@@ -16,14 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo;
import java.io.IOException;
-import javax.websocket.CloseReason;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint("/echo/text/basic")
public class EchoBasicTextSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoReturnEndpoint.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoReturnEndpoint.java
index 01561d25b50a..3435bb46960f 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoReturnEndpoint.java
@@ -16,15 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo;
import java.io.IOException;
import java.util.concurrent.LinkedBlockingQueue;
-import javax.websocket.CloseReason;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/echoreturn")
public class EchoReturnEndpoint
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoReturnTextSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoReturnTextSocket.java
index f1e576445d04..ddf4597236ef 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoReturnTextSocket.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo;
-import javax.websocket.OnMessage;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint("/echo/text/return")
public class EchoReturnTextSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java
similarity index 83%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java
index 881882d75531..b4ac2e3c81dd 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint("/echo/text/async/stateless")
public class EchoStatelessAsyncTextSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java
index d335fae8434e..e8f7296f3573 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java
@@ -16,13 +16,14 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo;
import java.io.IOException;
-import javax.websocket.CloseReason;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint("/echo/text/basic/stateless")
public class EchoStatelessBasicTextSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/LargeEchoConfiguredSocket.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/LargeEchoConfiguredSocket.java
index 291aab54a0d4..861d5fca0521 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/LargeEchoConfiguredSocket.java
@@ -16,12 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
/**
* Annotated echo socket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/LargeEchoDefaultSocket.java
similarity index 82%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/LargeEchoDefaultSocket.java
index 1eb5d6e234c1..590f135bc4e5 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/LargeEchoDefaultSocket.java
@@ -16,12 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
+import jakarta.websocket.server.ServerEndpoint;
/**
* Annotated echo socket (default behavior as defined from {@link WebSocketContainer#setDefaultMaxTextMessageBufferSize(int)})
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java
index 569c9b8c9834..4cba5845b782 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java
@@ -16,12 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.idletimeout;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.idletimeout;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
public class OnOpenIdleTimeoutEndpoint extends Endpoint implements MessageHandler.Whole
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java
similarity index 81%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java
index caef4148749e..765aad53f7d7 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java
@@ -16,12 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.idletimeout;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.idletimeout;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/idle-onopen-socket")
public class OnOpenIdleTimeoutSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTextSessionSocket.java
similarity index 88%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTextSessionSocket.java
index db2264a24d0d..80c60ec75e09 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTextSessionSocket.java
@@ -16,14 +16,14 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.partial;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.partial;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTextSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTextSocket.java
index 6428e446f031..77f8a8415f11 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTextSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.partial;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.partial;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTrackingSocket.java
similarity index 81%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTrackingSocket.java
index 27aaa397a827..fa7596ac52d9 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTrackingSocket.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.partial;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.partial;
import java.io.IOException;
-import javax.websocket.OnMessage;
-import javax.websocket.server.ServerEndpoint;
-import org.eclipse.jetty.websocket.javax.tests.server.sockets.TrackingSocket;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.ServerEndpoint;
+import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.TrackingSocket;
@ServerEndpoint("/echo/partial/tracking")
public class PartialTrackingSocket extends TrackingSocket
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/pong/PongMessageEndpoint.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/pong/PongMessageEndpoint.java
index bec0b116ec8c..0635dfad7fd0 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/pong/PongMessageEndpoint.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.pong;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.pong;
import java.nio.charset.StandardCharsets;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.PongMessage;
-import javax.websocket.Session;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.Session;
import org.eclipse.jetty.util.BufferUtil;
public class PongMessageEndpoint extends Endpoint implements MessageHandler.Whole
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java
index 860139941717..a59a490090f9 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanObjectTextSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanObjectTextSocket.java
index 9925aa9d6019..36f64c00f73f 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanObjectTextSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanTextParamSocket.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanTextParamSocket.java
index 13bde14f282e..697dd949ec18 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanTextParamSocket.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanTextSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanTextSocket.java
index 2970f0b8d6e4..3375e958f008 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanTextSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ByteObjectTextSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ByteObjectTextSocket.java
index c282107f4a08..6b315825d205 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ByteObjectTextSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ByteTextSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ByteTextSocket.java
index 15a21089d80e..559eb92b5a86 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ByteTextSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/CharTextSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/CharTextSocket.java
index 59cd1c655f12..5ed67cc60f2d 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/CharTextSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/CharacterObjectTextSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/CharacterObjectTextSocket.java
index 5cb41fc75376..2760f8b1611b 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/CharacterObjectTextSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/DoubleObjectTextSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/DoubleObjectTextSocket.java
index 143d02018392..eadd26fa419a 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/DoubleObjectTextSocket.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
import java.util.Locale;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/DoubleTextSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/DoubleTextSocket.java
index 2ab63440a9a7..38b03cb0ec3c 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/DoubleTextSocket.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
import java.util.Locale;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/FloatObjectTextSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/FloatObjectTextSocket.java
index bde739ad1396..c32043f5eef0 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/FloatObjectTextSocket.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
import java.util.Locale;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/FloatTextSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/FloatTextSocket.java
index 3cfc53de667b..4acd532a6948 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/FloatTextSocket.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
import java.util.Locale;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntParamTextSocket.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntParamTextSocket.java
index cf9d2e14e47b..cb405b26cc4c 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntParamTextSocket.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntTextSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntTextSocket.java
index deb1d1c0ca6f..89f72b38a6f4 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntTextSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java
index 13a56e398b5b..cbc060ec1394 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntegerObjectTextSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntegerObjectTextSocket.java
index 4cd7b50a3ac0..04598869ece7 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntegerObjectTextSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/LongObjectTextSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/LongObjectTextSocket.java
index 65b41d1f9ea3..923ed46f70fc 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/LongObjectTextSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/LongTextSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/LongTextSocket.java
index e12aeacf6eca..6545dd490539 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/LongTextSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ShortObjectTextSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ShortObjectTextSocket.java
index 5b601d016174..92e80291ad1c 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ShortObjectTextSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ShortTextSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ShortTextSocket.java
index b437f52bd2d4..538cc460504e 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ShortTextSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives;
import java.io.IOException;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/InputStreamSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/InputStreamSocket.java
index edcd062a26a0..7d22c5c8fa00 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/InputStreamSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.streaming;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.streaming;
import java.io.IOException;
import java.io.InputStream;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.StringUtil;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/ReaderParamSocket.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/ReaderParamSocket.java
index 37f0cd2e0667..03d06c543d59 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/ReaderParamSocket.java
@@ -16,17 +16,17 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.streaming;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.streaming;
import java.io.IOException;
import java.io.Reader;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.log.Log;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/ReaderSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/ReaderSocket.java
index 82c9b16e05c8..b331bfbf849b 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/ReaderSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.streaming;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.streaming;
import java.io.IOException;
import java.io.Reader;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.log.Log;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/StringReturnReaderParamSocket.java
similarity index 86%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/StringReturnReaderParamSocket.java
index 1b0c0ef9e51b..e2cba6dc3404 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/StringReturnReaderParamSocket.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.server.sockets.streaming;
+package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.streaming;
import java.io.IOException;
import java.io.Reader;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.log.Log;
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/alt-filter-web.xml
similarity index 88%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/alt-filter-web.xml
index f1723581a3ab..a15dd514c3e9 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/resources/alt-filter-web.xml
@@ -7,7 +7,7 @@
version="3.1">
- org.eclipse.jetty.websocket.javax.addDynamicFilter
+ org.eclipse.jetty.websocket.jakarta.addDynamicFilter
false
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/basic-echo-endpoint-config-web.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/basic-echo-endpoint-config-web.xml
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/basic-echo-endpoint-config-web.xml
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/basic-echo-endpoint-config-web.xml
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/larger.png b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/larger.png
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/larger.png
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/larger.png
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/larger.png.sha b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/larger.png.sha
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/larger.png.sha
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/larger.png.sha
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/largest.jpg b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/largest.jpg
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/largest.jpg
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/largest.jpg
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/largest.jpg.sha b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/largest.jpg.sha
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/largest.jpg.sha
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/largest.jpg.sha
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/medium.png b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/medium.png
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/medium.png
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/medium.png
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/medium.png.sha b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/medium.png.sha
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/medium.png.sha
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/medium.png.sha
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/small.png b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/small.png
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/small.png
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/small.png
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/small.png.sha b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/small.png.sha
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/small.png.sha
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/small.png.sha
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/empty-web.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/empty-web.xml
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/empty-web.xml
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/empty-web.xml
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/idle-timeout-config-web.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/idle-timeout-config-web.xml
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/idle-timeout-config-web.xml
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/idle-timeout-config-web.xml
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-jakarta-tests/src/test/resources/jetty-logging.properties
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/jetty-logging.properties
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/jetty-logging.properties
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/keystore.p12 b/jetty-websocket/websocket-jakarta-tests/src/test/resources/keystore.p12
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/keystore.p12
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/keystore.p12
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/large-echo-config-web.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/large-echo-config-web.xml
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/large-echo-config-web.xml
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/large-echo-config-web.xml
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/logback-test.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/logback-test.xml
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/logback-test.xml
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/logback-test.xml
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/pong-config-web.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/pong-config-web.xml
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/pong-config-web.xml
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/pong-config-web.xml
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/quotes-ben.txt b/jetty-websocket/websocket-jakarta-tests/src/test/resources/quotes-ben.txt
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/quotes-ben.txt
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/quotes-ben.txt
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/quotes-twain.txt b/jetty-websocket/websocket-jakarta-tests/src/test/resources/quotes-twain.txt
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/quotes-twain.txt
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/quotes-twain.txt
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/simple/jetty-websocket-httpclient.xml
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/simple/jetty-websocket-httpclient.xml
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-alt-config-via-listener.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-alt-config-via-listener.xml
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-alt-config-via-listener.xml
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-alt-config-via-listener.xml
index 1479493aff3e..de48b0a2e937 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-alt-config-via-listener.xml
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-alt-config-via-listener.xml
@@ -7,7 +7,7 @@
version="3.1">
- org.eclipse.jetty.websocket.javax.tests.server.InfoContextAltAttributeListener
+ org.eclipse.jetty.websocket.jakarta.tests.server.InfoContextAltAttributeListener
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-listener.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-config-via-listener.xml
similarity index 75%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-listener.xml
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-config-via-listener.xml
index d9811f6e0e5e..450dafb4f062 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-listener.xml
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-config-via-listener.xml
@@ -4,14 +4,14 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
-
+
- org.eclipse.jetty.websocket.javax
+ org.eclipse.jetty.websocket.jakarta
false
- org.eclipse.jetty.websocket.javax.tests.server.InfoContextAttributeListener
+ org.eclipse.jetty.websocket.jakarta.tests.server.InfoContextAttributeListener
diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-servlet-init.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-config-via-servlet-init.xml
similarity index 79%
rename from jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-servlet-init.xml
rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-config-via-servlet-init.xml
index f8c8fbf61e92..790993bedee3 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-servlet-init.xml
+++ b/jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-config-via-servlet-init.xml
@@ -4,15 +4,15 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
-
+
- org.eclipse.jetty.websocket.javax
+ org.eclipse.jetty.websocket.jakarta
false
info-servlet
- org.eclipse.jetty.websocket.javax.tests.server.InfoServlet
+ org.eclipse.jetty.websocket.jakarta.tests.server.InfoServlet
1
diff --git a/jetty-websocket/websocket-javax-tests/src/test/webapp/index.html b/jetty-websocket/websocket-jakarta-tests/src/test/webapp/index.html
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/src/test/webapp/index.html
rename to jetty-websocket/websocket-jakarta-tests/src/test/webapp/index.html
diff --git a/jetty-websocket/websocket-javax-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider b/jetty-websocket/websocket-javax-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider
deleted file mode 100644
index 283ed9d2000e..000000000000
--- a/jetty-websocket/websocket-javax-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider
\ No newline at end of file
diff --git a/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
deleted file mode 100644
index 68d8b37077cc..000000000000
--- a/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer
\ No newline at end of file
diff --git a/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator b/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator
deleted file mode 100644
index e9f7fc540a4f..000000000000
--- a/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator
\ No newline at end of file
diff --git a/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration b/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration
deleted file mode 100644
index 9c5a60b0447d..000000000000
--- a/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration
\ No newline at end of file
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
index c9da57fff82f..ef90e5feddc8 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
@@ -57,7 +57,7 @@ public static JettyWebSocketServerContainer getContainer(ServletContext servletC
public static JettyWebSocketServerContainer ensureContainer(ServletContext servletContext)
{
- ServletContextHandler contextHandler = ServletContextHandler.getServletContextHandler(servletContext, "Javax Websocket");
+ ServletContextHandler contextHandler = ServletContextHandler.getServletContextHandler(servletContext, "Jakarta Websocket");
if (contextHandler.getServer() == null)
throw new IllegalStateException("Server has not been set on the ServletContextHandler");
diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml
index 62c790f19a95..61da735e7a07 100644
--- a/jetty-websocket/websocket-servlet/pom.xml
+++ b/jetty-websocket/websocket-servlet/pom.xml
@@ -66,7 +66,7 @@
org.eclipse.jetty.websocket:websocket-jetty-api
- javax.websocket
+ jakarta.websocket
@@ -105,7 +105,7 @@
- javax.websocket.servlet Implementation
+ jakarta.websocket.servlet Implementation
org.eclipse.jetty.websocket.servlet.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java b/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java
index c09827cc608a..77291111ef76 100644
--- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java
+++ b/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java
@@ -238,7 +238,7 @@ private static MethodHandle mutatedInvoker(MethodHandles.Lookup lookup, Class>
}
// Build up Arg list representing the MethodHandle parameters
- // ParamIdentifier is used to find named parameters (like javax.websocket's @PathParam declaration)
+ // ParamIdentifier is used to find named parameters (like jakarta.websocket's @PathParam declaration)
boolean hasNamedParamArgs = false;
Arg[] parameterArgs = new Arg[parameterTypes.length + 1];
parameterArgs[0] = new Arg(targetClass); // first type is always the calling object instance type
diff --git a/pom.xml b/pom.xml
index 3a6f60401f60..087058cf6e1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
5.1.1.RELEASE
1.2
4.0.3
- 1.1.2
+ 2.0.0-SNAPSHOT
9.0.29
9.4.8.Final
@@ -958,7 +958,7 @@