Configuration instances are discovered by the {@link Configurations} class using either the
* {@link ServiceLoader} mechanism or by an explicit call to {@link Configurations#setKnown(String...)}.
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index b2952f150a81..9c48073ac2dd 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -3,7 +3,7 @@
jetty-projectorg.eclipse.jetty
- 10.0.0-SNAPSHOT
+ 11.0.0-SNAPSHOT4.0.0
@@ -23,11 +23,11 @@
websocket-jetty-clientwebsocket-jetty-serverwebsocket-jetty-tests
-
- websocket-javax-common
- websocket-javax-client
- websocket-javax-server
- websocket-javax-tests
+
+ websocket-jakarta-common
+ websocket-jakarta-client
+ websocket-jakarta-server
+ websocket-jakarta-tests
diff --git a/jetty-websocket/websocket-core/pom.xml b/jetty-websocket/websocket-core/pom.xml
index be8510562c76..8d977ecec38d 100644
--- a/jetty-websocket/websocket-core/pom.xml
+++ b/jetty-websocket/websocket-core/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty.websocketwebsocket-parent
- 10.0.0-SNAPSHOT
+ 11.0.0-SNAPSHOT4.0.0
@@ -70,7 +70,7 @@
org.eclipse.jetty.websocket:websocket-jetty-api
- javax.websocket
+ jakarta.websocket
diff --git a/jetty-websocket/websocket-core/src/main/config/modules/websocket.mod b/jetty-websocket/websocket-core/src/main/config/modules/websocket.mod
index da53af6d2e2a..4c3adf4949b3 100644
--- a/jetty-websocket/websocket-core/src/main/config/modules/websocket.mod
+++ b/jetty-websocket/websocket-core/src/main/config/modules/websocket.mod
@@ -1,11 +1,11 @@
DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
[description]
-Enable both jetty and javax websocket modules for deployed web applications.
+Enable both jetty and jakarta websocket modules for deployed web applications.
[tags]
websocket
[depend]
websocket-jetty
-websocket-javax
+websocket-jakarta
diff --git a/jetty-websocket/websocket-javax-client/pom.xml b/jetty-websocket/websocket-jakarta-client/pom.xml
similarity index 81%
rename from jetty-websocket/websocket-javax-client/pom.xml
rename to jetty-websocket/websocket-jakarta-client/pom.xml
index b2fa1cd48aa0..bf217e12af5f 100644
--- a/jetty-websocket/websocket-javax-client/pom.xml
+++ b/jetty-websocket/websocket-jakarta-client/pom.xml
@@ -3,15 +3,15 @@
org.eclipse.jetty.websocketwebsocket-parent
- 10.0.0-SNAPSHOT
+ 11.0.0-SNAPSHOT4.0.0
- websocket-javax-client
- Jetty :: Websocket :: javax.websocket :: Client
+ websocket-jakarta-client
+ Jetty :: Websocket :: jakarta.websocket :: Client
- ${project.groupId}.javax.client
+ ${project.groupId}.jakarta.client
@@ -22,7 +22,7 @@
org.eclipse.jetty.websocket
- websocket-javax-common
+ websocket-jakarta-common${project.version}
@@ -32,7 +32,7 @@
org.eclipse.jetty.toolchain
- jetty-javax-websocket-api
+ jetty-jakarta-websocket-apiorg.eclipse.jetty
@@ -60,15 +60,15 @@
- javax.websocket.client Implementation
+ jakarta.websocket.client Implementation
- org.eclipse.jetty.websocket.javax.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
+ org.eclipse.jetty.websocket.jakarta.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
- osgi.serviceloader;osgi.serviceloader=javax.websocket.ContainerProvider
+ osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/module-info.java b/jetty-websocket/websocket-jakarta-client/src/main/java/module-info.java
similarity index 70%
rename from jetty-websocket/websocket-javax-client/src/main/java/module-info.java
rename to jetty-websocket/websocket-jakarta-client/src/main/java/module-info.java
index c3e34017719d..383e38f9a982 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jakarta-client/src/main/java/module-info.java
@@ -16,18 +16,17 @@
// ========================================================================
//
-import javax.websocket.ContainerProvider;
+import jakarta.websocket.ContainerProvider;
+import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainerProvider;
-import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider;
-
-module org.eclipse.jetty.websocket.javax.client
+module org.eclipse.jetty.websocket.jakarta.client
{
- exports org.eclipse.jetty.websocket.javax.client;
+ exports org.eclipse.jetty.websocket.jakarta.client;
requires transitive org.eclipse.jetty.client;
- requires transitive org.eclipse.jetty.websocket.javax.common;
+ requires transitive org.eclipse.jetty.websocket.jakarta.common;
requires org.eclipse.jetty.websocket.core;
requires org.eclipse.jetty.websocket.util;
- provides ContainerProvider with JavaxWebSocketClientContainerProvider;
+ provides ContainerProvider with JakartaWebSocketClientContainerProvider;
}
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/AnnotatedClientEndpointConfig.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/AnnotatedClientEndpointConfig.java
similarity index 89%
rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/AnnotatedClientEndpointConfig.java
rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/AnnotatedClientEndpointConfig.java
index fc91b3c413f0..8265b0362991 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/AnnotatedClientEndpointConfig.java
+++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/AnnotatedClientEndpointConfig.java
@@ -16,14 +16,14 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.client;
+package org.eclipse.jetty.websocket.jakarta.client;
import java.util.Collections;
import java.util.List;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.ClientEndpointConfig;
-import org.eclipse.jetty.websocket.javax.common.ClientEndpointConfigWrapper;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.ClientEndpointConfig;
+import org.eclipse.jetty.websocket.jakarta.common.ClientEndpointConfigWrapper;
import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
public class AnnotatedClientEndpointConfig extends ClientEndpointConfigWrapper
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/BasicClientEndpointConfig.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/BasicClientEndpointConfig.java
similarity index 88%
rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/BasicClientEndpointConfig.java
rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/BasicClientEndpointConfig.java
index 1f250b434904..60418ef71e21 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/BasicClientEndpointConfig.java
+++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/BasicClientEndpointConfig.java
@@ -16,9 +16,9 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.client;
+package org.eclipse.jetty.websocket.jakarta.client;
-import org.eclipse.jetty.websocket.javax.common.ClientEndpointConfigWrapper;
+import org.eclipse.jetty.websocket.jakarta.common.ClientEndpointConfigWrapper;
public class BasicClientEndpointConfig extends ClientEndpointConfigWrapper
{
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyConfigurator.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/EmptyConfigurator.java
similarity index 89%
rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyConfigurator.java
rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/EmptyConfigurator.java
index 7dc21b784c87..4404be035fcb 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyConfigurator.java
+++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/EmptyConfigurator.java
@@ -16,12 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.client;
+package org.eclipse.jetty.websocket.jakarta.client;
import java.util.List;
import java.util.Map;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.HandshakeResponse;
+
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.HandshakeResponse;
public class EmptyConfigurator extends ClientEndpointConfig.Configurator
{
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxClientUpgradeRequest.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaClientUpgradeRequest.java
similarity index 77%
rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxClientUpgradeRequest.java
rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaClientUpgradeRequest.java
index 5541724164bf..7d9f450bb478 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxClientUpgradeRequest.java
+++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaClientUpgradeRequest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.client;
+package org.eclipse.jetty.websocket.jakarta.client;
import java.net.URI;
import java.security.Principal;
@@ -26,14 +26,14 @@
import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.core.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler;
-import org.eclipse.jetty.websocket.javax.common.UpgradeRequest;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandler;
+import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequest;
-public class JavaxClientUpgradeRequest extends ClientUpgradeRequest implements UpgradeRequest
+public class JakartaClientUpgradeRequest extends ClientUpgradeRequest implements UpgradeRequest
{
- private final JavaxWebSocketFrameHandler frameHandler;
+ private final JakartaWebSocketFrameHandler frameHandler;
- public JavaxClientUpgradeRequest(JavaxWebSocketClientContainer clientContainer, WebSocketCoreClient coreClient, URI requestURI, Object websocketPojo)
+ public JakartaClientUpgradeRequest(JakartaWebSocketClientContainer clientContainer, WebSocketCoreClient coreClient, URI requestURI, Object websocketPojo)
{
super(coreClient, requestURI);
frameHandler = clientContainer.newFrameHandler(websocketPojo, this);
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainer.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainer.java
similarity index 77%
rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainer.java
rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainer.java
index fe36d8dedd15..3c85aa4639cf 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainer.java
+++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainer.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.client;
+package org.eclipse.jetty.websocket.jakarta.client;
import java.io.IOException;
import java.net.URI;
@@ -28,73 +28,73 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Function;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.DeploymentException;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Extension;
-import javax.websocket.Session;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Extension;
+import jakarta.websocket.Session;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.util.annotation.ManagedObject;
import org.eclipse.jetty.websocket.core.WebSocketComponents;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
-import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtensionConfig;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
+import org.eclipse.jetty.websocket.jakarta.common.ConfiguredEndpoint;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketContainer;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketExtensionConfig;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandler;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerFactory;
/**
- * Container for Client use of the javax.websocket API.
+ * Container for Client use of the jakarta.websocket API.
*
* This should be specific to a JVM if run in a standalone mode. or specific to a WebAppContext if running on the Jetty server.
*/
@ManagedObject("JSR356 Client Container")
-public class JavaxWebSocketClientContainer extends JavaxWebSocketContainer implements javax.websocket.WebSocketContainer
+public class JakartaWebSocketClientContainer extends JakartaWebSocketContainer implements jakarta.websocket.WebSocketContainer
{
protected WebSocketCoreClient coreClient;
protected Function coreClientFactory;
- private final JavaxWebSocketClientFrameHandlerFactory frameHandlerFactory;
+ private final JakartaWebSocketClientFrameHandlerFactory frameHandlerFactory;
- public JavaxWebSocketClientContainer()
+ public JakartaWebSocketClientContainer()
{
this(new WebSocketComponents());
}
/**
- * Create a {@link javax.websocket.WebSocketContainer} using the supplied
+ * Create a {@link jakarta.websocket.WebSocketContainer} using the supplied
* {@link HttpClient} for environments where you want to configure
* SSL/TLS or Proxy behaviors.
*
* @param httpClient the HttpClient instance to use
*/
- public JavaxWebSocketClientContainer(final HttpClient httpClient)
+ public JakartaWebSocketClientContainer(final HttpClient httpClient)
{
this(new WebSocketComponents(), (wsComponents) ->
{
WebSocketCoreClient coreClient = new WebSocketCoreClient(httpClient, wsComponents);
- coreClient.getHttpClient().setName("Javax-WebSocketClient@" + Integer.toHexString(coreClient.getHttpClient().hashCode()));
+ coreClient.getHttpClient().setName("Jakarta-WebSocketClient@" + Integer.toHexString(coreClient.getHttpClient().hashCode()));
return coreClient;
});
}
- public JavaxWebSocketClientContainer(WebSocketComponents components)
+ public JakartaWebSocketClientContainer(WebSocketComponents components)
{
this(components, (wsComponents) ->
{
WebSocketCoreClient coreClient = new WebSocketCoreClient(wsComponents);
- coreClient.getHttpClient().setName("Javax-WebSocketClient@" + Integer.toHexString(coreClient.getHttpClient().hashCode()));
+ coreClient.getHttpClient().setName("Jakarta-WebSocketClient@" + Integer.toHexString(coreClient.getHttpClient().hashCode()));
return coreClient;
});
}
- public JavaxWebSocketClientContainer(WebSocketComponents components, Function coreClientFactory)
+ public JakartaWebSocketClientContainer(WebSocketComponents components, Function coreClientFactory)
{
super(components);
this.coreClientFactory = coreClientFactory;
- this.frameHandlerFactory = new JavaxWebSocketClientFrameHandlerFactory(this);
+ this.frameHandlerFactory = new JakartaWebSocketClientFrameHandlerFactory(this);
}
protected HttpClient getHttpClient()
@@ -119,7 +119,7 @@ protected WebSocketCoreClient getWebSocketCoreClient()
* @param upgradeRequest the upgrade request information
* @return the future for the session, available on success of connect
*/
- private CompletableFuture connect(JavaxClientUpgradeRequest upgradeRequest)
+ private CompletableFuture connect(JakartaClientUpgradeRequest upgradeRequest)
{
upgradeRequest.setConfiguration(defaultCustomizer);
CompletableFuture futureSession = new CompletableFuture<>();
@@ -135,7 +135,7 @@ private CompletableFuture connect(JavaxClientUpgradeRequest upgradeRequ
return;
}
- JavaxWebSocketFrameHandler frameHandler = (JavaxWebSocketFrameHandler)upgradeRequest.getFrameHandler();
+ JakartaWebSocketFrameHandler frameHandler = (JakartaWebSocketFrameHandler)upgradeRequest.getFrameHandler();
futureSession.complete(frameHandler.getSession());
});
}
@@ -152,7 +152,7 @@ private Session connect(ConfiguredEndpoint configuredEndpoint, URI destURI) thro
Objects.requireNonNull(configuredEndpoint, "WebSocket configured endpoint cannot be null");
Objects.requireNonNull(destURI, "Destination URI cannot be null");
- JavaxClientUpgradeRequest upgradeRequest = new JavaxClientUpgradeRequest(this, getWebSocketCoreClient(), destURI, configuredEndpoint);
+ JakartaClientUpgradeRequest upgradeRequest = new JakartaClientUpgradeRequest(this, getWebSocketCoreClient(), destURI, configuredEndpoint);
EndpointConfig config = configuredEndpoint.getConfig();
if (config instanceof ClientEndpointConfig)
@@ -164,7 +164,7 @@ private Session connect(ConfiguredEndpoint configuredEndpoint, URI destURI) thro
for (Extension ext : clientEndpointConfig.getExtensions())
{
- upgradeRequest.addExtensions(new JavaxWebSocketExtensionConfig(ext));
+ upgradeRequest.addExtensions(new JakartaWebSocketExtensionConfig(ext));
}
if (clientEndpointConfig.getPreferredSubprotocols().size() > 0)
@@ -230,7 +230,7 @@ public Session connectToServer(Object endpoint, URI path) throws DeploymentExcep
}
@Override
- public JavaxWebSocketFrameHandlerFactory getFrameHandlerFactory()
+ public JakartaWebSocketFrameHandlerFactory getFrameHandlerFactory()
{
return frameHandlerFactory;
}
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainerProvider.java
similarity index 82%
rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java
rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainerProvider.java
index e8557ce63b8a..72c5d3a16ddb 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java
+++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainerProvider.java
@@ -16,11 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.client;
-
-import javax.websocket.ContainerProvider;
-import javax.websocket.WebSocketContainer;
+package org.eclipse.jetty.websocket.jakarta.client;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.WebSocketContainer;
import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.thread.ShutdownThread;
@@ -28,10 +27,10 @@
* Client {@link ContainerProvider} implementation.
*
* Created by a {@link java.util.ServiceLoader} call in the
- * {@link javax.websocket.ContainerProvider#getWebSocketContainer()} call.
+ * {@link jakarta.websocket.ContainerProvider#getWebSocketContainer()} call.
*
*/
-public class JavaxWebSocketClientContainerProvider extends ContainerProvider
+public class JakartaWebSocketClientContainerProvider extends ContainerProvider
{
public static void stop(WebSocketContainer container) throws Exception
{
@@ -47,9 +46,9 @@ public static void stop(WebSocketContainer container) throws Exception
*
* NOTE: A WebSocket Client Container is a heavyweight object.
* It is dangerous to repeatedly request a new container, or to manage many containers.
- * The existing javax.websocket API has no lifecycle for a ClientContainer, once started
+ * The existing jakarta.websocket API has no lifecycle for a ClientContainer, once started
* they exist for the duration of the JVM with no ability to stop them.
- * See/Comment on javax.websocket Issue #212
+ * See/Comment on jakarta.websocket Issue #212
* if this is a big concern for you.
*
*/
@@ -62,7 +61,7 @@ protected WebSocketContainer getContainer()
// TODO: on multiple executions, do we share bufferPool/executors/etc?
// TODO: do we want to provide a non-standard way to configure to always return the same clientContainer based on a config somewhere? (system.property?)
- JavaxWebSocketClientContainer clientContainer = new JavaxWebSocketClientContainer();
+ JakartaWebSocketClientContainer clientContainer = new JakartaWebSocketClientContainer();
// Register as JVM runtime shutdown hook?
ShutdownThread.register(clientContainer);
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientFrameHandlerFactory.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientFrameHandlerFactory.java
similarity index 54%
rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientFrameHandlerFactory.java
rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientFrameHandlerFactory.java
index 3eac9cb84fc5..448f6b723073 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientFrameHandlerFactory.java
@@ -16,25 +16,24 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.client;
-
-import javax.websocket.ClientEndpoint;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata;
+package org.eclipse.jetty.websocket.jakarta.client;
+
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketContainer;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerFactory;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerMetadata;
import org.eclipse.jetty.websocket.util.InvokerUtils;
-public class JavaxWebSocketClientFrameHandlerFactory extends JavaxWebSocketFrameHandlerFactory
+public class JakartaWebSocketClientFrameHandlerFactory extends JakartaWebSocketFrameHandlerFactory
{
- public JavaxWebSocketClientFrameHandlerFactory(JavaxWebSocketContainer container, InvokerUtils.ParamIdentifier paramIdentifier)
+ public JakartaWebSocketClientFrameHandlerFactory(JakartaWebSocketContainer container, InvokerUtils.ParamIdentifier paramIdentifier)
{
super(container, paramIdentifier);
}
- public JavaxWebSocketClientFrameHandlerFactory(JavaxWebSocketContainer container)
+ public JakartaWebSocketClientFrameHandlerFactory(JakartaWebSocketContainer container)
{
super(container, InvokerUtils.PARAM_IDENTITY);
}
@@ -46,9 +45,9 @@ public EndpointConfig newDefaultEndpointConfig(Class> endpointClass, String pa
}
@Override
- public JavaxWebSocketFrameHandlerMetadata getMetadata(Class> endpointClass, EndpointConfig endpointConfig)
+ public JakartaWebSocketFrameHandlerMetadata getMetadata(Class> endpointClass, EndpointConfig endpointConfig)
{
- if (javax.websocket.Endpoint.class.isAssignableFrom(endpointClass))
+ if (jakarta.websocket.Endpoint.class.isAssignableFrom(endpointClass))
{
return createEndpointMetadata((Class extends Endpoint>)endpointClass, endpointConfig);
}
@@ -58,7 +57,7 @@ public JavaxWebSocketFrameHandlerMetadata getMetadata(Class> endpointClass, En
return null;
}
- JavaxWebSocketFrameHandlerMetadata metadata = new JavaxWebSocketFrameHandlerMetadata(endpointConfig);
- return discoverJavaxFrameHandlerMetadata(endpointClass, metadata);
+ JakartaWebSocketFrameHandlerMetadata metadata = new JakartaWebSocketFrameHandlerMetadata(endpointConfig);
+ return discoverJakartaFrameHandlerMetadata(endpointClass, metadata);
}
}
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JsrUpgradeListener.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JsrUpgradeListener.java
similarity index 94%
rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JsrUpgradeListener.java
rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JsrUpgradeListener.java
index f605a7ddccaa..d2fa9df8a981 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JsrUpgradeListener.java
+++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JsrUpgradeListener.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.client;
+package org.eclipse.jetty.websocket.jakarta.client;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
-import javax.websocket.ClientEndpointConfig.Configurator;
-import javax.websocket.HandshakeResponse;
+import jakarta.websocket.ClientEndpointConfig.Configurator;
+import jakarta.websocket.HandshakeResponse;
import org.eclipse.jetty.client.HttpRequest;
import org.eclipse.jetty.client.HttpResponse;
import org.eclipse.jetty.http.HttpFields;
diff --git a/jetty-websocket/websocket-jakarta-client/src/main/resources/META-INF/services/jakarta.websocket.ContainerProvider b/jetty-websocket/websocket-jakarta-client/src/main/resources/META-INF/services/jakarta.websocket.ContainerProvider
new file mode 100644
index 000000000000..25dcc3f91152
--- /dev/null
+++ b/jetty-websocket/websocket-jakarta-client/src/main/resources/META-INF/services/jakarta.websocket.ContainerProvider
@@ -0,0 +1 @@
+org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainerProvider
\ No newline at end of file
diff --git a/jetty-websocket/websocket-javax-client/src/test/java/examples/EchoEndpoint.java b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/EchoEndpoint.java
similarity index 93%
rename from jetty-websocket/websocket-javax-client/src/test/java/examples/EchoEndpoint.java
rename to jetty-websocket/websocket-jakarta-client/src/test/java/examples/EchoEndpoint.java
index a373d6b09e49..81384fce3063 100644
--- a/jetty-websocket/websocket-javax-client/src/test/java/examples/EchoEndpoint.java
+++ b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/EchoEndpoint.java
@@ -21,11 +21,12 @@
import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.CloseReason;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
+
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
/**
* Basic Echo Client Endpoint
diff --git a/jetty-websocket/websocket-javax-client/src/test/java/examples/OriginServerConfigurator.java b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/OriginServerConfigurator.java
similarity index 96%
rename from jetty-websocket/websocket-javax-client/src/test/java/examples/OriginServerConfigurator.java
rename to jetty-websocket/websocket-jakarta-client/src/test/java/examples/OriginServerConfigurator.java
index 44c6c705c90e..2440644669b1 100644
--- a/jetty-websocket/websocket-javax-client/src/test/java/examples/OriginServerConfigurator.java
+++ b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/OriginServerConfigurator.java
@@ -21,7 +21,8 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.websocket.ClientEndpointConfig;
+
+import jakarta.websocket.ClientEndpointConfig;
/**
* Provide a means to set the `Origin` header for outgoing WebSocket upgrade requests
diff --git a/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureClientContainerExample.java b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/SecureClientContainerExample.java
similarity index 84%
rename from jetty-websocket/websocket-javax-client/src/test/java/examples/SecureClientContainerExample.java
rename to jetty-websocket/websocket-jakarta-client/src/test/java/examples/SecureClientContainerExample.java
index 34aea9140cd8..3f06f125bd2b 100644
--- a/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureClientContainerExample.java
+++ b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/SecureClientContainerExample.java
@@ -20,15 +20,15 @@
import java.net.URI;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.WebSocketContainer;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainer;
+import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainer;
public class SecureClientContainerExample
{
@@ -56,7 +56,7 @@ public static void main(String[] args)
}
finally
{
- /* Since javax.websocket clients have no defined LifeCycle we
+ /* Since jakarta.websocket clients have no defined LifeCycle we
* want to either close/stop the client, or exit the JVM
* via a System.exit(), otherwise the threads this client keeps
* open will prevent the JVM from terminating naturally.
@@ -67,11 +67,11 @@ public static void main(String[] args)
}
/**
- * Since javax.websocket does not have an API for configuring SSL, each implementation
- * of javax.websocket has to come up with their own SSL configuration mechanism.
+ * Since jakarta.websocket does not have an API for configuring SSL, each implementation
+ * of jakarta.websocket has to come up with their own SSL configuration mechanism.
*
* @return the client WebSocketContainer
- * @see javax.websocket issue #210
+ * @see jakarta.websocket issue #210
*/
public static WebSocketContainer getConfiguredWebSocketContainer() throws Exception
{
@@ -81,7 +81,7 @@ public static WebSocketContainer getConfiguredWebSocketContainer() throws Except
clientConnector.setSslContextFactory(ssl);
HttpClient httpClient = new HttpClient(new HttpClientTransportOverHTTP(clientConnector));
- JavaxWebSocketClientContainer clientContainer = new JavaxWebSocketClientContainer(httpClient);
+ JakartaWebSocketClientContainer clientContainer = new JakartaWebSocketClientContainer(httpClient);
clientContainer.addManaged(httpClient); // allow clientContainer to own httpClient (for start/stop lifecycle)
clientContainer.start();
return clientContainer;
diff --git a/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureWebSocketContainerExample.java b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/SecureWebSocketContainerExample.java
similarity index 88%
rename from jetty-websocket/websocket-javax-client/src/test/java/examples/SecureWebSocketContainerExample.java
rename to jetty-websocket/websocket-jakarta-client/src/test/java/examples/SecureWebSocketContainerExample.java
index 85680ae634a1..04bd23d2ff73 100644
--- a/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureWebSocketContainerExample.java
+++ b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/SecureWebSocketContainerExample.java
@@ -22,10 +22,10 @@
import java.net.URI;
import java.net.URL;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.ContainerProvider;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.WebSocketContainer;
import org.eclipse.jetty.util.component.LifeCycle;
public class SecureWebSocketContainerExample
@@ -53,7 +53,7 @@ public static void main(String[] args)
}
finally
{
- /* Since javax.websocket clients have no defined LifeCycle we
+ /* Since jakarta.websocket clients have no defined LifeCycle we
* want to either close/stop the client, or exit the JVM
* via a System.exit(), otherwise the threads this client keeps
* open will prevent the JVM from terminating naturally.
@@ -64,8 +64,8 @@ public static void main(String[] args)
}
/**
- * Since javax.websocket does not have an API for configuring SSL, each implementation
- * of javax.websocket has to come up with their own SSL configuration mechanism.
+ * Since jakarta.websocket does not have an API for configuring SSL, each implementation
+ * of jakarta.websocket has to come up with their own SSL configuration mechanism.
*
* When the {@link WebSocketContainer} is used it will need to create and start a Jetty WebSocket Client.
* The {@code WebSocketClient} must use a Jetty {@code HttpClient} which can be configured for SSL, this
@@ -76,7 +76,7 @@ public static void main(String[] args)
* along with the jetty-xml artifact.
*
* @return the client WebSocketContainer
- * @see javax.websocket issue #210
+ * @see jakarta.websocket issue #210
*/
public static WebSocketContainer getConfiguredWebSocketContainer() throws Exception
{
diff --git a/jetty-websocket/websocket-javax-client/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-jakarta-client/src/test/resources/jetty-logging.properties
similarity index 100%
rename from jetty-websocket/websocket-javax-client/src/test/resources/jetty-logging.properties
rename to jetty-websocket/websocket-jakarta-client/src/test/resources/jetty-logging.properties
diff --git a/jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-jakarta-client/src/test/resources/jetty-websocket-httpclient.xml
similarity index 100%
rename from jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml
rename to jetty-websocket/websocket-jakarta-client/src/test/resources/jetty-websocket-httpclient.xml
diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-jakarta-common/pom.xml
similarity index 82%
rename from jetty-websocket/websocket-javax-common/pom.xml
rename to jetty-websocket/websocket-jakarta-common/pom.xml
index 26688bbf644b..890d9e42c442 100644
--- a/jetty-websocket/websocket-javax-common/pom.xml
+++ b/jetty-websocket/websocket-jakarta-common/pom.xml
@@ -3,15 +3,15 @@
org.eclipse.jetty.websocketwebsocket-parent
- 10.0.0-SNAPSHOT
+ 11.0.0-SNAPSHOT4.0.0
- websocket-javax-common
- Jetty :: Websocket :: javax.websocket :: Common
+ websocket-jakarta-common
+ Jetty :: Websocket :: jakarta.websocket :: Common
- ${project.groupId}.javax.common
+ ${project.groupId}.jakarta.common
@@ -27,9 +27,9 @@
- javax.websocket.client Implementation
+ jakarta.websocket.client Implementation
- org.eclipse.jetty.websocket.javax.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
+ org.eclipse.jetty.websocket.jakarta.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
@@ -78,7 +78,7 @@
org.eclipse.jetty.toolchain
- jetty-javax-websocket-api
+ jetty-jakarta-websocket-api
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java b/jetty-websocket/websocket-jakarta-common/src/main/java/module-info.java
similarity index 77%
rename from jetty-websocket/websocket-javax-common/src/main/java/module-info.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/module-info.java
index 89d937226bee..b3cd4c80138d 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/module-info.java
@@ -16,12 +16,12 @@
// ========================================================================
//
-module org.eclipse.jetty.websocket.javax.common
+module org.eclipse.jetty.websocket.jakarta.common
{
- exports org.eclipse.jetty.websocket.javax.common;
- exports org.eclipse.jetty.websocket.javax.common.decoders;
- exports org.eclipse.jetty.websocket.javax.common.encoders;
- exports org.eclipse.jetty.websocket.javax.common.messages;
+ exports org.eclipse.jetty.websocket.jakarta.common;
+ exports org.eclipse.jetty.websocket.jakarta.common.decoders;
+ exports org.eclipse.jetty.websocket.jakarta.common.encoders;
+ exports org.eclipse.jetty.websocket.jakarta.common.messages;
requires transitive jetty.websocket.api;
requires transitive org.eclipse.jetty.http;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ClientEndpointConfigWrapper.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ClientEndpointConfigWrapper.java
similarity index 92%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ClientEndpointConfigWrapper.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ClientEndpointConfigWrapper.java
index dac3b9bed89c..55cfc065dbc5 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ClientEndpointConfigWrapper.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ClientEndpointConfigWrapper.java
@@ -16,11 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.util.List;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.Extension;
+
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.Extension;
public class ClientEndpointConfigWrapper extends EndpointConfigWrapper implements ClientEndpointConfig
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ConfiguredEndpoint.java
similarity index 94%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ConfiguredEndpoint.java
index bd4770e241a5..bf021c4f5496 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ConfiguredEndpoint.java
@@ -16,9 +16,9 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
-import javax.websocket.EndpointConfig;
+import jakarta.websocket.EndpointConfig;
/**
* Associate a JSR Endpoint with its optional {@link EndpointConfig}
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/EndpointConfigWrapper.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/EndpointConfigWrapper.java
similarity index 92%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/EndpointConfigWrapper.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/EndpointConfigWrapper.java
index 665b3873e899..3edd822e9c4b 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/EndpointConfigWrapper.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/EndpointConfigWrapper.java
@@ -16,14 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.websocket.Decoder;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
+
+import jakarta.websocket.Decoder;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
public abstract class EndpointConfigWrapper implements EndpointConfig, PathParamProvider
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/InitException.java
similarity index 95%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/InitException.java
index 80f12bdfce45..dc7ccc8aef8b 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/InitException.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
/**
* Exception during initialization of the Endpoint
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketAsyncRemote.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketAsyncRemote.java
index c38a6af71764..d47af9cf8f90 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketAsyncRemote.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.concurrent.Future;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-import javax.websocket.SendHandler;
-import javax.websocket.SendResult;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.SendHandler;
+import jakarta.websocket.SendResult;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.util.log.Log;
@@ -37,11 +37,11 @@
import org.eclipse.jetty.websocket.util.messages.MessageOutputStream;
import org.eclipse.jetty.websocket.util.messages.MessageWriter;
-public class JavaxWebSocketAsyncRemote extends JavaxWebSocketRemoteEndpoint implements javax.websocket.RemoteEndpoint.Async
+public class JakartaWebSocketAsyncRemote extends JakartaWebSocketRemoteEndpoint implements jakarta.websocket.RemoteEndpoint.Async
{
- static final Logger LOG = Log.getLogger(JavaxWebSocketAsyncRemote.class);
+ static final Logger LOG = Log.getLogger(JakartaWebSocketAsyncRemote.class);
- protected JavaxWebSocketAsyncRemote(JavaxWebSocketSession session, CoreSession coreSession)
+ protected JakartaWebSocketAsyncRemote(JakartaWebSocketSession session, CoreSession coreSession)
{
super(session, coreSession);
}
@@ -72,7 +72,7 @@ public Future sendBinary(ByteBuffer data)
}
@Override
- public void sendBinary(ByteBuffer data, javax.websocket.SendHandler handler)
+ public void sendBinary(ByteBuffer data, jakarta.websocket.SendHandler handler)
{
assertMessageNotNull(data);
assertSendHandlerNotNull(handler);
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketBasicRemote.java
similarity index 92%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketBasicRemote.java
index 53c02f78083b..480c50bd6e7f 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketBasicRemote.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
import java.nio.ByteBuffer;
import java.util.concurrent.TimeUnit;
-import javax.websocket.EncodeException;
-import javax.websocket.RemoteEndpoint;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.RemoteEndpoint;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.util.log.Log;
@@ -37,11 +37,11 @@
import static java.nio.charset.StandardCharsets.UTF_8;
-public class JavaxWebSocketBasicRemote extends JavaxWebSocketRemoteEndpoint implements RemoteEndpoint.Basic
+public class JakartaWebSocketBasicRemote extends JakartaWebSocketRemoteEndpoint implements RemoteEndpoint.Basic
{
- private static final Logger LOG = Log.getLogger(JavaxWebSocketBasicRemote.class);
+ private static final Logger LOG = Log.getLogger(JakartaWebSocketBasicRemote.class);
- protected JavaxWebSocketBasicRemote(JavaxWebSocketSession session, CoreSession coreSession)
+ protected JakartaWebSocketBasicRemote(JakartaWebSocketSession session, CoreSession coreSession)
{
super(session, coreSession);
}
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketContainer.java
similarity index 78%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketContainer.java
index e9b241e0a701..fb14872c2b44 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketContainer.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.time.Duration;
import java.util.ArrayList;
@@ -25,9 +25,9 @@
import java.util.Set;
import java.util.concurrent.Executor;
import java.util.function.Consumer;
-import javax.websocket.Extension;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.Extension;
+import jakarta.websocket.WebSocketContainer;
import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.util.DecoratedObjectFactory;
import org.eclipse.jetty.util.component.ContainerLifeCycle;
@@ -37,15 +37,15 @@
import org.eclipse.jetty.websocket.core.WebSocketComponents;
import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
-public abstract class JavaxWebSocketContainer extends ContainerLifeCycle implements javax.websocket.WebSocketContainer
+public abstract class JakartaWebSocketContainer extends ContainerLifeCycle implements jakarta.websocket.WebSocketContainer
{
- private static final Logger LOG = Log.getLogger(JavaxWebSocketContainer.class);
+ private static final Logger LOG = Log.getLogger(JakartaWebSocketContainer.class);
private final SessionTracker sessionTracker = new SessionTracker();
- private final List sessionListeners = new ArrayList<>();
+ private final List sessionListeners = new ArrayList<>();
protected final Configuration.ConfigurationCustomizer defaultCustomizer = new Configuration.ConfigurationCustomizer();
protected final WebSocketComponents components;
- public JavaxWebSocketContainer(WebSocketComponents components)
+ public JakartaWebSocketContainer(WebSocketComponents components)
{
this.components = components;
addSessionListener(sessionTracker);
@@ -54,7 +54,7 @@ public JavaxWebSocketContainer(WebSocketComponents components)
public abstract Executor getExecutor();
- protected abstract JavaxWebSocketFrameHandlerFactory getFrameHandlerFactory();
+ protected abstract JakartaWebSocketFrameHandlerFactory getFrameHandlerFactory();
public ByteBufferPool getBufferPool()
{
@@ -137,25 +137,25 @@ public Set getInstalledExtensions()
for (String name : getExtensionRegistry().getAvailableExtensionNames())
{
- ret.add(new JavaxWebSocketExtension(name));
+ ret.add(new JakartaWebSocketExtension(name));
}
return ret;
}
/**
- * Used in {@link javax.websocket.Session#getOpenSessions()}
+ * Used in {@link jakarta.websocket.Session#getOpenSessions()}
*
* @return the set of open sessions
*/
- public Set getOpenSessions()
+ public Set getOpenSessions()
{
return sessionTracker.getSessions();
}
- public JavaxWebSocketFrameHandler newFrameHandler(Object websocketPojo, UpgradeRequest upgradeRequest)
+ public JakartaWebSocketFrameHandler newFrameHandler(Object websocketPojo, UpgradeRequest upgradeRequest)
{
- return getFrameHandlerFactory().newJavaxWebSocketFrameHandler(websocketPojo, upgradeRequest);
+ return getFrameHandlerFactory().newJakartaWebSocketFrameHandler(websocketPojo, upgradeRequest);
}
/**
@@ -163,7 +163,7 @@ public JavaxWebSocketFrameHandler newFrameHandler(Object websocketPojo, UpgradeR
*
* @param listener the listener
*/
- public void addSessionListener(JavaxWebSocketSessionListener listener)
+ public void addSessionListener(JakartaWebSocketSessionListener listener)
{
sessionListeners.add(listener);
}
@@ -174,7 +174,7 @@ public void addSessionListener(JavaxWebSocketSessionListener listener)
* @param listener the listener
* @return true if listener was present and removed
*/
- public boolean removeSessionListener(JavaxWebSocketSessionListener listener)
+ public boolean removeSessionListener(JakartaWebSocketSessionListener listener)
{
return sessionListeners.remove(listener);
}
@@ -184,9 +184,9 @@ public boolean removeSessionListener(JavaxWebSocketSessionListener listener)
*
* @param consumer the consumer to pass to each listener
*/
- public void notifySessionListeners(Consumer consumer)
+ public void notifySessionListeners(Consumer consumer)
{
- for (JavaxWebSocketSessionListener listener : sessionListeners)
+ for (JakartaWebSocketSessionListener listener : sessionListeners)
{
try
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketExtension.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketExtension.java
index cf62895ac0c1..a5d1135a1d2b 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketExtension.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.websocket.Extension;
+import jakarta.websocket.Extension;
import org.eclipse.jetty.websocket.core.ExtensionConfig;
-public class JavaxWebSocketExtension implements Extension
+public class JakartaWebSocketExtension implements Extension
{
private static class JsrParameter implements Extension.Parameter
{
@@ -59,7 +59,7 @@ public String getValue()
*
* @param cfg the configuration for the extension
*/
- public JavaxWebSocketExtension(ExtensionConfig cfg)
+ public JakartaWebSocketExtension(ExtensionConfig cfg)
{
this.name = cfg.getName();
if (cfg.getParameters() != null)
@@ -76,7 +76,7 @@ public JavaxWebSocketExtension(ExtensionConfig cfg)
*
* @param name the name of the extension
*/
- public JavaxWebSocketExtension(String name)
+ public JakartaWebSocketExtension(String name)
{
this.name = name;
}
@@ -101,7 +101,7 @@ public boolean equals(Object o)
if (o == null || getClass() != o.getClass())
return false;
- JavaxWebSocketExtension that = (JavaxWebSocketExtension)o;
+ JakartaWebSocketExtension that = (JakartaWebSocketExtension)o;
return name != null ? name.equals(that.name) : that.name == null;
}
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketExtensionConfig.java
similarity index 82%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketExtensionConfig.java
index 814f150e47ae..7e99cd5216a4 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketExtensionConfig.java
@@ -16,15 +16,14 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
-
-import javax.websocket.Extension;
+package org.eclipse.jetty.websocket.jakarta.common;
+import jakarta.websocket.Extension;
import org.eclipse.jetty.websocket.core.ExtensionConfig;
-public class JavaxWebSocketExtensionConfig extends ExtensionConfig
+public class JakartaWebSocketExtensionConfig extends ExtensionConfig
{
- public JavaxWebSocketExtensionConfig(Extension ext)
+ public JakartaWebSocketExtensionConfig(Extension ext)
{
super(ext.getName());
for (Extension.Parameter param : ext.getParameters())
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandler.java
similarity index 86%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandler.java
index 911ed9f824ec..d0a0e4e6d907 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandler.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
@@ -28,14 +28,14 @@
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.CloseReason;
-import javax.websocket.Decoder;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.PongMessage;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.log.Log;
@@ -47,21 +47,21 @@
import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.core.exception.ProtocolException;
import org.eclipse.jetty.websocket.core.exception.WebSocketException;
-import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
-import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink;
-import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryStreamMessageSink;
-import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextMessageSink;
-import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink;
+import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders;
+import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedBinaryMessageSink;
+import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedBinaryStreamMessageSink;
+import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedTextMessageSink;
+import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedTextStreamMessageSink;
import org.eclipse.jetty.websocket.util.InvokerUtils;
import org.eclipse.jetty.websocket.util.messages.MessageSink;
import org.eclipse.jetty.websocket.util.messages.PartialByteArrayMessageSink;
import org.eclipse.jetty.websocket.util.messages.PartialByteBufferMessageSink;
import org.eclipse.jetty.websocket.util.messages.PartialStringMessageSink;
-public class JavaxWebSocketFrameHandler implements FrameHandler
+public class JakartaWebSocketFrameHandler implements FrameHandler
{
private final Logger logger;
- private final JavaxWebSocketContainer container;
+ private final JakartaWebSocketContainer container;
private final Object endpointInstance;
private final AtomicBoolean closeNotified = new AtomicBoolean();
@@ -83,7 +83,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
*
*
* The values are represented as {@link String} and are essentially static for this
- * instance of the the JavaxWebSocketFrameHandler. They will be converted to the
+ * instance of the the JakartaWebSocketFrameHandler. They will be converted to the
* type declared by the {@code @PathParam} annotations following the JSR356 advice
* to only support String, Java Primitives (or their Boxed version).
*
@@ -95,8 +95,8 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
private MethodHandle openHandle;
private MethodHandle closeHandle;
private MethodHandle errorHandle;
- private JavaxWebSocketFrameHandlerMetadata.MessageMetadata textMetadata;
- private JavaxWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata;
+ private JakartaWebSocketFrameHandlerMetadata.MessageMetadata textMetadata;
+ private JakartaWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata;
private MethodHandle pongHandle;
private UpgradeRequest upgradeRequest;
@@ -106,18 +106,18 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
private MessageSink textSink;
private MessageSink binarySink;
private MessageSink activeMessageSink;
- private JavaxWebSocketSession session;
+ private JakartaWebSocketSession session;
private CoreSession coreSession;
protected byte dataType = OpCode.UNDEFINED;
- public JavaxWebSocketFrameHandler(JavaxWebSocketContainer container,
- Object endpointInstance,
- MethodHandle openHandle, MethodHandle closeHandle, MethodHandle errorHandle,
- JavaxWebSocketFrameHandlerMetadata.MessageMetadata textMetadata,
- JavaxWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata,
- MethodHandle pongHandle,
- EndpointConfig endpointConfig)
+ public JakartaWebSocketFrameHandler(JakartaWebSocketContainer container,
+ Object endpointInstance,
+ MethodHandle openHandle, MethodHandle closeHandle, MethodHandle errorHandle,
+ JakartaWebSocketFrameHandlerMetadata.MessageMetadata textMetadata,
+ JakartaWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata,
+ MethodHandle pongHandle,
+ EndpointConfig endpointConfig)
{
this.logger = Log.getLogger(endpointInstance.getClass());
@@ -150,7 +150,7 @@ public EndpointConfig getEndpointConfig()
return endpointConfig;
}
- public JavaxWebSocketSession getSession()
+ public JakartaWebSocketSession getSession()
{
return session;
}
@@ -164,40 +164,40 @@ public void onOpen(CoreSession coreSession, Callback callback)
{
// Rewire EndpointConfig to call CoreSession setters if Jetty specific properties are set.
endpointConfig = getWrappedEndpointConfig();
- session = new JavaxWebSocketSession(container, coreSession, this, endpointConfig);
+ session = new JakartaWebSocketSession(container, coreSession, this, endpointConfig);
openHandle = InvokerUtils.bindTo(openHandle, session, endpointConfig);
closeHandle = InvokerUtils.bindTo(closeHandle, session);
errorHandle = InvokerUtils.bindTo(errorHandle, session);
pongHandle = InvokerUtils.bindTo(pongHandle, session);
- JavaxWebSocketFrameHandlerMetadata.MessageMetadata actualTextMetadata = JavaxWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(textMetadata);
+ JakartaWebSocketFrameHandlerMetadata.MessageMetadata actualTextMetadata = JakartaWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(textMetadata);
if (actualTextMetadata != null)
{
if (actualTextMetadata.isMaxMessageSizeSet())
session.setMaxTextMessageBufferSize(actualTextMetadata.maxMessageSize);
actualTextMetadata.handle = InvokerUtils.bindTo(actualTextMetadata.handle, endpointInstance, endpointConfig, session);
- actualTextMetadata.handle = JavaxWebSocketFrameHandlerFactory.wrapNonVoidReturnType(actualTextMetadata.handle, session);
- textSink = JavaxWebSocketFrameHandlerFactory.createMessageSink(session, actualTextMetadata);
+ actualTextMetadata.handle = JakartaWebSocketFrameHandlerFactory.wrapNonVoidReturnType(actualTextMetadata.handle, session);
+ textSink = JakartaWebSocketFrameHandlerFactory.createMessageSink(session, actualTextMetadata);
textMetadata = actualTextMetadata;
}
- JavaxWebSocketFrameHandlerMetadata.MessageMetadata actualBinaryMetadata = JavaxWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(binaryMetadata);
+ JakartaWebSocketFrameHandlerMetadata.MessageMetadata actualBinaryMetadata = JakartaWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(binaryMetadata);
if (actualBinaryMetadata != null)
{
if (actualBinaryMetadata.isMaxMessageSizeSet())
session.setMaxBinaryMessageBufferSize(actualBinaryMetadata.maxMessageSize);
actualBinaryMetadata.handle = InvokerUtils.bindTo(actualBinaryMetadata.handle, endpointInstance, endpointConfig, session);
- actualBinaryMetadata.handle = JavaxWebSocketFrameHandlerFactory.wrapNonVoidReturnType(actualBinaryMetadata.handle, session);
- binarySink = JavaxWebSocketFrameHandlerFactory.createMessageSink(session, actualBinaryMetadata);
+ actualBinaryMetadata.handle = JakartaWebSocketFrameHandlerFactory.wrapNonVoidReturnType(actualBinaryMetadata.handle, session);
+ binarySink = JakartaWebSocketFrameHandlerFactory.createMessageSink(session, actualBinaryMetadata);
binaryMetadata = actualBinaryMetadata;
}
if (openHandle != null)
openHandle.invoke();
- container.notifySessionListeners((listener) -> listener.onJavaxWebSocketSessionOpened(session));
+ container.notifySessionListeners((listener) -> listener.onJakartaWebSocketSessionOpened(session));
callback.succeeded();
}
catch (Throwable cause)
@@ -291,7 +291,7 @@ public void onClose(Frame frame, Callback callback)
public void onClosed(CloseStatus closeStatus, Callback callback)
{
notifyOnClose(closeStatus, callback);
- container.notifySessionListeners((listener) -> listener.onJavaxWebSocketSessionClosed(session));
+ container.notifySessionListeners((listener) -> listener.onJakartaWebSocketSessionClosed(session));
}
private void notifyOnClose(CloseStatus closeStatus, Callback callback)
@@ -350,12 +350,12 @@ public Map getMessageHandlerMap()
return messageHandlerMap;
}
- public JavaxWebSocketFrameHandlerMetadata.MessageMetadata getBinaryMetadata()
+ public JakartaWebSocketFrameHandlerMetadata.MessageMetadata getBinaryMetadata()
{
return binaryMetadata;
}
- public JavaxWebSocketFrameHandlerMetadata.MessageMetadata getTextMetadata()
+ public JakartaWebSocketFrameHandlerMetadata.MessageMetadata getTextMetadata()
{
return textMetadata;
}
@@ -369,7 +369,7 @@ private void assertBasicTypeNotRegistered(byte basicWebSocketType, Object messag
}
}
- public void addMessageHandler(JavaxWebSocketSession session, Class clazz, MessageHandler.Partial handler)
+ public void addMessageHandler(JakartaWebSocketSession session, Class clazz, MessageHandler.Partial handler)
{
try
{
@@ -385,7 +385,7 @@ public void addMessageHandler(JavaxWebSocketSession session, Class clazz,
assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName());
MessageSink messageSink = new PartialByteArrayMessageSink(coreSession, partialMessageHandler);
this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink);
- JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata();
+ JakartaWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JakartaWebSocketFrameHandlerMetadata.MessageMetadata();
metadata.handle = partialMessageHandler;
metadata.sinkClass = PartialByteArrayMessageSink.class;
this.binaryMetadata = metadata;
@@ -395,7 +395,7 @@ else if (ByteBuffer.class.isAssignableFrom(clazz))
assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName());
MessageSink messageSink = new PartialByteBufferMessageSink(coreSession, partialMessageHandler);
this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink);
- JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata();
+ JakartaWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JakartaWebSocketFrameHandlerMetadata.MessageMetadata();
metadata.handle = partialMessageHandler;
metadata.sinkClass = PartialByteBufferMessageSink.class;
this.binaryMetadata = metadata;
@@ -405,7 +405,7 @@ else if (String.class.isAssignableFrom(clazz))
assertBasicTypeNotRegistered(OpCode.TEXT, this.textMetadata, handler.getClass().getName());
MessageSink messageSink = new PartialStringMessageSink(coreSession, partialMessageHandler);
this.textSink = registerMessageHandler(OpCode.TEXT, clazz, handler, messageSink);
- JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata();
+ JakartaWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JakartaWebSocketFrameHandlerMetadata.MessageMetadata();
metadata.handle = partialMessageHandler;
metadata.sinkClass = PartialStringMessageSink.class;
this.textMetadata = metadata;
@@ -427,7 +427,7 @@ else if (String.class.isAssignableFrom(clazz))
}
}
- public void addMessageHandler(JavaxWebSocketSession session, Class clazz, MessageHandler.Whole handler)
+ public void addMessageHandler(JakartaWebSocketSession session, Class clazz, MessageHandler.Whole handler)
{
try
{
@@ -452,7 +452,7 @@ public void addMessageHandler(JavaxWebSocketSession session, Class clazz,
throw new IllegalStateException("Unable to find Decoder for type: " + clazz);
}
- JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata();
+ JakartaWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JakartaWebSocketFrameHandlerMetadata.MessageMetadata();
metadata.handle = wholeMsgMethodHandle;
metadata.registeredDecoder = registeredDecoder;
@@ -611,7 +611,7 @@ public void onPong(Frame frame, Callback callback)
payload = BufferUtil.EMPTY_BUFFER;
// Use JSR356 PongMessage interface
- JavaxWebSocketPongMessage pongMessage = new JavaxWebSocketPongMessage(payload);
+ JakartaWebSocketPongMessage pongMessage = new JakartaWebSocketPongMessage(payload);
pongHandle.invoke(pongMessage);
}
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerFactory.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerFactory.java
index f32209acf9ca..232ac1fb18f5 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerFactory.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.io.InputStream;
import java.io.Reader;
@@ -32,24 +32,24 @@
import java.util.List;
import java.util.Map;
import java.util.function.Function;
-import javax.websocket.CloseReason;
-import javax.websocket.Decoder;
-import javax.websocket.EndpointConfig;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.PongMessage;
-import javax.websocket.Session;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.PongMessage;
+import jakarta.websocket.Session;
import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
import org.eclipse.jetty.websocket.core.CoreSession;
-import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
-import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink;
-import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryStreamMessageSink;
-import org.eclipse.jetty.websocket.javax.common.messages.DecodedMessageSink;
-import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextMessageSink;
-import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink;
+import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders;
+import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedBinaryMessageSink;
+import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedBinaryStreamMessageSink;
+import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedMessageSink;
+import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedTextMessageSink;
+import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedTextStreamMessageSink;
import org.eclipse.jetty.websocket.util.InvalidSignatureException;
import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
import org.eclipse.jetty.websocket.util.InvokerUtils;
@@ -65,9 +65,9 @@
import org.eclipse.jetty.websocket.util.messages.StringMessageSink;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata.MessageMetadata;
+import static org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerMetadata.MessageMetadata;
-public abstract class JavaxWebSocketFrameHandlerFactory
+public abstract class JakartaWebSocketFrameHandlerFactory
{
private static final MethodHandle FILTER_RETURN_TYPE_METHOD;
@@ -125,7 +125,7 @@ public abstract class JavaxWebSocketFrameHandlerFactory
try
{
FILTER_RETURN_TYPE_METHOD = MethodHandles.lookup()
- .findVirtual(JavaxWebSocketSession.class, "filterReturnType", MethodType.methodType(void.class, Object.class));
+ .findVirtual(JakartaWebSocketSession.class, "filterReturnType", MethodType.methodType(void.class, Object.class));
}
catch (Throwable e)
{
@@ -133,20 +133,20 @@ public abstract class JavaxWebSocketFrameHandlerFactory
}
}
- protected final JavaxWebSocketContainer container;
+ protected final JakartaWebSocketContainer container;
protected final InvokerUtils.ParamIdentifier paramIdentifier;
- public JavaxWebSocketFrameHandlerFactory(JavaxWebSocketContainer container, InvokerUtils.ParamIdentifier paramIdentifier)
+ public JakartaWebSocketFrameHandlerFactory(JakartaWebSocketContainer container, InvokerUtils.ParamIdentifier paramIdentifier)
{
this.container = container;
this.paramIdentifier = paramIdentifier == null ? InvokerUtils.PARAM_IDENTITY : paramIdentifier;
}
- public abstract JavaxWebSocketFrameHandlerMetadata getMetadata(Class> endpointClass, EndpointConfig endpointConfig);
+ public abstract JakartaWebSocketFrameHandlerMetadata getMetadata(Class> endpointClass, EndpointConfig endpointConfig);
public abstract EndpointConfig newDefaultEndpointConfig(Class> endpointClass, String path);
- public JavaxWebSocketFrameHandler newJavaxWebSocketFrameHandler(Object endpointInstance, UpgradeRequest upgradeRequest)
+ public JakartaWebSocketFrameHandler newJakartaWebSocketFrameHandler(Object endpointInstance, UpgradeRequest upgradeRequest)
{
Object endpoint;
EndpointConfig config;
@@ -164,7 +164,7 @@ public JavaxWebSocketFrameHandler newJavaxWebSocketFrameHandler(Object endpointI
config = newDefaultEndpointConfig(endpoint.getClass(), path);
}
- JavaxWebSocketFrameHandlerMetadata metadata = getMetadata(endpoint.getClass(), config);
+ JakartaWebSocketFrameHandlerMetadata metadata = getMetadata(endpoint.getClass(), config);
if (metadata == null)
return null;
@@ -199,7 +199,7 @@ public JavaxWebSocketFrameHandler newJavaxWebSocketFrameHandler(Object endpointI
errorHandle = InvokerUtils.bindTo(errorHandle, endpoint);
pongHandle = InvokerUtils.bindTo(pongHandle, endpoint);
- return new JavaxWebSocketFrameHandler(
+ return new JakartaWebSocketFrameHandler(
container,
endpoint,
openHandle, closeHandle, errorHandle,
@@ -315,7 +315,7 @@ else if (Byte.TYPE.isAssignableFrom(type))
}
@SuppressWarnings("Duplicates")
- public static MessageSink createMessageSink(JavaxWebSocketSession session, MessageMetadata msgMetadata)
+ public static MessageSink createMessageSink(JakartaWebSocketSession session, MessageMetadata msgMetadata)
{
if (msgMetadata == null)
return null;
@@ -354,7 +354,7 @@ public static MessageSink createMessageSink(JavaxWebSocketSession session, Messa
}
}
- public static MethodHandle wrapNonVoidReturnType(MethodHandle handle, JavaxWebSocketSession session)
+ public static MethodHandle wrapNonVoidReturnType(MethodHandle handle, JakartaWebSocketSession session)
{
if (handle == null)
return null;
@@ -364,10 +364,10 @@ public static MethodHandle wrapNonVoidReturnType(MethodHandle handle, JavaxWebSo
// Technique from https://stackoverflow.com/questions/48505787/methodhandle-with-general-non-void-return-filter
- // Change the return type of the to be Object so it will match exact with JavaxWebSocketSession.filterReturnType(Object)
+ // Change the return type of the to be Object so it will match exact with JakartaWebSocketSession.filterReturnType(Object)
handle = handle.asType(handle.type().changeReturnType(Object.class));
- // Filter the method return type to a call to JavaxWebSocketSession.filterReturnType() bound to this session
+ // Filter the method return type to a call to JakartaWebSocketSession.filterReturnType() bound to this session
handle = MethodHandles.filterReturnValue(handle, FILTER_RETURN_TYPE_METHOD.bindTo(session));
return handle;
@@ -385,30 +385,30 @@ private MethodHandle toMethodHandle(MethodHandles.Lookup lookup, Method method)
}
}
- protected JavaxWebSocketFrameHandlerMetadata createEndpointMetadata(Class extends javax.websocket.Endpoint> endpointClass, EndpointConfig endpointConfig)
+ protected JakartaWebSocketFrameHandlerMetadata createEndpointMetadata(Class extends jakarta.websocket.Endpoint> endpointClass, EndpointConfig endpointConfig)
{
- JavaxWebSocketFrameHandlerMetadata metadata = new JavaxWebSocketFrameHandlerMetadata(endpointConfig);
+ JakartaWebSocketFrameHandlerMetadata metadata = new JakartaWebSocketFrameHandlerMetadata(endpointConfig);
MethodHandles.Lookup lookup = getMethodHandleLookup(endpointClass);
Method openMethod = ReflectUtils.findMethod(endpointClass, "onOpen",
- javax.websocket.Session.class, javax.websocket.EndpointConfig.class);
+ jakarta.websocket.Session.class, jakarta.websocket.EndpointConfig.class);
MethodHandle open = toMethodHandle(lookup, openMethod);
metadata.setOpenHandler(open, openMethod);
Method closeMethod = ReflectUtils.findMethod(endpointClass, "onClose",
- javax.websocket.Session.class, javax.websocket.CloseReason.class);
+ jakarta.websocket.Session.class, jakarta.websocket.CloseReason.class);
MethodHandle close = toMethodHandle(lookup, closeMethod);
metadata.setCloseHandler(close, closeMethod);
Method errorMethod = ReflectUtils.findMethod(endpointClass, "onError",
- javax.websocket.Session.class, Throwable.class);
+ jakarta.websocket.Session.class, Throwable.class);
MethodHandle error = toMethodHandle(lookup, errorMethod);
metadata.setErrorHandler(error, errorMethod);
return metadata;
}
- protected JavaxWebSocketFrameHandlerMetadata discoverJavaxFrameHandlerMetadata(Class> endpointClass, JavaxWebSocketFrameHandlerMetadata metadata)
+ protected JakartaWebSocketFrameHandlerMetadata discoverJakartaFrameHandlerMetadata(Class> endpointClass, JakartaWebSocketFrameHandlerMetadata metadata)
{
MethodHandles.Lookup lookup = getMethodHandleLookup(endpointClass);
Method onmethod;
@@ -486,7 +486,7 @@ protected JavaxWebSocketFrameHandlerMetadata discoverJavaxFrameHandlerMetadata(C
return metadata;
}
- private boolean matchOnMessage(Method onMsg, JavaxWebSocketFrameHandlerMetadata metadata, MessageMetadata msgMetadata,
+ private boolean matchOnMessage(Method onMsg, JakartaWebSocketFrameHandlerMetadata metadata, MessageMetadata msgMetadata,
Function getMethodHandle)
{
// Whole Text Message.
@@ -580,7 +580,7 @@ private boolean matchOnMessage(Method onMsg, JavaxWebSocketFrameHandlerMetadata
return false;
}
- private boolean matchDecoders(Method onMsg, JavaxWebSocketFrameHandlerMetadata metadata, MessageMetadata msgMetadata,
+ private boolean matchDecoders(Method onMsg, JakartaWebSocketFrameHandlerMetadata metadata, MessageMetadata msgMetadata,
Function getMethodHandle)
{
// TODO: we should be able to get this information directly from the AvailableDecoders in the metadata.
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerMetadata.java
similarity index 93%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerMetadata.java
index b5db28e9969d..d1a34e870073 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerMetadata.java
@@ -16,20 +16,20 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.lang.invoke.MethodHandle;
-import javax.websocket.Decoder;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
-import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
-import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
+import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders;
+import org.eclipse.jetty.websocket.jakarta.common.encoders.AvailableEncoders;
import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
import org.eclipse.jetty.websocket.util.messages.MessageSink;
-public class JavaxWebSocketFrameHandlerMetadata
+public class JakartaWebSocketFrameHandlerMetadata
{
private static final String[] NO_VARIABLES = new String[0];
@@ -74,7 +74,7 @@ public class JavaxWebSocketFrameHandlerMetadata
*/
private UriTemplatePathSpec uriTemplatePathSpec;
- public JavaxWebSocketFrameHandlerMetadata(EndpointConfig endpointConfig)
+ public JakartaWebSocketFrameHandlerMetadata(EndpointConfig endpointConfig)
{
this.endpointConfig = endpointConfig;
this.availableDecoders = new AvailableDecoders(endpointConfig);
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketPongMessage.java
similarity index 84%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketPongMessage.java
index a0d85b7129c8..addf2f4f8189 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketPongMessage.java
@@ -16,18 +16,18 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.nio.ByteBuffer;
-import javax.websocket.PongMessage;
+import jakarta.websocket.PongMessage;
import org.eclipse.jetty.util.BufferUtil;
-public class JavaxWebSocketPongMessage implements PongMessage
+public class JakartaWebSocketPongMessage implements PongMessage
{
private final ByteBuffer data;
- public JavaxWebSocketPongMessage(ByteBuffer buf)
+ public JakartaWebSocketPongMessage(ByteBuffer buf)
{
this.data = buf;
}
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketRemoteEndpoint.java
similarity index 93%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketRemoteEndpoint.java
index 9f541a0e83c6..8c13760ad1a0 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketRemoteEndpoint.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.time.Duration;
import java.util.concurrent.TimeUnit;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-import javax.websocket.SendHandler;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.SendHandler;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.FutureCallback;
@@ -39,16 +39,16 @@
import org.eclipse.jetty.websocket.util.messages.MessageOutputStream;
import org.eclipse.jetty.websocket.util.messages.MessageWriter;
-public class JavaxWebSocketRemoteEndpoint implements javax.websocket.RemoteEndpoint, OutgoingFrames
+public class JakartaWebSocketRemoteEndpoint implements jakarta.websocket.RemoteEndpoint, OutgoingFrames
{
- private static final Logger LOG = Log.getLogger(JavaxWebSocketRemoteEndpoint.class);
+ private static final Logger LOG = Log.getLogger(JakartaWebSocketRemoteEndpoint.class);
- protected final JavaxWebSocketSession session;
+ protected final JakartaWebSocketSession session;
private final CoreSession coreSession;
protected boolean batch = false;
protected byte messageType = -1;
- protected JavaxWebSocketRemoteEndpoint(JavaxWebSocketSession session, CoreSession coreSession)
+ protected JakartaWebSocketRemoteEndpoint(JakartaWebSocketSession session, CoreSession coreSession)
{
this.session = session;
this.coreSession = coreSession;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSession.java
similarity index 88%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSession.java
index 2c7377c37eea..fae818db204e 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSession.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.io.IOException;
import java.net.URI;
@@ -30,34 +30,34 @@
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
-import javax.websocket.CloseReason;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Extension;
-import javax.websocket.MessageHandler;
-import javax.websocket.RemoteEndpoint.Async;
-import javax.websocket.RemoteEndpoint.Basic;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Extension;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.RemoteEndpoint.Async;
+import jakarta.websocket.RemoteEndpoint.Basic;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.ExtensionConfig;
-import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
-import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
+import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders;
+import org.eclipse.jetty.websocket.jakarta.common.encoders.AvailableEncoders;
import org.eclipse.jetty.websocket.util.ReflectUtils;
/**
* Client Session for the JSR.
*/
-public class JavaxWebSocketSession implements javax.websocket.Session
+public class JakartaWebSocketSession implements jakarta.websocket.Session
{
- private static final Logger LOG = Log.getLogger(JavaxWebSocketSession.class);
+ private static final Logger LOG = Log.getLogger(JakartaWebSocketSession.class);
- private final JavaxWebSocketContainer container;
+ private final JakartaWebSocketContainer container;
private final CoreSession coreSession;
- private final JavaxWebSocketFrameHandler frameHandler;
+ private final JakartaWebSocketFrameHandler frameHandler;
private final EndpointConfig config;
private final AvailableDecoders availableDecoders;
private final AvailableEncoders availableEncoders;
@@ -65,13 +65,13 @@ public class JavaxWebSocketSession implements javax.websocket.Session
private Map userProperties;
private List negotiatedExtensions;
- private JavaxWebSocketAsyncRemote asyncRemote;
- private JavaxWebSocketBasicRemote basicRemote;
+ private JakartaWebSocketAsyncRemote asyncRemote;
+ private JakartaWebSocketBasicRemote basicRemote;
- public JavaxWebSocketSession(JavaxWebSocketContainer container,
- CoreSession coreSession,
- JavaxWebSocketFrameHandler frameHandler,
- EndpointConfig endpointConfig)
+ public JakartaWebSocketSession(JakartaWebSocketContainer container,
+ CoreSession coreSession,
+ JakartaWebSocketFrameHandler frameHandler,
+ EndpointConfig endpointConfig)
{
this.container = container;
this.coreSession = coreSession;
@@ -215,7 +215,7 @@ private long getBlockingTimeout()
*
* @param obj the return object
*/
- @SuppressWarnings("unused") // used by JavaxWebSocketFrameHandlerFactory via MethodHandle
+ @SuppressWarnings("unused") // used by Jakarta WebSocketFrameHandlerFactory via MethodHandle
public void filterReturnType(Object obj)
{
if (obj != null)
@@ -243,7 +243,7 @@ public Async getAsyncRemote()
{
if (asyncRemote == null)
{
- asyncRemote = new JavaxWebSocketAsyncRemote(this, coreSession);
+ asyncRemote = new JakartaWebSocketAsyncRemote(this, coreSession);
}
return asyncRemote;
}
@@ -259,7 +259,7 @@ public Basic getBasicRemote()
{
if (basicRemote == null)
{
- basicRemote = new JavaxWebSocketBasicRemote(this, coreSession);
+ basicRemote = new JakartaWebSocketBasicRemote(this, coreSession);
}
return basicRemote;
}
@@ -276,7 +276,7 @@ public WebSocketContainer getContainer()
return this.container;
}
- public JavaxWebSocketContainer getContainerImpl()
+ public JakartaWebSocketContainer getContainerImpl()
{
return this.container;
}
@@ -296,7 +296,7 @@ public Object getEndpoint()
return frameHandler.getEndpoint();
}
- public JavaxWebSocketFrameHandler getFrameHandler()
+ public JakartaWebSocketFrameHandler getFrameHandler()
{
return frameHandler;
}
@@ -419,7 +419,7 @@ public List getNegotiatedExtensions()
if ((negotiatedExtensions == null) && extensions != null)
{
- negotiatedExtensions = extensions.stream().map(JavaxWebSocketExtension::new).collect(Collectors.toList());
+ negotiatedExtensions = extensions.stream().map(JakartaWebSocketExtension::new).collect(Collectors.toList());
}
return negotiatedExtensions;
}
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSessionListener.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSessionListener.java
similarity index 75%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSessionListener.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSessionListener.java
index 6538fcd5a60a..f10d78a17165 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSessionListener.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSessionListener.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
-public interface JavaxWebSocketSessionListener
+public interface JakartaWebSocketSessionListener
{
- void onJavaxWebSocketSessionOpened(JavaxWebSocketSession session);
+ void onJakartaWebSocketSessionOpened(JakartaWebSocketSession session);
- void onJavaxWebSocketSessionClosed(JavaxWebSocketSession session);
+ void onJakartaWebSocketSessionClosed(JakartaWebSocketSession session);
}
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/PathParamProvider.java
similarity index 81%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/PathParamProvider.java
index cdda746079b5..86bb2f7c419d 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/PathParamProvider.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.util.Map;
/**
- * Optional interface for custom {@link javax.websocket.EndpointConfig} implementations
- * in Jetty to expose Path Param values used during the {@link JavaxWebSocketFrameHandler}
+ * Optional interface for custom {@link jakarta.websocket.EndpointConfig} implementations
+ * in Jetty to expose Path Param values used during the {@link JakartaWebSocketFrameHandler}
* resolution of methods.
*
- * Mostly a feature of the JSR356 Server implementation and its {@code @javax.websocket.server.PathParam} annotation.
+ * Mostly a feature of the JSR356 Server implementation and its {@code @jakarta.websocket.server.PathParam} annotation.
*
*/
public interface PathParamProvider
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PutListenerMap.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/PutListenerMap.java
similarity index 98%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PutListenerMap.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/PutListenerMap.java
index 54c2bb2ddcb2..3d4e971c73e3 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PutListenerMap.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/PutListenerMap.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.util.Collection;
import java.util.Map;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/RegisteredMessageHandler.java
similarity index 93%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/RegisteredMessageHandler.java
index 467473cf1971..0a2f7bc6bc3e 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/RegisteredMessageHandler.java
@@ -16,9 +16,9 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
-import javax.websocket.MessageHandler;
+import jakarta.websocket.MessageHandler;
public class RegisteredMessageHandler
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SendHandlerCallback.java
similarity index 91%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SendHandlerCallback.java
index b55723920020..7e6238e3f12d 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SendHandlerCallback.java
@@ -16,11 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
-
-import javax.websocket.SendHandler;
-import javax.websocket.SendResult;
+package org.eclipse.jetty.websocket.jakarta.common;
+import jakarta.websocket.SendHandler;
+import jakarta.websocket.SendResult;
import org.eclipse.jetty.util.Callback;
/**
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ServerEndpointConfigWrapper.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ServerEndpointConfigWrapper.java
similarity index 92%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ServerEndpointConfigWrapper.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ServerEndpointConfigWrapper.java
index 66ef7a2ba531..9564e7e68761 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ServerEndpointConfigWrapper.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ServerEndpointConfigWrapper.java
@@ -16,11 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.util.List;
-import javax.websocket.Extension;
-import javax.websocket.server.ServerEndpointConfig;
+
+import jakarta.websocket.Extension;
+import jakarta.websocket.server.ServerEndpointConfig;
public class ServerEndpointConfigWrapper extends EndpointConfigWrapper implements ServerEndpointConfig
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SessionTracker.java
similarity index 82%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SessionTracker.java
index afb500d7fa8c..089883b653b4 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SessionTracker.java
@@ -16,24 +16,24 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.io.IOException;
import java.util.Collections;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
-import javax.websocket.CloseReason;
-import javax.websocket.Session;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.Session;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
-public class SessionTracker extends AbstractLifeCycle implements JavaxWebSocketSessionListener
+public class SessionTracker extends AbstractLifeCycle implements JakartaWebSocketSessionListener
{
private static final Logger LOG = Log.getLogger(SessionTracker.class);
- private CopyOnWriteArraySet sessions = new CopyOnWriteArraySet<>();
+ private CopyOnWriteArraySet sessions = new CopyOnWriteArraySet<>();
public Set getSessions()
{
@@ -41,13 +41,13 @@ public Set getSessions()
}
@Override
- public void onJavaxWebSocketSessionOpened(JavaxWebSocketSession session)
+ public void onJakartaWebSocketSessionOpened(JakartaWebSocketSession session)
{
sessions.add(session);
}
@Override
- public void onJavaxWebSocketSessionClosed(JavaxWebSocketSession session)
+ public void onJakartaWebSocketSessionClosed(JakartaWebSocketSession session)
{
sessions.remove(session);
}
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/UpgradeRequest.java
similarity index 83%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/UpgradeRequest.java
index 90de5c9c4923..f6c16579d37a 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/UpgradeRequest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.net.URI;
import java.security.Principal;
@@ -24,14 +24,14 @@
public interface UpgradeRequest
{
/**
- * For {@link javax.websocket.Session#getUserPrincipal()}
+ * For {@link jakarta.websocket.Session#getUserPrincipal()}
*
* @return the User {@link Principal} present during the Upgrade Request
*/
Principal getUserPrincipal();
/**
- * For obtaining {@link javax.websocket.server.PathParam} values from Request URI path
+ * For obtaining {@link jakarta.websocket.server.PathParam} values from Request URI path
*
* @return the request URI
*/
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/UpgradeRequestAdapter.java
similarity index 96%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/UpgradeRequestAdapter.java
index 4ab2345d6695..328941279e62 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/UpgradeRequestAdapter.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.net.URI;
import java.security.Principal;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/AbstractDecoder.java
similarity index 87%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/AbstractDecoder.java
index 3864b49153e8..fd52b0adf1b5 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/AbstractDecoder.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
-import javax.websocket.Decoder;
-import javax.websocket.EndpointConfig;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EndpointConfig;
public abstract class AbstractDecoder implements Decoder
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/AvailableDecoders.java
similarity index 97%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/AvailableDecoders.java
index 51703c578245..dab553ef65e9 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/AvailableDecoders.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
import java.io.InputStream;
import java.io.Reader;
@@ -28,10 +28,10 @@
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.stream.Collectors;
-import javax.websocket.Decoder;
-import javax.websocket.EndpointConfig;
-import org.eclipse.jetty.websocket.javax.common.InitException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EndpointConfig;
+import org.eclipse.jetty.websocket.jakarta.common.InitException;
import org.eclipse.jetty.websocket.util.InvalidSignatureException;
import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
import org.eclipse.jetty.websocket.util.ReflectUtils;
@@ -42,7 +42,7 @@ public static class RegisteredDecoder
{
// The user supplied Decoder class
public final Class extends Decoder> decoder;
- // The javax.websocket.Decoder.* type (eg: Decoder.Binary, Decoder.BinaryStream, Decoder.Text, Decoder.TextStream)
+ // The jakarta.websocket.Decoder.* type (eg: Decoder.Binary, Decoder.BinaryStream, Decoder.Text, Decoder.TextStream)
public final Class extends Decoder> interfaceType;
public final Class> objectType;
public final boolean primitive;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/BooleanDecoder.java
similarity index 83%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/BooleanDecoder.java
index 89e3f69ab443..cbdb8c95dd50 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/BooleanDecoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
/**
- * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link Boolean} decoder.
+ * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link Boolean} decoder.
*
* Note: delegates to {@link Boolean#parseBoolean(String)} and will only support "true" and "false" as boolean values.
*/
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteArrayDecoder.java
similarity index 89%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteArrayDecoder.java
index d1649fe58b16..918e506d5b3b 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteArrayDecoder.java
@@ -16,12 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
import java.nio.ByteBuffer;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
import org.eclipse.jetty.util.BufferUtil;
public class ByteArrayDecoder extends AbstractDecoder implements Decoder.Binary
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteBufferDecoder.java
similarity index 89%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteBufferDecoder.java
index ca50a9ae52f6..889fed09aea2 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteBufferDecoder.java
@@ -16,11 +16,12 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
import java.nio.ByteBuffer;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
public class ByteBufferDecoder extends AbstractDecoder implements Decoder.Binary
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteDecoder.java
similarity index 86%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteDecoder.java
index 4ec723617391..e543dedeb071 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteDecoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
/**
- * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link Byte} decoder
+ * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link Byte} decoder
*/
public class ByteDecoder extends AbstractDecoder implements Decoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/CharacterDecoder.java
similarity index 84%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/CharacterDecoder.java
index d5a4ed201b37..3d3b1da3c0b7 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/CharacterDecoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
/**
- * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link Character} decoder
+ * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link Character} decoder
*/
public class CharacterDecoder extends AbstractDecoder implements Decoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/DoubleDecoder.java
similarity index 86%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/DoubleDecoder.java
index 7f376a2f365f..7b5dbdd9d5d8 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/DoubleDecoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
/**
- * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link Double} to decoder
+ * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link Double} to decoder
*/
public class DoubleDecoder extends AbstractDecoder implements Decoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/FloatDecoder.java
similarity index 92%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/FloatDecoder.java
index e2719c2e7426..cd95b55dc325 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/FloatDecoder.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
/**
* Default implementation of the Text Message to {@link Float} decoder
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/InputStreamDecoder.java
similarity index 86%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/InputStreamDecoder.java
index 9051fcdd76a0..ced6929d15b3 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/InputStreamDecoder.java
@@ -16,13 +16,14 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
import java.io.IOException;
import java.io.InputStream;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.EndpointConfig;
+
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EndpointConfig;
public class InputStreamDecoder implements Decoder.BinaryStream
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/IntegerDecoder.java
similarity index 86%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/IntegerDecoder.java
index f728dd7cc99f..36a046cd29e4 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/IntegerDecoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
/**
- * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link Integer} decoder
+ * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link Integer} decoder
*/
public class IntegerDecoder extends AbstractDecoder implements Decoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/LongDecoder.java
similarity index 92%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/LongDecoder.java
index 68bf205daa54..79962adc06c9 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/LongDecoder.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
/**
* Default implementation of the Text Message to {@link Long} decoder
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/PongMessageDecoder.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/PongMessageDecoder.java
index f87edd84bf26..f121b071a934 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/PongMessageDecoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
import java.nio.ByteBuffer;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.PongMessage;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.PongMessage;
import org.eclipse.jetty.util.BufferUtil;
public class PongMessageDecoder extends AbstractDecoder implements Decoder.Binary
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ReaderDecoder.java
similarity index 86%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ReaderDecoder.java
index fa685f1f705e..ae7d29fa97ba 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ReaderDecoder.java
@@ -16,13 +16,14 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
import java.io.IOException;
import java.io.Reader;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.EndpointConfig;
+
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EndpointConfig;
public class ReaderDecoder implements Decoder.TextStream
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ShortDecoder.java
similarity index 86%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ShortDecoder.java
index fd7a62f22d31..83589567e604 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ShortDecoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
/**
- * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link Short} decoder
+ * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link Short} decoder
*/
public class ShortDecoder extends AbstractDecoder implements Decoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/StringDecoder.java
similarity index 82%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/StringDecoder.java
index 5c4a9e85ef41..b7096fca520e 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/StringDecoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.decoders;
+package org.eclipse.jetty.websocket.jakarta.common.decoders;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
/**
- * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link String} decoder
+ * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link String} decoder
*/
public class StringDecoder extends AbstractDecoder implements Decoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/AbstractEncoder.java
similarity index 87%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/AbstractEncoder.java
index 3609b9467839..0732e8178173 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/AbstractEncoder.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
public abstract class AbstractEncoder implements Encoder
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/AvailableEncoders.java
similarity index 98%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/AvailableEncoders.java
index dac4741c4a94..ee6d222394d4 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/AvailableEncoders.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
import java.lang.reflect.InvocationTargetException;
import java.nio.ByteBuffer;
@@ -26,10 +26,10 @@
import java.util.Objects;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
-import org.eclipse.jetty.websocket.javax.common.InitException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
+import org.eclipse.jetty.websocket.jakarta.common.InitException;
import org.eclipse.jetty.websocket.util.InvalidSignatureException;
import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
import org.eclipse.jetty.websocket.util.ReflectUtils;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/BooleanEncoder.java
similarity index 81%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/BooleanEncoder.java
index dd328eb7be1f..e50b95e521db 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/BooleanEncoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
/**
- * Default encoder for {@link Boolean} to {@link javax.websocket.Encoder.Text} Message encoder
+ * Default encoder for {@link Boolean} to {@link jakarta.websocket.Encoder.Text} Message encoder
*/
public class BooleanEncoder extends AbstractEncoder implements Encoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteArrayEncoder.java
similarity index 86%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteArrayEncoder.java
index 215705cbc561..25fbe774516c 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteArrayEncoder.java
@@ -16,12 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
import java.nio.ByteBuffer;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
+
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
public class ByteArrayEncoder implements Encoder.Binary
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteBufferEncoder.java
similarity index 86%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteBufferEncoder.java
index 2a2208c77d67..1db71284710b 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteBufferEncoder.java
@@ -16,12 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
import java.nio.ByteBuffer;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
+
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
public class ByteBufferEncoder implements Encoder.Binary
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteEncoder.java
similarity index 81%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteEncoder.java
index 095c8d5ce814..d1d4181ce5d2 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteEncoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
/**
- * Default encoder for {@link Byte} to {@link javax.websocket.Encoder.Text} Message encoder
+ * Default encoder for {@link Byte} to {@link jakarta.websocket.Encoder.Text} Message encoder
*/
public class ByteEncoder extends AbstractEncoder implements Encoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/CharacterEncoder.java
similarity index 81%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/CharacterEncoder.java
index 9453a825517d..d07e8a70dca7 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/CharacterEncoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
/**
- * Default encoder for {@link Character} to {@link javax.websocket.Encoder.Text} Message encoder
+ * Default encoder for {@link Character} to {@link jakarta.websocket.Encoder.Text} Message encoder
*/
public class CharacterEncoder extends AbstractEncoder implements Encoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/DoubleEncoder.java
similarity index 81%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/DoubleEncoder.java
index 229ed5a8c835..6edc3b13d75f 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/DoubleEncoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
/**
- * Default encoder for {@link Double} to {@link javax.websocket.Encoder.Text} Message encoder
+ * Default encoder for {@link Double} to {@link jakarta.websocket.Encoder.Text} Message encoder
*/
public class DoubleEncoder extends AbstractEncoder implements Encoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/EncodeFailedFuture.java
similarity index 95%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/EncodeFailedFuture.java
index 1a0d43b9bdf6..9f5c7ac7c8ec 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/EncodeFailedFuture.java
@@ -16,13 +16,14 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import javax.websocket.Encoder;
+
+import jakarta.websocket.Encoder;
/**
* A {@code Future<Void>} that is already failed as a result of an Encode error
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/FloatEncoder.java
similarity index 81%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/FloatEncoder.java
index e0ce4c50570b..f5d4498eb9d9 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/FloatEncoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
/**
- * Default encoder for {@link Float} to {@link javax.websocket.Encoder.Text} Message encoder
+ * Default encoder for {@link Float} to {@link jakarta.websocket.Encoder.Text} Message encoder
*/
public class FloatEncoder extends AbstractEncoder implements Encoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/IntegerEncoder.java
similarity index 81%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/IntegerEncoder.java
index eb6d4c0cbd04..0437d0ac13cf 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/IntegerEncoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
/**
- * Default encoder for {@link Integer} to {@link javax.websocket.Encoder.Text} Message encoder
+ * Default encoder for {@link Integer} to {@link jakarta.websocket.Encoder.Text} Message encoder
*/
public class IntegerEncoder extends AbstractEncoder implements Encoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/LongEncoder.java
similarity index 81%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/LongEncoder.java
index 1f70b208d3f2..491e03641713 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/LongEncoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
/**
- * Default encoder for {@link Long} to {@link javax.websocket.Encoder.Text} Message encoder
+ * Default encoder for {@link Long} to {@link jakarta.websocket.Encoder.Text} Message encoder
*/
public class LongEncoder extends AbstractEncoder implements Encoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ShortEncoder.java
similarity index 81%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ShortEncoder.java
index d5b50e29578a..018bbbaa8297 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ShortEncoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
/**
- * Default encoder for {@link Short} to {@link javax.websocket.Encoder.Text} Message encoder
+ * Default encoder for {@link Short} to {@link jakarta.websocket.Encoder.Text} Message encoder
*/
public class ShortEncoder extends AbstractEncoder implements Encoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/StringEncoder.java
similarity index 80%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/StringEncoder.java
index 67e9e786f154..bd30f8cf4bbc 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/StringEncoder.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.encoders;
+package org.eclipse.jetty.websocket.jakarta.common.encoders;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
/**
- * Default encoder for {@link String} to {@link javax.websocket.Encoder.Text} Message encoder
+ * Default encoder for {@link String} to {@link jakarta.websocket.Encoder.Text} Message encoder
*/
public class StringEncoder extends AbstractEncoder implements Encoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryMessageSink.java
similarity index 94%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryMessageSink.java
index dae52a2e1981..f7322c85b739 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryMessageSink.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.messages;
+package org.eclipse.jetty.websocket.jakarta.common.messages;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.nio.ByteBuffer;
-import javax.websocket.CloseReason;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.exception.CloseException;
import org.eclipse.jetty.websocket.util.messages.ByteBufferMessageSink;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryStreamMessageSink.java
similarity index 93%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryStreamMessageSink.java
index 653f35491be0..9ec3dba8fa0c 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryStreamMessageSink.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.messages;
+package org.eclipse.jetty.websocket.jakarta.common.messages;
import java.io.InputStream;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
-import javax.websocket.CloseReason;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.exception.CloseException;
import org.eclipse.jetty.websocket.util.messages.InputStreamMessageSink;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedMessageSink.java
similarity index 95%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedMessageSink.java
index f784f661f559..687766d46a0b 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedMessageSink.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.messages;
+package org.eclipse.jetty.websocket.jakarta.common.messages;
import java.lang.invoke.MethodHandle;
-import javax.websocket.Decoder;
+import jakarta.websocket.Decoder;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextMessageSink.java
similarity index 94%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextMessageSink.java
index 69c6f3005d75..48ed9ceede53 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextMessageSink.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.messages;
+package org.eclipse.jetty.websocket.jakarta.common.messages;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
-import javax.websocket.CloseReason;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.exception.CloseException;
import org.eclipse.jetty.websocket.util.messages.MessageSink;
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextStreamMessageSink.java
similarity index 93%
rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java
rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextStreamMessageSink.java
index 3955f14069f8..86c612f4bfbf 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java
+++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextStreamMessageSink.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.messages;
+package org.eclipse.jetty.websocket.jakarta.common.messages;
import java.io.Reader;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
-import javax.websocket.CloseReason;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.exception.CloseException;
import org.eclipse.jetty.websocket.util.messages.MessageSink;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java
similarity index 74%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java
index f9990e41803a..2819216aa9d5 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java
@@ -16,20 +16,20 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.util.HashMap;
import java.util.Map;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.EndpointConfig;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.EndpointConfig;
import org.eclipse.jetty.websocket.core.CoreSession;
-import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
-import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
+import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders;
+import org.eclipse.jetty.websocket.jakarta.common.encoders.AvailableEncoders;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-public abstract class AbstractJavaxWebSocketFrameHandlerTest
+public abstract class AbstractJakartaWebSocketFrameHandlerTest
{
protected static DummyContainer container;
@@ -52,7 +52,7 @@ public static void stopContainer() throws Exception
protected EndpointConfig endpointConfig;
protected CoreSession coreSession = new CoreSession.Empty();
- public AbstractJavaxWebSocketFrameHandlerTest()
+ public AbstractJakartaWebSocketFrameHandlerTest()
{
endpointConfig = ClientEndpointConfig.Builder.create().build();
encoders = new AvailableEncoders(endpointConfig);
@@ -60,11 +60,11 @@ public AbstractJavaxWebSocketFrameHandlerTest()
uriParams = new HashMap<>();
}
- protected JavaxWebSocketFrameHandler newJavaxFrameHandler(Object websocket)
+ protected JakartaWebSocketFrameHandler newJakartaFrameHandler(Object websocket)
{
- JavaxWebSocketFrameHandlerFactory factory = container.getFrameHandlerFactory();
+ JakartaWebSocketFrameHandlerFactory factory = container.getFrameHandlerFactory();
ConfiguredEndpoint endpoint = new ConfiguredEndpoint(websocket, endpointConfig);
UpgradeRequest upgradeRequest = new UpgradeRequestAdapter();
- return factory.newJavaxWebSocketFrameHandler(endpoint, upgradeRequest);
+ return factory.newJakartaWebSocketFrameHandler(endpoint, upgradeRequest);
}
}
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/AbstractSessionTest.java
similarity index 76%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/AbstractSessionTest.java
index e425420c99b9..59cc4bb7525a 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/AbstractSessionTest.java
@@ -16,20 +16,19 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
-
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
+package org.eclipse.jetty.websocket.jakarta.common;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Session;
import org.eclipse.jetty.websocket.core.CoreSession;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
public abstract class AbstractSessionTest
{
- protected static JavaxWebSocketSession session;
- protected static JavaxWebSocketContainer container;
+ protected static JakartaWebSocketSession session;
+ protected static JakartaWebSocketContainer container;
@BeforeAll
public static void initSession() throws Exception
@@ -38,9 +37,9 @@ public static void initSession() throws Exception
container.start();
Object websocketPojo = new DummyEndpoint();
UpgradeRequest upgradeRequest = new UpgradeRequestAdapter();
- JavaxWebSocketFrameHandler frameHandler = container.newFrameHandler(websocketPojo, upgradeRequest);
+ JakartaWebSocketFrameHandler frameHandler = container.newFrameHandler(websocketPojo, upgradeRequest);
CoreSession coreSession = new CoreSession.Empty();
- session = new JavaxWebSocketSession(container, coreSession, frameHandler, container.getFrameHandlerFactory()
+ session = new JakartaWebSocketSession(container, coreSession, frameHandler, container.getFrameHandlerFactory()
.newDefaultEndpointConfig(websocketPojo.getClass(), null));
}
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/Defaults.java
similarity index 95%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/Defaults.java
index e7e505859a9c..5414ff24e87a 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/Defaults.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.util.concurrent.TimeUnit;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyContainer.java
similarity index 88%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyContainer.java
index ab0c3ae86269..72436c071011 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyContainer.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.io.IOException;
import java.net.URI;
import java.util.concurrent.Executor;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.DeploymentException;
-import javax.websocket.Endpoint;
-import javax.websocket.Session;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.Session;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.websocket.core.WebSocketComponents;
import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
@@ -33,9 +33,9 @@
/**
* Dummy Container for testing.
*/
-public class DummyContainer extends JavaxWebSocketContainer
+public class DummyContainer extends JakartaWebSocketContainer
{
- private final JavaxWebSocketFrameHandlerFactory frameHandlerFactory;
+ private final JakartaWebSocketFrameHandlerFactory frameHandlerFactory;
private final QueuedThreadPool executor;
public DummyContainer()
@@ -122,7 +122,7 @@ public Executor getExecutor()
}
@Override
- protected JavaxWebSocketFrameHandlerFactory getFrameHandlerFactory()
+ protected JakartaWebSocketFrameHandlerFactory getFrameHandlerFactory()
{
return frameHandlerFactory;
}
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyFrameHandlerFactory.java
similarity index 63%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyFrameHandlerFactory.java
index d7468d6a2d0a..0e48a81ae39e 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyFrameHandlerFactory.java
@@ -16,18 +16,17 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
-
-import javax.websocket.ClientEndpoint;
-import javax.websocket.ClientEndpointConfig;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
+package org.eclipse.jetty.websocket.jakarta.common;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.ClientEndpointConfig;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
import org.eclipse.jetty.websocket.util.InvokerUtils;
-public class DummyFrameHandlerFactory extends JavaxWebSocketFrameHandlerFactory
+public class DummyFrameHandlerFactory extends JakartaWebSocketFrameHandlerFactory
{
- public DummyFrameHandlerFactory(JavaxWebSocketContainer container)
+ public DummyFrameHandlerFactory(JakartaWebSocketContainer container)
{
super(container, InvokerUtils.PARAM_IDENTITY);
}
@@ -39,9 +38,9 @@ public EndpointConfig newDefaultEndpointConfig(Class> endpointClass, String pa
}
@Override
- public JavaxWebSocketFrameHandlerMetadata getMetadata(Class> endpointClass, EndpointConfig endpointConfig)
+ public JakartaWebSocketFrameHandlerMetadata getMetadata(Class> endpointClass, EndpointConfig endpointConfig)
{
- if (javax.websocket.Endpoint.class.isAssignableFrom(endpointClass))
+ if (jakarta.websocket.Endpoint.class.isAssignableFrom(endpointClass))
{
return createEndpointMetadata((Class extends Endpoint>)endpointClass, endpointConfig);
}
@@ -51,7 +50,7 @@ public JavaxWebSocketFrameHandlerMetadata getMetadata(Class> endpointClass, En
return null;
}
- JavaxWebSocketFrameHandlerMetadata metadata = new JavaxWebSocketFrameHandlerMetadata(endpointConfig);
- return discoverJavaxFrameHandlerMetadata(endpointClass, metadata);
+ JakartaWebSocketFrameHandlerMetadata metadata = new JakartaWebSocketFrameHandlerMetadata(endpointConfig);
+ return discoverJakartaFrameHandlerMetadata(endpointClass, metadata);
}
}
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerBadSignaturesTest.java
similarity index 93%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerBadSignaturesTest.java
index cf4b7dc9e758..44d00f78d005 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerBadSignaturesTest.java
@@ -16,15 +16,14 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
-
-import javax.websocket.ClientEndpoint;
-import javax.websocket.CloseReason;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-
+package org.eclipse.jetty.websocket.jakarta.common;
+
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
import org.eclipse.jetty.websocket.util.InvalidSignatureException;
import org.junit.jupiter.api.Test;
@@ -32,11 +31,11 @@
import static org.hamcrest.Matchers.containsString;
import static org.junit.jupiter.api.Assertions.assertThrows;
-public class JavaxWebSocketFrameHandlerBadSignaturesTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerBadSignaturesTest extends AbstractJakartaWebSocketFrameHandlerTest
{
private void assertBadSocket(Object socket, String expectedString) throws Exception
{
- Exception e = assertThrows(InvalidSignatureException.class, () -> newJavaxFrameHandler(socket));
+ Exception e = assertThrows(InvalidSignatureException.class, () -> newJakartaFrameHandler(socket));
assertThat(e.getMessage(), containsString(expectedString));
}
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnCloseTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnCloseTest.java
similarity index 87%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnCloseTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnCloseTest.java
index 8abf58ad0c9e..622e34e711fb 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnCloseTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnCloseTest.java
@@ -16,18 +16,18 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.CloseReason;
-import javax.websocket.OnClose;
-import javax.websocket.Session;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.Session;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.Frame;
-import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket;
+import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket;
import org.hamcrest.Matcher;
import org.junit.jupiter.api.Test;
@@ -35,13 +35,13 @@
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.containsString;
-public class JavaxWebSocketFrameHandlerOnCloseTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnCloseTest extends AbstractJakartaWebSocketFrameHandlerTest
{
private static final String EXPECTED_REASON = "CloseReason[1000,Normal]";
private void assertOnCloseInvocation(TrackingSocket socket, Matcher eventMatcher) throws Exception
{
- JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket);
+ JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket);
// These invocations are the same for all tests
localEndpoint.onOpen(coreSession, Callback.NOOP);
@@ -89,7 +89,7 @@ public void testInvokeCloseSession() throws Exception
{
assertOnCloseInvocation(new CloseSessionSocket(),
allOf(
- containsString("onClose(JavaxWebSocketSession@"),
+ containsString("onClose(JakartaWebSocketSession@"),
containsString(CloseSessionSocket.class.getName())
));
}
@@ -126,7 +126,7 @@ public void testInvokeCloseSessionReason() throws Exception
{
assertOnCloseInvocation(new CloseSessionReasonSocket(),
allOf(
- containsString("onClose(JavaxWebSocketSession@"),
+ containsString("onClose(JakartaWebSocketSession@"),
containsString(CloseSessionReasonSocket.class.getName())
));
}
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnErrorTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnErrorTest.java
similarity index 87%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnErrorTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnErrorTest.java
index 1b97ae0423dd..8022c45790fa 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnErrorTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnErrorTest.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.OnError;
-import javax.websocket.Session;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.OnError;
+import jakarta.websocket.Session;
import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket;
+import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket;
import org.hamcrest.Matcher;
import org.junit.jupiter.api.Test;
@@ -32,13 +32,13 @@
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.containsString;
-public class JavaxWebSocketFrameHandlerOnErrorTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnErrorTest extends AbstractJakartaWebSocketFrameHandlerTest
{
private static final String EXPECTED_THROWABLE = "java.lang.RuntimeException: From Testcase";
private void assertOnErrorInvocation(TrackingSocket socket, Matcher eventMatcher) throws Exception
{
- JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket);
+ JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket);
// These invocations are the same for all tests
localEndpoint.onOpen(coreSession, Callback.NOOP);
@@ -62,7 +62,7 @@ public void testInvokeErrorSessionThrowable() throws Exception
{
assertOnErrorInvocation(new ErrorSessionThrowableSocket(),
allOf(
- containsString("onError(JavaxWebSocketSession@"),
+ containsString("onError(JakartaWebSocketSession@"),
containsString(ErrorSessionThrowableSocket.class.getName()),
containsString(EXPECTED_THROWABLE)
));
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryStreamTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java
similarity index 84%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryStreamTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java
index dc5b33aa2abd..4c111a671473 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryStreamTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java
@@ -16,32 +16,32 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.OnMessage;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.OnMessage;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket;
+import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-public class JavaxWebSocketFrameHandlerOnMessageBinaryStreamTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest extends AbstractJakartaWebSocketFrameHandlerTest
{
@SuppressWarnings("Duplicates")
- private TrackingSocket performOnMessageInvocation(TrackingSocket socket, Function func) throws Exception
+ private TrackingSocket performOnMessageInvocation(TrackingSocket socket, Function func) throws Exception
{
- JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket);
+ JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket);
// This invocation is the same for all tests
localEndpoint.onOpen(coreSession, Callback.NOOP);
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryTest.java
similarity index 88%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryTest.java
index 2d05a5b3e8ef..6817c8ea7d4c 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryTest.java
@@ -16,20 +16,20 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket;
+import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket;
import org.eclipse.jetty.websocket.util.InvalidSignatureException;
import org.hamcrest.Matcher;
import org.junit.jupiter.api.Test;
@@ -40,11 +40,11 @@
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.jupiter.api.Assertions.assertThrows;
-public class JavaxWebSocketFrameHandlerOnMessageBinaryTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnMessageBinaryTest extends AbstractJakartaWebSocketFrameHandlerTest
{
private void assertOnMessageInvocation(TrackingSocket socket, Matcher eventMatcher) throws Exception
{
- JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket);
+ JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket);
// This invocation is the same for all tests
localEndpoint.onOpen(coreSession, Callback.NOOP);
@@ -111,7 +111,7 @@ public void testInvokeMessageSession() throws Exception
assertThrows(InvalidSignatureException.class, () ->
assertOnMessageInvocation(new MessageSessionSocket(),
allOf(
- containsString("onMessage(JavaxWebSocketSession@"),
+ containsString("onMessage(JakartaWebSocketSession@"),
containsString(MessageSessionSocket.class.getName())
))
);
@@ -132,7 +132,7 @@ public void testInvokeMessageSessionByteBuffer() throws Exception
{
assertOnMessageInvocation(new MessageSessionByteBufferSocket(),
allOf(
- containsString("onMessage(JavaxWebSocketSession@"),
+ containsString("onMessage(JakartaWebSocketSession@"),
containsString(MessageSessionByteBufferSocket.class.getName())
));
}
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextStreamTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java
similarity index 84%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextStreamTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java
index 0c5bb1bf9a9f..8a6952f4405b 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextStreamTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java
@@ -16,31 +16,31 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.io.IOException;
import java.io.Reader;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.OnMessage;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.OnMessage;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket;
+import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-public class JavaxWebSocketFrameHandlerOnMessageTextStreamTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnMessageTextStreamTest extends AbstractJakartaWebSocketFrameHandlerTest
{
@SuppressWarnings("Duplicates")
- private TrackingSocket performOnMessageInvocation(TrackingSocket socket, Function func) throws Exception
+ private TrackingSocket performOnMessageInvocation(TrackingSocket socket, Function func) throws Exception
{
- JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket);
+ JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket);
// This invocation is the same for all tests
localEndpoint.onOpen(coreSession, Callback.NOOP);
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextTest.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextTest.java
index ccb95e2674ea..b56f41db03fe 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextTest.java
@@ -16,20 +16,20 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.OnMessage;
-import javax.websocket.Session;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.Session;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket;
+import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket;
import org.eclipse.jetty.websocket.util.InvalidSignatureException;
import org.hamcrest.Matcher;
import org.junit.jupiter.api.Test;
@@ -39,11 +39,11 @@
import static org.hamcrest.Matchers.containsString;
import static org.junit.jupiter.api.Assertions.assertThrows;
-public class JavaxWebSocketFrameHandlerOnMessageTextTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnMessageTextTest extends AbstractJakartaWebSocketFrameHandlerTest
{
private void onText(TrackingSocket socket, String msg) throws Exception
{
- JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket);
+ JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket);
// This invocation is the same for all tests
localEndpoint.onOpen(coreSession, Callback.NOOP);
@@ -133,7 +133,7 @@ public void testInvokeMessageSessionText() throws Exception
{
assertOnMessageInvocation(new MessageSessionTextSocket(),
allOf(
- containsString("onMessage(JavaxWebSocketSession@"),
+ containsString("onMessage(JakartaWebSocketSession@"),
containsString(MessageSessionTextSocket.class.getName()),
containsString(", Hello World)")
));
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnOpenTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnOpenTest.java
similarity index 81%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnOpenTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnOpenTest.java
index 15fe26140c32..b3460151f7ef 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnOpenTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnOpenTest.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common;
+package org.eclipse.jetty.websocket.jakarta.common;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket;
+import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket;
import org.hamcrest.Matcher;
import org.junit.jupiter.api.Test;
@@ -32,11 +32,11 @@
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.containsString;
-public class JavaxWebSocketFrameHandlerOnOpenTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnOpenTest extends AbstractJakartaWebSocketFrameHandlerTest
{
private void assertOnOpenInvocation(TrackingSocket socket, Matcher eventMatcher) throws Exception
{
- JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket);
+ JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket);
// This invocation is the same for all tests
localEndpoint.onOpen(coreSession, Callback.NOOP);
@@ -75,7 +75,7 @@ public void testInvokeOpenSession() throws Exception
{
assertOnOpenInvocation(new OpenSessionSocket(),
allOf(
- containsString("onOpen(JavaxWebSocketSession"),
+ containsString("onOpen(JakartaWebSocketSession"),
containsString(OpenSessionSocket.class.getName())
));
}
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/BadDualDecoder.java
similarity index 94%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/BadDualDecoder.java
index b795e2412942..da166975853a 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/BadDualDecoder.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.coders;
+package org.eclipse.jetty.websocket.jakarta.common.coders.tests;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.EndpointConfig;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EndpointConfig;
import org.eclipse.jetty.util.BufferUtil;
/**
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/BadDualEncoder.java
similarity index 88%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/BadDualEncoder.java
index decb7288d88d..8d4d5f1d2577 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/BadDualEncoder.java
@@ -16,13 +16,14 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.coders;
+package org.eclipse.jetty.websocket.jakarta.common.coders.tests;
import java.io.IOException;
import java.io.Writer;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
+
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
/**
* Intentionally bad example of attempting to encode the same object for different message types.
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/ExtDecoder.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/ExtDecoder.java
index d8582ec1fe7d..4a3334f515fc 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/ExtDecoder.java
@@ -16,9 +16,9 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.coders.tests;
+package org.eclipse.jetty.websocket.jakarta.common.coders.tests;
-import javax.websocket.Decoder;
+import jakarta.websocket.Decoder;
/**
* Testing scenario of an extended Decoder interface
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/Fruit.java
similarity index 92%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/Fruit.java
index 516a4f9e08a9..018a4a10cbcf 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/Fruit.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.coders.tests;
+package org.eclipse.jetty.websocket.jakarta.common.coders.tests;
public class Fruit
{
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitBinaryEncoder.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitBinaryEncoder.java
index b64f2b583e4d..879b20556a82 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitBinaryEncoder.java
@@ -16,14 +16,14 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.coders.tests;
+package org.eclipse.jetty.websocket.jakarta.common.coders.tests;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
import org.eclipse.jetty.util.BufferUtil;
public class FruitBinaryEncoder implements Encoder.Binary
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitDecoder.java
similarity index 92%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitDecoder.java
index dc7b98bb6317..c4e11b3ec7a8 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitDecoder.java
@@ -16,12 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.coders.tests;
+package org.eclipse.jetty.websocket.jakarta.common.coders.tests;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.websocket.DecodeException;
-import javax.websocket.EndpointConfig;
+
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.EndpointConfig;
public class FruitDecoder implements ExtDecoder
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitTextEncoder.java
similarity index 85%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitTextEncoder.java
index 7adbc45ffc20..5e36b0d442ee 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitTextEncoder.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.coders;
+package org.eclipse.jetty.websocket.jakarta.common.coders.tests;
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
+import jakarta.websocket.EncodeException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
public class FruitTextEncoder implements Encoder.Text
{
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/AbstractStringEndpoint.java
similarity index 91%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/AbstractStringEndpoint.java
index 0e66a3d192d5..367d89a8d658 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/AbstractStringEndpoint.java
@@ -16,21 +16,21 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.endpoints;
+package org.eclipse.jetty.websocket.jakarta.common.endpoints;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import javax.websocket.CloseReason;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
-import javax.websocket.Session;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.MessageHandler;
+import jakarta.websocket.Session;
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.javax.common.Defaults;
+import org.eclipse.jetty.websocket.jakarta.common.Defaults;
import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/DummyEndpoint.java
similarity index 84%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/DummyEndpoint.java
index 3b34830b96ad..72b21760c3ea 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/DummyEndpoint.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.endpoints;
+package org.eclipse.jetty.websocket.jakarta.common.endpoints;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Session;
public class DummyEndpoint extends Endpoint
{
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/EchoStringEndpoint.java
similarity index 95%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/EchoStringEndpoint.java
index c4be71da3c3d..3eed503ac15b 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/EchoStringEndpoint.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.endpoints;
+package org.eclipse.jetty.websocket.jakarta.common.endpoints;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingDeque;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/BaseMessageHandler.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/BaseMessageHandler.java
index 770536d9ce51..869de66695aa 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/BaseMessageHandler.java
@@ -16,9 +16,9 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.handlers;
+package org.eclipse.jetty.websocket.jakarta.common.handlers;
-import javax.websocket.MessageHandler;
+import jakarta.websocket.MessageHandler;
public class BaseMessageHandler implements MessageHandler.Whole
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteArrayPartialHandler.java
similarity index 90%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteArrayPartialHandler.java
index 32f9bc222e91..648628d630d1 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteArrayPartialHandler.java
@@ -16,9 +16,9 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.handlers;
+package org.eclipse.jetty.websocket.jakarta.common.handlers;
-import javax.websocket.MessageHandler;
+import jakarta.websocket.MessageHandler;
public class ByteArrayPartialHandler implements MessageHandler.Partial
{
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteArrayWholeHandler.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteArrayWholeHandler.java
index efbd4a0b3572..6bee4ec72bd7 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteArrayWholeHandler.java
@@ -16,9 +16,9 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.handlers;
+package org.eclipse.jetty.websocket.jakarta.common.handlers;
-import javax.websocket.MessageHandler;
+import jakarta.websocket.MessageHandler;
public class ByteArrayWholeHandler implements MessageHandler.Whole
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteBufferPartialHandler.java
similarity index 90%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteBufferPartialHandler.java
index f203e9a0cd9f..dcffa8412f7c 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteBufferPartialHandler.java
@@ -16,10 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.handlers;
+package org.eclipse.jetty.websocket.jakarta.common.handlers;
import java.nio.ByteBuffer;
-import javax.websocket.MessageHandler;
+
+import jakarta.websocket.MessageHandler;
public class ByteBufferPartialHandler implements MessageHandler.Partial
{
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteBufferWholeHandler.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteBufferWholeHandler.java
index 85a2b34dcdd1..3e4c3b5b786c 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteBufferWholeHandler.java
@@ -16,10 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.handlers;
+package org.eclipse.jetty.websocket.jakarta.common.handlers;
import java.nio.ByteBuffer;
-import javax.websocket.MessageHandler;
+
+import jakarta.websocket.MessageHandler;
public class ByteBufferWholeHandler implements MessageHandler.Whole
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ComboMessageHandler.java
similarity index 92%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ComboMessageHandler.java
index a266e5a5c1da..14b6c91d2e09 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ComboMessageHandler.java
@@ -16,10 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.handlers;
+package org.eclipse.jetty.websocket.jakarta.common.handlers;
import java.nio.ByteBuffer;
-import javax.websocket.MessageHandler;
+
+import jakarta.websocket.MessageHandler;
/**
* A particularly annoying type of MessageHandler. One defining 2 implementations.
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ExtendedMessageHandler.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ExtendedMessageHandler.java
index 980c649b2242..e68fb5b921a2 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ExtendedMessageHandler.java
@@ -16,10 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.handlers;
+package org.eclipse.jetty.websocket.jakarta.common.handlers;
import java.nio.ByteBuffer;
-import javax.websocket.MessageHandler;
+
+import jakarta.websocket.MessageHandler;
public class ExtendedMessageHandler extends BaseMessageHandler implements MessageHandler.Partial
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/InputStreamWholeHandler.java
similarity index 90%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/InputStreamWholeHandler.java
index 34c5af063b80..969900f190ca 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/InputStreamWholeHandler.java
@@ -16,10 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.handlers;
+package org.eclipse.jetty.websocket.jakarta.common.handlers;
import java.io.InputStream;
-import javax.websocket.MessageHandler;
+
+import jakarta.websocket.MessageHandler;
public class InputStreamWholeHandler implements MessageHandler.Whole
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/LongMessageHandler.java
similarity index 89%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/LongMessageHandler.java
index f11558478558..83b6ad2f8d34 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/LongMessageHandler.java
@@ -16,9 +16,9 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.handlers;
+package org.eclipse.jetty.websocket.jakarta.common.handlers;
-import javax.websocket.MessageHandler;
+import jakarta.websocket.MessageHandler;
public class LongMessageHandler implements MessageHandler.Whole
{
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ReaderWholeHandler.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ReaderWholeHandler.java
index 18c7a194ec52..9ad4743541f2 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ReaderWholeHandler.java
@@ -16,10 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.handlers;
+package org.eclipse.jetty.websocket.jakarta.common.handlers;
import java.io.Reader;
-import javax.websocket.MessageHandler;
+
+import jakarta.websocket.MessageHandler;
public class ReaderWholeHandler implements MessageHandler.Whole
{
diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/StringPartialHandler.java
similarity index 90%
rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/StringPartialHandler.java
index d614d282a1f9..61de0eede3e8 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/StringPartialHandler.java
@@ -16,9 +16,9 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests.handlers;
+package org.eclipse.jetty.websocket.jakarta.common.handlers;
-import javax.websocket.MessageHandler;
+import jakarta.websocket.MessageHandler;
public class StringPartialHandler implements MessageHandler.Partial
{
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/StringWholeHandler.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/StringWholeHandler.java
index c1c4c0103937..9ff715eadff3 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/StringWholeHandler.java
@@ -16,9 +16,9 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.handlers;
+package org.eclipse.jetty.websocket.jakarta.common.handlers;
-import javax.websocket.MessageHandler;
+import jakarta.websocket.MessageHandler;
public class StringWholeHandler implements MessageHandler.Whole
{
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/AbstractMessageSinkTest.java
similarity index 92%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/AbstractMessageSinkTest.java
index e056e88b9f47..77c6ca93c286 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/AbstractMessageSinkTest.java
@@ -16,14 +16,14 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.messages;
+package org.eclipse.jetty.websocket.jakarta.common.messages;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.util.function.Consumer;
-import org.eclipse.jetty.websocket.javax.common.AbstractSessionTest;
+import org.eclipse.jetty.websocket.jakarta.common.AbstractSessionTest;
public abstract class AbstractMessageSinkTest extends AbstractSessionTest
{
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryMessageSinkTest.java
similarity index 95%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryMessageSinkTest.java
index afa3f919c732..6f15de3c7263 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryMessageSinkTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.messages;
+package org.eclipse.jetty.websocket.jakarta.common.messages;
import java.lang.invoke.MethodHandle;
import java.nio.ByteBuffer;
@@ -26,14 +26,14 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.EndpointConfig;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EndpointConfig;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.common.AbstractSessionTest;
+import org.eclipse.jetty.websocket.jakarta.common.AbstractSessionTest;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryStreamMessageSinkTest.java
similarity index 97%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryStreamMessageSinkTest.java
index 1fbd4cf03d35..07818e0d8317 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryStreamMessageSinkTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.messages;
+package org.eclipse.jetty.websocket.jakarta.common.messages;
import java.io.IOException;
import java.io.InputStream;
@@ -28,10 +28,10 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.EndpointConfig;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EndpointConfig;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.websocket.core.Frame;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextMessageSinkTest.java
similarity index 96%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextMessageSinkTest.java
index f805aec78b58..dbbe23177fef 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextMessageSinkTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.messages;
+package org.eclipse.jetty.websocket.jakarta.common.messages;
import java.lang.invoke.MethodHandle;
import java.text.ParseException;
@@ -26,10 +26,10 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.EndpointConfig;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EndpointConfig;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextStreamMessageSinkTest.java
similarity index 96%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextStreamMessageSinkTest.java
index d33952b6f942..7a59f8eedfcd 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextStreamMessageSinkTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.messages;
+package org.eclipse.jetty.websocket.jakarta.common.messages;
import java.io.IOException;
import java.io.Reader;
@@ -28,10 +28,10 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
-import javax.websocket.EndpointConfig;
+import jakarta.websocket.DecodeException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.EndpointConfig;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.websocket.core.Frame;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/InputStreamMessageSinkTest.java
similarity index 98%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/InputStreamMessageSinkTest.java
index eb8a9fb32fec..6ef6f082120e 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/InputStreamMessageSinkTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.messages;
+package org.eclipse.jetty.websocket.jakarta.common.messages;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -35,7 +35,7 @@
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.javax.common.AbstractSessionTest;
+import org.eclipse.jetty.websocket.jakarta.common.AbstractSessionTest;
import org.eclipse.jetty.websocket.util.messages.InputStreamMessageSink;
import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/MessageWriterTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/MessageWriterTest.java
new file mode 100644
index 000000000000..d8ccdedf55a2
--- /dev/null
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/MessageWriterTest.java
@@ -0,0 +1,185 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under
+// the terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0
+//
+// This Source Code may also be made available under the following
+// Secondary Licenses when the conditions for such availability set
+// forth in the Eclipse Public License, v. 2.0 are satisfied:
+// the Apache License v2.0 which is available at
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package org.eclipse.jetty.websocket.jakarta.common.messages;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import org.eclipse.jetty.io.ByteBufferPool;
+import org.eclipse.jetty.io.MappedByteBufferPool;
+import org.eclipse.jetty.util.Callback;
+import org.eclipse.jetty.util.Utf8StringBuilder;
+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.util.messages.MessageWriter;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+public class MessageWriterTest
+{
+ private ByteBufferPool bufferPool = new MappedByteBufferPool();
+
+ @Test
+ public void testSingleByteArray512b() throws IOException, InterruptedException
+ {
+ FrameCapture capture = new FrameCapture();
+ capture.setOutputBufferSize(1024);
+ try (MessageWriter writer = new MessageWriter(capture, bufferPool))
+ {
+ char[] cbuf = new char[512];
+ Arrays.fill(cbuf, 'x');
+ writer.write(cbuf);
+ }
+
+ Frame frame = capture.frames.poll(1, TimeUnit.SECONDS);
+ assertThat("Frame[0].opcode", frame.getOpCode(), is(OpCode.TEXT));
+ assertThat("Frame[0].payloadLength", frame.getPayloadLength(), is(512));
+ assertThat("Frame[0].fin", frame.isFin(), is(true));
+ }
+
+ @Test
+ public void testSingleByteArray2k() throws IOException, InterruptedException
+ {
+ FrameCapture capture = new FrameCapture();
+ capture.setOutputBufferSize(1024);
+ try (MessageWriter writer = new MessageWriter(capture, bufferPool))
+ {
+ char[] cbuf = new char[1024 * 2];
+ Arrays.fill(cbuf, 'x');
+ writer.write(cbuf);
+ }
+
+ Frame frame = capture.frames.poll(1, TimeUnit.SECONDS);
+ assertThat("Frame[0].opcode", frame.getOpCode(), is(OpCode.TEXT));
+ assertThat("Frame[0].payloadLength", frame.getPayloadLength(), is(1024));
+ assertThat("Frame[0].fin", frame.isFin(), is(false));
+
+ frame = capture.frames.poll(1, TimeUnit.SECONDS);
+ assertThat("Frame[1].opcode", frame.getOpCode(), is(OpCode.CONTINUATION));
+ assertThat("Frame[1].payloadLength", frame.getPayloadLength(), is(1024));
+ assertThat("Frame[1].fin", frame.isFin(), is(true));
+ }
+
+ @Test
+ public void testMultipleByteArrays2k() throws IOException, InterruptedException
+ {
+ final int testSize = 1024 * 2;
+ final int outputSize = 80;
+ final int writerBufferSize = 100;
+
+ FrameCapture capture = new FrameCapture();
+ capture.setOutputBufferSize(writerBufferSize);
+ try (MessageWriter writer = new MessageWriter(capture, bufferPool))
+ {
+ char[] cbuf = new char[testSize];
+ Arrays.fill(cbuf, 'x');
+ int remaining = cbuf.length;
+ int offset = 0;
+ while (remaining > 0)
+ {
+ int length = Math.min(remaining, outputSize);
+ writer.write(cbuf, offset, length);
+ remaining -= outputSize;
+ }
+ }
+
+ Frame frame;
+
+ int remaining = testSize;
+ byte expectedOpCode = OpCode.TEXT;
+ int i = 0;
+
+ while (remaining > 0)
+ {
+ frame = capture.frames.poll(1, TimeUnit.SECONDS);
+ String prefix = String.format("Frame[%d](op=%d,%sfin)", (i++), frame.getOpCode(), frame.isFin() ? "" : "!");
+ assertThat(prefix + ".opcode", frame.getOpCode(), is(expectedOpCode));
+ int expectedSize = Math.min(remaining, writerBufferSize);
+ assertThat(prefix + ".payloadLength", frame.getPayloadLength(), is(expectedSize));
+ boolean expectedFin = (remaining < outputSize);
+ assertThat(prefix + ".fin", frame.isFin(), is(expectedFin));
+
+ expectedOpCode = OpCode.CONTINUATION;
+ remaining -= frame.getPayloadLength();
+ }
+ }
+
+ @Test
+ public void testSlightLargerThenBufferSize() throws IOException, InterruptedException
+ {
+ final int writerBufferSize = 64 * 1024;
+ final int testSize = writerBufferSize + 16;
+
+ WholeMessageCapture capture = new WholeMessageCapture();
+ capture.setOutputBufferSize(writerBufferSize);
+ try (MessageWriter writer = new MessageWriter(capture, bufferPool))
+ {
+ char[] cbuf = new char[testSize];
+ Arrays.fill(cbuf, 'x');
+ for (int i = 0; i < testSize; i++)
+ {
+ writer.write(cbuf[i]);
+ }
+ }
+
+ String message = capture.messages.poll(1, TimeUnit.SECONDS);
+ assertThat("Message[0].length", message.length(), is(testSize));
+ }
+
+ public static class FrameCapture extends CoreSession.Empty
+ {
+ public BlockingQueue frames = new LinkedBlockingQueue<>();
+
+ @Override
+ public void sendFrame(Frame frame, Callback callback, boolean batch)
+ {
+ frames.offer(Frame.copy(frame));
+ callback.succeeded();
+ }
+ }
+
+ public static class WholeMessageCapture extends CoreSession.Empty
+ {
+ public BlockingQueue messages = new LinkedBlockingQueue<>();
+
+ private Utf8StringBuilder activeMessage;
+
+ @Override
+ public void sendFrame(Frame frame, Callback callback, boolean batch)
+ {
+ if (frame.getOpCode() == OpCode.TEXT)
+ activeMessage = new Utf8StringBuilder();
+
+ activeMessage.append(frame.getPayload().slice());
+
+ if (frame.isFin())
+ {
+ messages.offer(activeMessage.toString());
+ activeMessage = null;
+ }
+ callback.succeeded();
+ }
+ }
+}
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/ReaderMessageSinkTest.java
similarity index 98%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/ReaderMessageSinkTest.java
index 3bab792edcaa..ae30b0bc5b96 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/ReaderMessageSinkTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.messages;
+package org.eclipse.jetty.websocket.jakarta.common.messages;
import java.io.IOException;
import java.io.Reader;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/sockets/TrackingSocket.java
similarity index 93%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/sockets/TrackingSocket.java
index f06a72b356e3..e30c6fb4e21a 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/sockets/TrackingSocket.java
@@ -16,12 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.sockets;
+package org.eclipse.jetty.websocket.jakarta.common.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-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/InvokerUtilsStaticParamsTest.java
similarity index 90%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/InvokerUtilsStaticParamsTest.java
index d9b5b131afe2..3df57547ae8b 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/InvokerUtilsStaticParamsTest.java
@@ -16,17 +16,17 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.util;
+package org.eclipse.jetty.websocket.jakarta.common.util;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-import javax.websocket.Session;
+import jakarta.websocket.Session;
import org.eclipse.jetty.util.annotation.Name;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerFactory;
import org.eclipse.jetty.websocket.util.InvokerUtils;
import org.eclipse.jetty.websocket.util.ReflectUtils;
import org.junit.jupiter.api.Test;
@@ -82,7 +82,7 @@ public void testOnlyParamString() throws Throwable
templateValues.put("fruit", "pear");
// Bind the static values, in same order as declared
- methodHandle = JavaxWebSocketFrameHandlerFactory.bindTemplateVariables(methodHandle, namedVariables, templateValues);
+ methodHandle = JakartaWebSocketFrameHandlerFactory.bindTemplateVariables(methodHandle, namedVariables, templateValues);
// Assign an instance to call.
Foo foo = new Foo();
@@ -111,7 +111,7 @@ public void testOnlyParamInt() throws Throwable
templateValues.put("count", "2222");
// Bind the static values for the variables, in same order as the variables were declared
- methodHandle = JavaxWebSocketFrameHandlerFactory.bindTemplateVariables(methodHandle, namedVariables, templateValues);
+ methodHandle = JakartaWebSocketFrameHandlerFactory.bindTemplateVariables(methodHandle, namedVariables, templateValues);
// Assign an instance to call.
Foo foo = new Foo();
@@ -142,7 +142,7 @@ public void testLabeledParamStringInt() throws Throwable
templateValues.put("count", "444");
// Bind the static values for the variables, in same order as the variables were declared
- methodHandle = JavaxWebSocketFrameHandlerFactory.bindTemplateVariables(methodHandle, namedVariables, templateValues);
+ methodHandle = JakartaWebSocketFrameHandlerFactory.bindTemplateVariables(methodHandle, namedVariables, templateValues);
// Assign an instance to call.
Foo foo = new Foo();
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/InvokerUtilsTest.java
similarity index 99%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/InvokerUtilsTest.java
index 54c6e51fa7ff..9e8855148e7a 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/InvokerUtilsTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.util;
+package org.eclipse.jetty.websocket.jakarta.common.util;
import java.io.File;
import java.lang.invoke.MethodHandle;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/NameParamIdentifier.java
similarity index 96%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/NameParamIdentifier.java
index 9ecb0e20cf16..4916da531f26 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/NameParamIdentifier.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.util;
+package org.eclipse.jetty.websocket.jakarta.common.util;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/ReflectUtilsTest.java
similarity index 98%
rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java
rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/ReflectUtilsTest.java
index 9d7026334d93..8b7edc711f9b 100644
--- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java
+++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/ReflectUtilsTest.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.common.util;
+package org.eclipse.jetty.websocket.jakarta.common.util;
import org.eclipse.jetty.websocket.util.ReflectUtils;
import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-javax-common/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-jakarta-common/src/test/resources/jetty-logging.properties
similarity index 100%
rename from jetty-websocket/websocket-javax-common/src/test/resources/jetty-logging.properties
rename to jetty-websocket/websocket-jakarta-common/src/test/resources/jetty-logging.properties
diff --git a/jetty-websocket/websocket-javax-common/src/test/resources/quotes-ben.txt b/jetty-websocket/websocket-jakarta-common/src/test/resources/quotes-ben.txt
similarity index 100%
rename from jetty-websocket/websocket-javax-common/src/test/resources/quotes-ben.txt
rename to jetty-websocket/websocket-jakarta-common/src/test/resources/quotes-ben.txt
diff --git a/jetty-websocket/websocket-javax-common/src/test/resources/quotes-twain.txt b/jetty-websocket/websocket-jakarta-common/src/test/resources/quotes-twain.txt
similarity index 100%
rename from jetty-websocket/websocket-javax-common/src/test/resources/quotes-twain.txt
rename to jetty-websocket/websocket-jakarta-common/src/test/resources/quotes-twain.txt
diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-jakarta-server/pom.xml
similarity index 70%
rename from jetty-websocket/websocket-javax-server/pom.xml
rename to jetty-websocket/websocket-jakarta-server/pom.xml
index 5f9b00e0a646..43247deb8a63 100644
--- a/jetty-websocket/websocket-javax-server/pom.xml
+++ b/jetty-websocket/websocket-jakarta-server/pom.xml
@@ -3,21 +3,21 @@
org.eclipse.jetty.websocketwebsocket-parent
- 10.0.0-SNAPSHOT
+ 11.0.0-SNAPSHOT4.0.0
- websocket-javax-server
- Jetty :: Websocket :: javax.websocket :: Server
+ websocket-jakarta-server
+ Jetty :: Websocket :: jakarta.websocket :: Server
- ${project.groupId}.javax.server
+ ${project.groupId}.jakarta.serverorg.eclipse.jetty.websocket
- websocket-javax-client
+ websocket-jakarta-client${project.version}
@@ -32,7 +32,7 @@
org.eclipse.jetty.toolchain
- jetty-javax-websocket-api
+ jetty-jakarta-websocket-apiorg.eclipse.jetty.toolchain
@@ -47,7 +47,7 @@
maven-surefire-plugin
- @{argLine} ${jetty.surefire.argLine} --add-exports org.eclipse.jetty.websocket.javax.server/org.eclipse.jetty.websocket.javax.server.examples=org.eclipse.jetty.websocket.javax.common --add-reads org.eclipse.jetty.websocket.javax.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.javax.common=org.eclipse.jetty.websocket.javax.server
+ @{argLine} ${jetty.surefire.argLine} --add-exports org.eclipse.jetty.websocket.jakarta.server/org.eclipse.jetty.websocket.jakarta.server.examples=org.eclipse.jetty.websocket.jakarta.common --add-reads org.eclipse.jetty.websocket.jakarta.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.jakarta.common=org.eclipse.jetty.websocket.jakarta.server
@@ -62,13 +62,13 @@
- javax.websocket.server Implementation
+ jakarta.websocket.server Implementation
- org.eclipse.jetty.websocket.javax.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
+ org.eclipse.jetty.websocket.jakarta.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
- osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=javax.websocket.server.ServerEndpointConfig$Configurator
+ osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=jakarta.websocket.server.ServerEndpointConfig$Configurator
diff --git a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod b/jetty-websocket/websocket-jakarta-server/src/main/config/modules/websocket-jakarta.mod
similarity index 66%
rename from jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod
rename to jetty-websocket/websocket-jakarta-server/src/main/config/modules/websocket-jakarta.mod
index 62ba7f8f59b2..372f933fa841 100644
--- a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod
+++ b/jetty-websocket/websocket-jakarta-server/src/main/config/modules/websocket-jakarta.mod
@@ -1,7 +1,7 @@
DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
[description]
-Enable javax.websocket for deployed web applications.
+Enable jakarta.websocket for deployed web applications.
[tags]
websocket
@@ -14,10 +14,10 @@ annotations
lib/websocket/websocket-core-${jetty.version}.jar
lib/websocket/websocket-util-${jetty.version}.jar
lib/websocket/websocket-servlet-${jetty.version}.jar
-lib/websocket/jetty-javax-websocket-api-1.1.2.jar
-lib/websocket/websocket-javax-*.jar
+lib/websocket/jetty-jakarta-websocket-api-2.0.0-SNAPSHOT.jar
+lib/websocket/websocket-jakarta-*.jar
[jpms]
# The implementation needs to access method handles in
# classes that are in the web application classloader.
-add-reads: org.eclipse.jetty.websocket.javax.common=ALL-UNNAMED
+add-reads: org.eclipse.jetty.websocket.jakarta.common=ALL-UNNAMED
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java b/jetty-websocket/websocket-jakarta-server/src/main/java/module-info.java
similarity index 61%
rename from jetty-websocket/websocket-javax-server/src/main/java/module-info.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/module-info.java
index 5f22863fa277..9b7a08f942e0 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/module-info.java
@@ -17,22 +17,22 @@
//
import javax.servlet.ServletContainerInitializer;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.webapp.Configuration;
-import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
+import org.eclipse.jetty.websocket.jakarta.server.config.ContainerDefaultConfigurator;
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketConfiguration;
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
-module org.eclipse.jetty.websocket.javax.server
+module org.eclipse.jetty.websocket.jakarta.server
{
- exports org.eclipse.jetty.websocket.javax.server.config;
+ exports org.eclipse.jetty.websocket.jakarta.server.config;
requires transitive org.eclipse.jetty.webapp;
- requires transitive org.eclipse.jetty.websocket.javax.client;
+ requires transitive org.eclipse.jetty.websocket.jakarta.client;
requires org.eclipse.jetty.websocket.servlet;
- provides ServletContainerInitializer with JavaxWebSocketServletContainerInitializer;
+ provides ServletContainerInitializer with JakartaWebSocketServletContainerInitializer;
provides ServerEndpointConfig.Configurator with ContainerDefaultConfigurator;
- provides Configuration with JavaxWebSocketConfiguration;
+ provides Configuration with JakartaWebSocketConfiguration;
}
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/ContainerDefaultConfigurator.java
similarity index 89%
rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/ContainerDefaultConfigurator.java
index c3adac067480..c9fe1eaacab7 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/ContainerDefaultConfigurator.java
@@ -16,24 +16,24 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.config;
+package org.eclipse.jetty.websocket.jakarta.server.config;
import java.util.ArrayList;
import java.util.List;
import java.util.ServiceLoader;
-import javax.websocket.Extension;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerEndpointConfig;
-import javax.websocket.server.ServerEndpointConfig.Configurator;
+import jakarta.websocket.Extension;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.server.HandshakeRequest;
+import jakarta.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.server.ServerEndpointConfig.Configurator;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
/**
* The "Container Default Configurator" per the JSR-356 spec.
*
- * @see ServiceLoader behavior of {@link javax.websocket.server.ServerEndpointConfig.Configurator}
+ * @see ServiceLoader behavior of {@link jakarta.websocket.server.ServerEndpointConfig.Configurator}
*/
public final class ContainerDefaultConfigurator extends Configurator
{
@@ -42,7 +42,7 @@ public final class ContainerDefaultConfigurator extends Configurator
/**
* Default Constructor required, as
- * javax.websocket.server.ServerEndpointConfig$Configurator.fetchContainerDefaultConfigurator()
+ * jakarta.websocket.server.ServerEndpointConfig$Configurator.fetchContainerDefaultConfigurator()
* will be the one that instantiates this class in most cases.
*/
public ContainerDefaultConfigurator()
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java
similarity index 78%
rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java
index 4c66e39abed2..8d48fd4eb9e5 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.config;
+package org.eclipse.jetty.websocket.jakarta.server.config;
import org.eclipse.jetty.webapp.AbstractConfiguration;
import org.eclipse.jetty.webapp.FragmentConfiguration;
@@ -31,15 +31,15 @@
* be able to see the org.eclipse.jetty.websocket package.
*
*/
-public class JavaxWebSocketConfiguration extends AbstractConfiguration
+public class JakartaWebSocketConfiguration extends AbstractConfiguration
{
- public JavaxWebSocketConfiguration()
+ public JakartaWebSocketConfiguration()
{
addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class);
addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName());
protectAndExpose("org.eclipse.jetty.websocket.servlet."); // For WebSocketUpgradeFilter
- protectAndExpose("org.eclipse.jetty.websocket.javax.server.config.");
- protectAndExpose("org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider");
- hide("org.eclipse.jetty.websocket.javax.server.internal");
+ protectAndExpose("org.eclipse.jetty.websocket.jakarta.server.config.");
+ protectAndExpose("org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainerProvider");
+ hide("org.eclipse.jetty.websocket.jakarta.server.internal");
}
}
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketServletContainerInitializer.java
similarity index 87%
rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketServletContainerInitializer.java
index 2b5bbfe79f5c..a895c2696577 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketServletContainerInitializer.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.config;
+package org.eclipse.jetty.websocket.jakarta.server.config;
import java.util.HashSet;
import java.util.Set;
@@ -24,13 +24,13 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.HandlesTypes;
-import javax.websocket.DeploymentException;
-import javax.websocket.Endpoint;
-import javax.websocket.server.ServerApplicationConfig;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.server.ServerApplicationConfig;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.listener.ContainerInitializer;
@@ -39,22 +39,22 @@
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.thread.ThreadClassLoaderScope;
import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer;
+import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketServerContainer;
import org.eclipse.jetty.websocket.servlet.WebSocketMapping;
import org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter;
@HandlesTypes({ServerApplicationConfig.class, ServerEndpoint.class, Endpoint.class})
-public class JavaxWebSocketServletContainerInitializer implements ServletContainerInitializer
+public class JakartaWebSocketServletContainerInitializer implements ServletContainerInitializer
{
/**
* The ServletContext attribute key name for the
- * ServerContainer per javax.websocket spec 1.0 final section 6.4 Programmatic Server Deployment
+ * ServerContainer per jakarta.websocket spec 1.0 final section 6.4 Programmatic Server Deployment
*/
- public static final String ATTR_JAVAX_SERVER_CONTAINER = javax.websocket.server.ServerContainer.class.getName();
+ public static final String ATTR_JAKARTA_SERVER_CONTAINER = jakarta.websocket.server.ServerContainer.class.getName();
- public static final String ENABLE_KEY = "org.eclipse.jetty.websocket.javax";
- public static final String HTTPCLIENT_ATTRIBUTE = "org.eclipse.jetty.websocket.javax.HttpClient";
- private static final Logger LOG = Log.getLogger(JavaxWebSocketServletContainerInitializer.class);
+ public static final String ENABLE_KEY = "org.eclipse.jetty.websocket.jakarta";
+ public static final String HTTPCLIENT_ATTRIBUTE = "org.eclipse.jetty.websocket.jakarta.HttpClient";
+ private static final Logger LOG = Log.getLogger(JakartaWebSocketServletContainerInitializer.class);
/**
* Test a ServletContext for {@code init-param} or {@code attribute} at {@code keyName} for
@@ -95,7 +95,7 @@ public interface Configurator
}
/**
- * Configure the {@link ServletContextHandler} to call {@link JavaxWebSocketServletContainerInitializer#onStartup(Set, ServletContext)}
+ * Configure the {@link ServletContextHandler} to call {@link JakartaWebSocketServletContainerInitializer#onStartup(Set, ServletContext)}
* during the {@link ServletContext} initialization phase.
*
* @param context the context to add listener to
@@ -109,10 +109,10 @@ public static void configure(ServletContextHandler context, Configurator configu
// the initialization phase is over. (important for this SCI to function)
context.getServletContext().setExtendedListenerTypes(true);
- context.addEventListener(ContainerInitializer.asContextListener(new JavaxWebSocketServletContainerInitializer())
+ context.addEventListener(ContainerInitializer.asContextListener(new JakartaWebSocketServletContainerInitializer())
.afterStartup((servletContext) ->
{
- JavaxWebSocketServerContainer serverContainer = JavaxWebSocketServerContainer.getContainer(servletContext);
+ JakartaWebSocketServerContainer serverContainer = JakartaWebSocketServerContainer.getContainer(servletContext);
if (configurator != null)
{
try
@@ -142,7 +142,7 @@ public static void configure(ServletContextHandler context, Configurator configu
*
* There is no enablement check here, and no automatic deployment of endpoints at this point
* in time. It merely sets up the {@link ServletContext} so with the basics needed to start
- * configuring for `javax.websocket.server` based endpoints.
+ * configuring for `jakarta.websocket.server` based endpoints.
*
*
* @param context the context to work with
@@ -150,13 +150,13 @@ public static void configure(ServletContextHandler context, Configurator configu
*/
private static ServerContainer initialize(ServletContextHandler context)
{
- JavaxWebSocketServerContainer serverContainer = JavaxWebSocketServerContainer.getContainer(context.getServletContext());
+ JakartaWebSocketServerContainer serverContainer = JakartaWebSocketServerContainer.getContainer(context.getServletContext());
if (serverContainer == null)
{
WebSocketComponents components = WebSocketComponents.ensureWebSocketComponents(context.getServletContext());
FilterHolder filterHolder = WebSocketUpgradeFilter.ensureFilter(context.getServletContext());
WebSocketMapping mapping = WebSocketMapping.ensureMapping(context.getServletContext(), WebSocketMapping.DEFAULT_KEY);
- serverContainer = JavaxWebSocketServerContainer.ensureContainer(context.getServletContext());
+ serverContainer = JakartaWebSocketServerContainer.ensureContainer(context.getServletContext());
if (LOG.isDebugEnabled())
LOG.debug("configureContext {} {} {} {}", mapping, components, filterHolder, serverContainer);
@@ -175,11 +175,11 @@ public void onStartup(Set> c, ServletContext context) throws ServletExc
if (!websocketEnabled)
{
- LOG.info("Javax Websocket is disabled by configuration for context {}", context.getContextPath());
+ LOG.info("Jakarta Websocket is disabled by configuration for context {}", context.getContextPath());
return;
}
- ServletContextHandler servletContextHandler = ServletContextHandler.getServletContextHandler(context, "Javax WebSocket SCI");
+ ServletContextHandler servletContextHandler = ServletContextHandler.getServletContextHandler(context, "Jakarta WebSocket SCI");
ServerContainer container = initialize(servletContextHandler);
try (ThreadClassLoaderScope scope = new ThreadClassLoaderScope(context.getClassLoader()))
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/AnnotatedServerEndpointConfig.java
similarity index 83%
rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/AnnotatedServerEndpointConfig.java
index 23af02b05753..004dcb4b6e31 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/AnnotatedServerEndpointConfig.java
@@ -16,29 +16,29 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.internal;
+package org.eclipse.jetty.websocket.jakarta.server.internal;
import java.util.ArrayList;
import java.util.List;
-import javax.websocket.Decoder;
-import javax.websocket.DeploymentException;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
-import org.eclipse.jetty.websocket.javax.common.ServerEndpointConfigWrapper;
-import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketContainer;
+import org.eclipse.jetty.websocket.jakarta.common.ServerEndpointConfigWrapper;
+import org.eclipse.jetty.websocket.jakarta.server.config.ContainerDefaultConfigurator;
public class AnnotatedServerEndpointConfig extends ServerEndpointConfigWrapper
{
- public AnnotatedServerEndpointConfig(JavaxWebSocketContainer containerScope, Class> endpointClass, ServerEndpoint anno) throws DeploymentException
+ public AnnotatedServerEndpointConfig(JakartaWebSocketContainer containerScope, Class> endpointClass, ServerEndpoint anno) throws DeploymentException
{
this(containerScope, endpointClass, anno, null);
}
- public AnnotatedServerEndpointConfig(JavaxWebSocketContainer containerScope, Class> endpointClass, ServerEndpoint anno, EndpointConfig baseConfig) throws DeploymentException
+ public AnnotatedServerEndpointConfig(JakartaWebSocketContainer containerScope, Class> endpointClass, ServerEndpoint anno, EndpointConfig baseConfig) throws DeploymentException
{
// Provided Base EndpointConfig.
ServerEndpointConfig baseServerConfig = null;
@@ -79,7 +79,7 @@ public AnnotatedServerEndpointConfig(JavaxWebSocketContainer containerScope, Cla
ServerEndpointConfig.Configurator rawConfigurator = getConfigurator(baseServerConfig, anno);
ServerEndpointConfig.Configurator configurator = containerScope.getObjectFactory().decorate(rawConfigurator);
- // Build a ServerEndpointConfig with the Javax API builder to wrap.
+ // Build a ServerEndpointConfig with the Jakarta API builder to wrap.
ServerEndpointConfig endpointConfig = ServerEndpointConfig.Builder.create(endpointClass, path)
.configurator(configurator)
.encoders(encoders)
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/BasicServerEndpointConfig.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/BasicServerEndpointConfig.java
similarity index 82%
rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/BasicServerEndpointConfig.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/BasicServerEndpointConfig.java
index 1ced906e6d24..c441fefd0ff0 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/BasicServerEndpointConfig.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/BasicServerEndpointConfig.java
@@ -16,12 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.internal;
+package org.eclipse.jetty.websocket.jakarta.server.internal;
-import javax.websocket.server.ServerEndpointConfig;
-
-import org.eclipse.jetty.websocket.javax.common.ServerEndpointConfigWrapper;
-import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator;
+import jakarta.websocket.server.ServerEndpointConfig;
+import org.eclipse.jetty.websocket.jakarta.common.ServerEndpointConfigWrapper;
+import org.eclipse.jetty.websocket.jakarta.server.config.ContainerDefaultConfigurator;
public class BasicServerEndpointConfig extends ServerEndpointConfigWrapper
{
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxServerUpgradeRequest.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaServerUpgradeRequest.java
similarity index 81%
rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxServerUpgradeRequest.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaServerUpgradeRequest.java
index 9b4d4d559393..43595d9c69df 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxServerUpgradeRequest.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaServerUpgradeRequest.java
@@ -16,19 +16,19 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.internal;
+package org.eclipse.jetty.websocket.jakarta.server.internal;
import java.net.URI;
import java.security.Principal;
-import org.eclipse.jetty.websocket.javax.common.UpgradeRequest;
+import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequest;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
-public class JavaxServerUpgradeRequest implements UpgradeRequest
+public class JakartaServerUpgradeRequest implements UpgradeRequest
{
private final ServletUpgradeRequest servletRequest;
- public JavaxServerUpgradeRequest(ServletUpgradeRequest servletRequest)
+ public JakartaServerUpgradeRequest(ServletUpgradeRequest servletRequest)
{
this.servletRequest = servletRequest;
}
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketCreator.java
similarity index 84%
rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketCreator.java
index 2c5c56f7dbd6..2fc5d03b3297 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketCreator.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.internal;
+package org.eclipse.jetty.websocket.jakarta.server.internal;
import java.io.IOException;
import java.util.ArrayList;
@@ -24,10 +24,10 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.websocket.Extension;
-import javax.websocket.Extension.Parameter;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.Extension;
+import jakarta.websocket.Extension.Parameter;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.http.pathmap.PathSpec;
import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
import org.eclipse.jetty.util.StringUtil;
@@ -35,25 +35,25 @@
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.ExtensionConfig;
import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
-import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtension;
-import org.eclipse.jetty.websocket.javax.common.ServerEndpointConfigWrapper;
+import org.eclipse.jetty.websocket.jakarta.common.ConfiguredEndpoint;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketContainer;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketExtension;
+import org.eclipse.jetty.websocket.jakarta.common.ServerEndpointConfigWrapper;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
-public class JavaxWebSocketCreator implements WebSocketCreator
+public class JakartaWebSocketCreator implements WebSocketCreator
{
- public static final String PROP_REMOTE_ADDRESS = "javax.websocket.endpoint.remoteAddress";
- public static final String PROP_LOCAL_ADDRESS = "javax.websocket.endpoint.localAddress";
- public static final String PROP_LOCALES = "javax.websocket.upgrade.locales";
- private static final Logger LOG = Log.getLogger(JavaxWebSocketCreator.class);
- private final JavaxWebSocketContainer containerScope;
+ public static final String PROP_REMOTE_ADDRESS = "jakarta.websocket.endpoint.remoteAddress";
+ public static final String PROP_LOCAL_ADDRESS = "jakarta.websocket.endpoint.localAddress";
+ public static final String PROP_LOCALES = "jakarta.websocket.upgrade.locales";
+ private static final Logger LOG = Log.getLogger(JakartaWebSocketCreator.class);
+ private final JakartaWebSocketContainer containerScope;
private final ServerEndpointConfig baseConfig;
private final WebSocketExtensionRegistry extensionRegistry;
- public JavaxWebSocketCreator(JavaxWebSocketContainer containerScope, ServerEndpointConfig config, WebSocketExtensionRegistry extensionRegistry)
+ public JakartaWebSocketCreator(JakartaWebSocketContainer containerScope, ServerEndpointConfig config, WebSocketExtensionRegistry extensionRegistry)
{
this.containerScope = containerScope;
this.baseConfig = config;
@@ -119,12 +119,12 @@ public Map getUserProperties()
List installedExtensions = new ArrayList<>();
for (String extName : extensionRegistry.getAvailableExtensions().keySet())
{
- installedExtensions.add(new JavaxWebSocketExtension(extName));
+ installedExtensions.add(new JakartaWebSocketExtension(extName));
}
List requestedExts = new ArrayList<>();
for (ExtensionConfig reqCfg : req.getExtensions())
{
- requestedExts.add(new JavaxWebSocketExtension(reqCfg));
+ requestedExts.add(new JakartaWebSocketExtension(reqCfg));
}
List usedExtensions = configurator.getNegotiatedExtensions(installedExtensions, requestedExts);
List configs = new ArrayList<>();
@@ -182,7 +182,7 @@ public boolean equals(Object o)
if (o == null || getClass() != o.getClass())
return false;
- JavaxWebSocketCreator that = (JavaxWebSocketCreator)o;
+ JakartaWebSocketCreator that = (JakartaWebSocketCreator)o;
return baseConfig != null ? baseConfig.equals(that.baseConfig) : that.baseConfig == null;
}
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerContainer.java
similarity index 74%
rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerContainer.java
index 0c84a4ab83d1..0e126586fc6e 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerContainer.java
@@ -16,17 +16,17 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.internal;
+package org.eclipse.jetty.websocket.jakarta.server.internal;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.function.Function;
import javax.servlet.ServletContext;
-import javax.websocket.DeploymentException;
-import javax.websocket.server.ServerEndpoint;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.server.ServerEndpoint;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.http.pathmap.PathSpec;
import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
@@ -39,28 +39,28 @@
import org.eclipse.jetty.websocket.core.WebSocketComponents;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
import org.eclipse.jetty.websocket.core.exception.WebSocketException;
-import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainer;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
+import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainer;
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
import org.eclipse.jetty.websocket.servlet.WebSocketMapping;
@ManagedObject("JSR356 Server Container")
-public class JavaxWebSocketServerContainer extends JavaxWebSocketClientContainer implements javax.websocket.server.ServerContainer, LifeCycle.Listener
+public class JakartaWebSocketServerContainer extends JakartaWebSocketClientContainer implements jakarta.websocket.server.ServerContainer, LifeCycle.Listener
{
- public static final String JAVAX_WEBSOCKET_CONTAINER_ATTRIBUTE = javax.websocket.server.ServerContainer.class.getName();
- private static final Logger LOG = Log.getLogger(JavaxWebSocketServerContainer.class);
+ public static final String JAKARTA_WEBSOCKET_CONTAINER_ATTRIBUTE = jakarta.websocket.server.ServerContainer.class.getName();
+ private static final Logger LOG = Log.getLogger(JakartaWebSocketServerContainer.class);
- public static JavaxWebSocketServerContainer getContainer(ServletContext servletContext)
+ public static JakartaWebSocketServerContainer getContainer(ServletContext servletContext)
{
- return (JavaxWebSocketServerContainer)servletContext.getAttribute(JAVAX_WEBSOCKET_CONTAINER_ATTRIBUTE);
+ return (JakartaWebSocketServerContainer)servletContext.getAttribute(JAKARTA_WEBSOCKET_CONTAINER_ATTRIBUTE);
}
- public static JavaxWebSocketServerContainer ensureContainer(ServletContext servletContext)
+ public static JakartaWebSocketServerContainer ensureContainer(ServletContext servletContext)
{
- ContextHandler contextHandler = ServletContextHandler.getServletContextHandler(servletContext, "Javax Websocket");
+ ContextHandler contextHandler = ServletContextHandler.getServletContextHandler(servletContext, "Jakarta Websocket");
if (contextHandler.getServer() == null)
throw new IllegalStateException("Server has not been set on the ServletContextHandler");
- JavaxWebSocketServerContainer container = getContainer(servletContext);
+ JakartaWebSocketServerContainer container = getContainer(servletContext);
if (container == null)
{
Function coreClientSupplier = (wsComponents) ->
@@ -69,9 +69,9 @@ public static JavaxWebSocketServerContainer ensureContainer(ServletContext servl
if (coreClient == null)
{
// Find Pre-Existing (Shared?) HttpClient and/or executor
- HttpClient httpClient = (HttpClient)servletContext.getAttribute(JavaxWebSocketServletContainerInitializer.HTTPCLIENT_ATTRIBUTE);
+ HttpClient httpClient = (HttpClient)servletContext.getAttribute(JakartaWebSocketServletContainerInitializer.HTTPCLIENT_ATTRIBUTE);
if (httpClient == null)
- httpClient = (HttpClient)contextHandler.getServer().getAttribute(JavaxWebSocketServletContainerInitializer.HTTPCLIENT_ATTRIBUTE);
+ httpClient = (HttpClient)contextHandler.getServer().getAttribute(JakartaWebSocketServletContainerInitializer.HTTPCLIENT_ATTRIBUTE);
Executor executor = httpClient == null ? null : httpClient.getExecutor();
if (executor == null)
@@ -84,7 +84,7 @@ public static JavaxWebSocketServerContainer ensureContainer(ServletContext servl
// create the core client
coreClient = new WebSocketCoreClient(httpClient, wsComponents);
- coreClient.getHttpClient().setName("Javax-WebSocketClient@" + Integer.toHexString(coreClient.getHttpClient().hashCode()));
+ coreClient.getHttpClient().setName("Jakarta-WebSocketClient@" + Integer.toHexString(coreClient.getHttpClient().hashCode()));
if (executor != null && httpClient == null)
coreClient.getHttpClient().setExecutor(executor);
servletContext.setAttribute(WebSocketCoreClient.WEBSOCKET_CORECLIENT_ATTRIBUTE, coreClient);
@@ -93,59 +93,59 @@ public static JavaxWebSocketServerContainer ensureContainer(ServletContext servl
};
// Create the Jetty ServerContainer implementation
- container = new JavaxWebSocketServerContainer(
+ container = new JakartaWebSocketServerContainer(
WebSocketMapping.ensureMapping(servletContext, WebSocketMapping.DEFAULT_KEY),
WebSocketComponents.ensureWebSocketComponents(servletContext),
coreClientSupplier);
contextHandler.addManaged(container);
contextHandler.addEventListener(container);
}
- // Store a reference to the ServerContainer per - javax.websocket spec 1.0 final - section 6.4: Programmatic Server Deployment
- servletContext.setAttribute(JAVAX_WEBSOCKET_CONTAINER_ATTRIBUTE, container);
+ // Store a reference to the ServerContainer per - jakarta.websocket spec 1.0 final - section 6.4: Programmatic Server Deployment
+ servletContext.setAttribute(JAKARTA_WEBSOCKET_CONTAINER_ATTRIBUTE, container);
return container;
}
private final WebSocketMapping webSocketMapping;
- private final JavaxWebSocketServerFrameHandlerFactory frameHandlerFactory;
+ private final JakartaWebSocketServerFrameHandlerFactory frameHandlerFactory;
private List> deferredEndpointClasses;
private List deferredEndpointConfigs;
/**
- * Main entry point for {@link JavaxWebSocketServletContainerInitializer}.
+ * Main entry point for {@link JakartaWebSocketServletContainerInitializer}.
*
* @param webSocketMapping the {@link WebSocketMapping} that this container belongs to
*/
- public JavaxWebSocketServerContainer(WebSocketMapping webSocketMapping)
+ public JakartaWebSocketServerContainer(WebSocketMapping webSocketMapping)
{
this(webSocketMapping, new WebSocketComponents());
}
- public JavaxWebSocketServerContainer(WebSocketMapping webSocketMapping, WebSocketComponents components)
+ public JakartaWebSocketServerContainer(WebSocketMapping webSocketMapping, WebSocketComponents components)
{
super(components);
this.webSocketMapping = webSocketMapping;
- this.frameHandlerFactory = new JavaxWebSocketServerFrameHandlerFactory(this);
+ this.frameHandlerFactory = new JakartaWebSocketServerFrameHandlerFactory(this);
}
/**
- * Main entry point for {@link JavaxWebSocketServletContainerInitializer}.
+ * Main entry point for {@link JakartaWebSocketServletContainerInitializer}.
*
* @param webSocketMapping the {@link WebSocketMapping} that this container belongs to
* @param components the {@link WebSocketComponents} instance to use
* @param coreClientSupplier the supplier of the {@link WebSocketCoreClient} instance to use
*/
- public JavaxWebSocketServerContainer(WebSocketMapping webSocketMapping, WebSocketComponents components, Function coreClientSupplier)
+ public JakartaWebSocketServerContainer(WebSocketMapping webSocketMapping, WebSocketComponents components, Function coreClientSupplier)
{
super(components, coreClientSupplier);
this.webSocketMapping = webSocketMapping;
- this.frameHandlerFactory = new JavaxWebSocketServerFrameHandlerFactory(this);
+ this.frameHandlerFactory = new JakartaWebSocketServerFrameHandlerFactory(this);
}
@Override
public void lifeCycleStopping(LifeCycle context)
{
ContextHandler contextHandler = (ContextHandler)context;
- JavaxWebSocketServerContainer container = contextHandler.getBean(JavaxWebSocketServerContainer.class);
+ JakartaWebSocketServerContainer container = contextHandler.getBean(JakartaWebSocketServerContainer.class);
if (container == this)
{
contextHandler.removeBean(container);
@@ -154,7 +154,7 @@ public void lifeCycleStopping(LifeCycle context)
}
@Override
- public JavaxWebSocketServerFrameHandlerFactory getFrameHandlerFactory()
+ public JakartaWebSocketServerFrameHandlerFactory getFrameHandlerFactory()
{
return frameHandlerFactory;
}
@@ -228,7 +228,7 @@ private void addEndpointMapping(ServerEndpointConfig config) throws WebSocketExc
{
frameHandlerFactory.getMetadata(config.getEndpointClass(), config);
- JavaxWebSocketCreator creator = new JavaxWebSocketCreator(this, config, getExtensionRegistry());
+ JakartaWebSocketCreator creator = new JakartaWebSocketCreator(this, config, getExtensionRegistry());
PathSpec pathSpec = new UriTemplatePathSpec(config.getPath());
webSocketMapping.addMapping(pathSpec, creator, frameHandlerFactory, defaultCustomizer);
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerFrameHandlerFactory.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerFrameHandlerFactory.java
similarity index 60%
rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerFrameHandlerFactory.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerFrameHandlerFactory.java
index e070107ac44e..48f40d6b75b9 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerFrameHandlerFactory.java
@@ -16,32 +16,31 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.internal;
-
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.server.ServerEndpoint;
+package org.eclipse.jetty.websocket.jakarta.server.internal;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
import org.eclipse.jetty.websocket.core.FrameHandler;
-import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientFrameHandlerFactory;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata;
+import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientFrameHandlerFactory;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketContainer;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerMetadata;
import org.eclipse.jetty.websocket.servlet.FrameHandlerFactory;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
-public class JavaxWebSocketServerFrameHandlerFactory extends JavaxWebSocketClientFrameHandlerFactory implements FrameHandlerFactory
+public class JakartaWebSocketServerFrameHandlerFactory extends JakartaWebSocketClientFrameHandlerFactory implements FrameHandlerFactory
{
- public JavaxWebSocketServerFrameHandlerFactory(JavaxWebSocketContainer container)
+ public JakartaWebSocketServerFrameHandlerFactory(JakartaWebSocketContainer container)
{
super(container, new PathParamIdentifier());
}
@Override
- public JavaxWebSocketFrameHandlerMetadata getMetadata(Class> endpointClass, EndpointConfig endpointConfig)
+ public JakartaWebSocketFrameHandlerMetadata getMetadata(Class> endpointClass, EndpointConfig endpointConfig)
{
- if (javax.websocket.Endpoint.class.isAssignableFrom(endpointClass))
+ if (jakarta.websocket.Endpoint.class.isAssignableFrom(endpointClass))
{
return createEndpointMetadata((Class extends Endpoint>)endpointClass, endpointConfig);
}
@@ -53,14 +52,14 @@ public JavaxWebSocketFrameHandlerMetadata getMetadata(Class> endpointClass, En
}
UriTemplatePathSpec templatePathSpec = new UriTemplatePathSpec(anno.value());
- JavaxWebSocketFrameHandlerMetadata metadata = new JavaxWebSocketFrameHandlerMetadata(endpointConfig);
+ JakartaWebSocketFrameHandlerMetadata metadata = new JakartaWebSocketFrameHandlerMetadata(endpointConfig);
metadata.setUriTemplatePathSpec(templatePathSpec);
- return discoverJavaxFrameHandlerMetadata(endpointClass, metadata);
+ return discoverJakartaFrameHandlerMetadata(endpointClass, metadata);
}
@Override
public FrameHandler newFrameHandler(Object websocketPojo, ServletUpgradeRequest upgradeRequest, ServletUpgradeResponse upgradeResponse)
{
- return newJavaxWebSocketFrameHandler(websocketPojo, new JavaxServerUpgradeRequest(upgradeRequest));
+ return newJakartaWebSocketFrameHandler(websocketPojo, new JakartaServerUpgradeRequest(upgradeRequest));
}
}
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JsrHandshakeRequest.java
similarity index 94%
rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JsrHandshakeRequest.java
index be31158e1f2f..57e0736fe1b8 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JsrHandshakeRequest.java
@@ -16,14 +16,14 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.internal;
+package org.eclipse.jetty.websocket.jakarta.server.internal;
import java.net.URI;
import java.security.Principal;
import java.util.List;
import java.util.Map;
-import javax.websocket.server.HandshakeRequest;
+import jakarta.websocket.server.HandshakeRequest;
import org.eclipse.jetty.http.pathmap.PathSpec;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JsrHandshakeResponse.java
similarity index 93%
rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JsrHandshakeResponse.java
index 8e25272dc36f..5e39ca783177 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JsrHandshakeResponse.java
@@ -16,13 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.internal;
+package org.eclipse.jetty.websocket.jakarta.server.internal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.websocket.HandshakeResponse;
+import jakarta.websocket.HandshakeResponse;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
public class JsrHandshakeResponse implements HandshakeResponse
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/PathParamIdentifier.java
similarity index 89%
rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/PathParamIdentifier.java
index 3b26056b2cc3..72fef23fb620 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/PathParamIdentifier.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.internal;
+package org.eclipse.jetty.websocket.jakarta.server.internal;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
-import javax.websocket.server.PathParam;
+import jakarta.websocket.server.PathParam;
import org.eclipse.jetty.websocket.util.InvokerUtils;
/**
- * Method argument identifier for {@link javax.websocket.server.PathParam} annotations.
+ * Method argument identifier for {@link jakarta.websocket.server.PathParam} annotations.
*/
@SuppressWarnings("unused")
public class PathParamIdentifier implements InvokerUtils.ParamIdentifier
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/PathParamServerEndpointConfig.java
similarity index 82%
rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java
rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/PathParamServerEndpointConfig.java
index 4ae75ecac3fd..a9a17565de94 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/PathParamServerEndpointConfig.java
@@ -16,19 +16,19 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.internal;
+package org.eclipse.jetty.websocket.jakarta.server.internal;
import java.util.HashMap;
import java.util.Map;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
import org.eclipse.jetty.util.URIUtil;
-import org.eclipse.jetty.websocket.javax.common.PathParamProvider;
-import org.eclipse.jetty.websocket.javax.common.ServerEndpointConfigWrapper;
+import org.eclipse.jetty.websocket.jakarta.common.PathParamProvider;
+import org.eclipse.jetty.websocket.jakarta.common.ServerEndpointConfigWrapper;
/**
- * Make {@link javax.websocket.server.PathParam} information from the incoming request available
+ * Make {@link jakarta.websocket.server.PathParam} information from the incoming request available
* on {@link ServerEndpointConfig}
*/
public class PathParamServerEndpointConfig extends ServerEndpointConfigWrapper implements PathParamProvider
diff --git a/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/jakarta.websocket.server.ServerEndpointConfig$Configurator b/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/jakarta.websocket.server.ServerEndpointConfig$Configurator
new file mode 100644
index 000000000000..5aa231d3daf2
--- /dev/null
+++ b/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/jakarta.websocket.server.ServerEndpointConfig$Configurator
@@ -0,0 +1 @@
+org.eclipse.jetty.websocket.jakarta.server.config.ContainerDefaultConfigurator
\ No newline at end of file
diff --git a/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
new file mode 100644
index 000000000000..853f5f7e634a
--- /dev/null
+++ b/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
@@ -0,0 +1 @@
+org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer
\ No newline at end of file
diff --git a/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration b/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration
new file mode 100644
index 000000000000..ca9fc63f1449
--- /dev/null
+++ b/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration
@@ -0,0 +1 @@
+org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketConfiguration
\ No newline at end of file
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserConfigurator.java
similarity index 87%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java
rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserConfigurator.java
index ddccb106bd4e..21362bbf0350 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java
+++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserConfigurator.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.browser;
+package org.eclipse.jetty.websocket.jakarta.server.browser;
import java.util.Collections;
import java.util.List;
-import javax.websocket.Extension;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.Extension;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.server.HandshakeRequest;
+import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.http.QuotedCSV;
public class JsrBrowserConfigurator extends ServerEndpointConfig.Configurator
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserDebugTool.java
similarity index 94%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java
rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserDebugTool.java
index f77b365005e6..ebefec6c483b 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java
+++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserDebugTool.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.browser;
+package org.eclipse.jetty.websocket.jakarta.server.browser;
import java.io.IOException;
import java.net.URISyntaxException;
@@ -33,7 +33,7 @@
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.resource.Resource;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
/**
* Tool to help debug JSR based websocket circumstances reported around browsers.
@@ -98,7 +98,7 @@ private void setupServer(int port) throws URISyntaxException, IOException
holder.setInitParameter("dirAllowed", "true");
server.setHandler(context);
- JavaxWebSocketServletContainerInitializer.configure(context,
+ JakartaWebSocketServletContainerInitializer.configure(context,
(servletContext, container) -> container.addEndpoint(JsrBrowserSocket.class));
LOG.info("{} setup on port {}", this.getClass().getName(), port);
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserSocket.java
similarity index 95%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java
rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserSocket.java
index a083a7332731..4b0484531ea7 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java
+++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserSocket.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.browser;
+package org.eclipse.jetty.websocket.jakarta.server.browser;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -24,14 +24,14 @@
import java.util.Locale;
import java.util.Random;
import java.util.Set;
-import javax.websocket.CloseReason;
-import javax.websocket.OnClose;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.RemoteEndpoint.Async;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.RemoteEndpoint.Async;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
@@ -111,7 +111,7 @@ public void onMessage(String message)
{
case "info":
{
- writeMessage("Using javax.websocket");
+ writeMessage("Using jakarta.websocket");
if (StringUtil.isBlank(userAgent))
{
writeMessage("Client has no User-Agent");
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionConfigurator.java
similarity index 84%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java
rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionConfigurator.java
index 808905039837..abcf5f14e442 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java
+++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionConfigurator.java
@@ -16,12 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.examples;
+package org.eclipse.jetty.websocket.jakarta.server.examples;
import javax.servlet.http.HttpSession;
-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 GetHttpSessionConfigurator extends ServerEndpointConfig.Configurator
{
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionSocket.java
similarity index 84%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java
rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionSocket.java
index 15daea9f5cdf..faa5463e8820 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java
+++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionSocket.java
@@ -16,15 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.examples;
+package org.eclipse.jetty.websocket.jakarta.server.examples;
import java.io.IOException;
import javax.servlet.http.HttpSession;
-import javax.websocket.EndpointConfig;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/example", configurator = GetHttpSessionConfigurator.class)
public class GetHttpSessionSocket
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/MyAuthedConfigurator.java
similarity index 87%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java
rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/MyAuthedConfigurator.java
index d633f2f26be2..6507d01f5866 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java
+++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/MyAuthedConfigurator.java
@@ -16,12 +16,13 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.examples;
+package org.eclipse.jetty.websocket.jakarta.server.examples;
import java.security.Principal;
-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 MyAuthedConfigurator extends ServerEndpointConfig.Configurator
{
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/MyAuthedSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java
rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/MyAuthedSocket.java
index a2b6396d19ee..fcc9288c225d 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java
+++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/MyAuthedSocket.java
@@ -16,10 +16,10 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.examples;
+package org.eclipse.jetty.websocket.jakarta.server.examples;
-import javax.websocket.OnMessage;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/secured/socket", configurator = MyAuthedConfigurator.class)
public class MyAuthedSocket
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/StreamingEchoSocket.java
similarity index 87%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java
rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/StreamingEchoSocket.java
index d5d86e451ec2..a03c5843ae44 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java
+++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/StreamingEchoSocket.java
@@ -16,15 +16,15 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.examples;
+package org.eclipse.jetty.websocket.jakarta.server.examples;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
-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;
import org.eclipse.jetty.util.IO;
@ServerEndpoint("/echo")
diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/WebSocketServerExamplesTest.java
similarity index 91%
rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java
rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/WebSocketServerExamplesTest.java
index 15d177e121cc..310b2bca502f 100644
--- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java
+++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/WebSocketServerExamplesTest.java
@@ -16,22 +16,22 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.server.examples;
+package org.eclipse.jetty.websocket.jakarta.server.examples;
import java.net.URI;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import javax.websocket.ClientEndpoint;
-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 jakarta.websocket.ClientEndpoint;
+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 org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
@@ -45,7 +45,7 @@
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.security.Constraint;
import org.eclipse.jetty.util.security.Credential;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -106,7 +106,7 @@ public static void setup() throws Exception
_context.setSecurityHandler(getSecurityHandler("user", "password", "testRealm"));
_server.setHandler(_context);
- JavaxWebSocketServletContainerInitializer.configure(_context, (context, container) ->
+ JakartaWebSocketServletContainerInitializer.configure(_context, (context, container) ->
{
container.addEndpoint(MyAuthedSocket.class);
container.addEndpoint(StreamingEchoSocket.class);
diff --git a/jetty-websocket/websocket-javax-server/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-jakarta-server/src/test/resources/jetty-logging.properties
similarity index 86%
rename from jetty-websocket/websocket-javax-server/src/test/resources/jetty-logging.properties
rename to jetty-websocket/websocket-jakarta-server/src/test/resources/jetty-logging.properties
index cfafdb369a4a..7048b4c0d850 100644
--- a/jetty-websocket/websocket-javax-server/src/test/resources/jetty-logging.properties
+++ b/jetty-websocket/websocket-jakarta-server/src/test/resources/jetty-logging.properties
@@ -7,4 +7,4 @@ org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
# org.eclipse.jetty.websocket.common.WebSocketSession.LEVEL=DEBUG
### Show state changes on BrowserDebugTool
# -- LEAVE THIS AT DEBUG LEVEL --
-org.eclipse.jetty.websocket.javax.server.browser.LEVEL=DEBUG
+org.eclipse.jetty.websocket.jakarta.server.browser.LEVEL=DEBUG
diff --git a/jetty-websocket/websocket-javax-server/src/test/resources/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-jakarta-server/src/test/resources/jetty-websocket-httpclient.xml
similarity index 100%
rename from jetty-websocket/websocket-javax-server/src/test/resources/jetty-websocket-httpclient.xml
rename to jetty-websocket/websocket-jakarta-server/src/test/resources/jetty-websocket-httpclient.xml
diff --git a/jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/index.html b/jetty-websocket/websocket-jakarta-server/src/test/resources/jsr-browser-debug-tool/index.html
similarity index 100%
rename from jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/index.html
rename to jetty-websocket/websocket-jakarta-server/src/test/resources/jsr-browser-debug-tool/index.html
diff --git a/jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/main.css b/jetty-websocket/websocket-jakarta-server/src/test/resources/jsr-browser-debug-tool/main.css
similarity index 100%
rename from jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/main.css
rename to jetty-websocket/websocket-jakarta-server/src/test/resources/jsr-browser-debug-tool/main.css
diff --git a/jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/websocket.js b/jetty-websocket/websocket-jakarta-server/src/test/resources/jsr-browser-debug-tool/websocket.js
similarity index 100%
rename from jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/websocket.js
rename to jetty-websocket/websocket-jakarta-server/src/test/resources/jsr-browser-debug-tool/websocket.js
diff --git a/jetty-websocket/websocket-javax-tests/fuzzingclient.json b/jetty-websocket/websocket-jakarta-tests/fuzzingclient.json
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/fuzzingclient.json
rename to jetty-websocket/websocket-jakarta-tests/fuzzingclient.json
diff --git a/jetty-websocket/websocket-javax-tests/fuzzingserver.json b/jetty-websocket/websocket-jakarta-tests/fuzzingserver.json
similarity index 100%
rename from jetty-websocket/websocket-javax-tests/fuzzingserver.json
rename to jetty-websocket/websocket-jakarta-tests/fuzzingserver.json
diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-jakarta-tests/pom.xml
similarity index 73%
rename from jetty-websocket/websocket-javax-tests/pom.xml
rename to jetty-websocket/websocket-jakarta-tests/pom.xml
index f7f26a83c423..76e212010973 100644
--- a/jetty-websocket/websocket-javax-tests/pom.xml
+++ b/jetty-websocket/websocket-jakarta-tests/pom.xml
@@ -3,26 +3,26 @@
org.eclipse.jetty.websocketwebsocket-parent
- 10.0.0-SNAPSHOT
+ 11.0.0-SNAPSHOT4.0.0
- websocket-javax-tests
- Jetty :: Websocket :: javax.websocket :: Tests
+ websocket-jakarta-tests
+ Jetty :: Websocket :: jakarta.websocket :: Tests
- ${project.groupId}.javax.tests
+ ${project.groupId}.jakarta.testsorg.eclipse.jetty.websocket
- websocket-javax-client
+ websocket-jakarta-client${project.version}org.eclipse.jetty.websocket
- websocket-javax-server
+ websocket-jakarta-server${project.version}
@@ -32,7 +32,7 @@
org.eclipse.jetty.toolchain
- jetty-javax-websocket-api
+ jetty-jakarta-websocket-apiorg.eclipse.jetty.toolchain
@@ -57,9 +57,9 @@
- javax.websocket Integration Tests
+ jakarta.websocket Integration Tests
- org.eclipse.jetty.websocket.javax.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
+ org.eclipse.jetty.websocket.jakarta.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/BadFrame.java
similarity index 96%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/BadFrame.java
index 4977927474ec..2fe1f39abddc 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/BadFrame.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.OpCode;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/BiConsumerServiceServlet.java
similarity index 96%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/BiConsumerServiceServlet.java
index b215249b0aec..0734f3f8be12 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/BiConsumerServiceServlet.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.io.IOException;
import java.util.function.BiConsumer;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/CompletableFutureMethodHandle.java
similarity index 96%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/CompletableFutureMethodHandle.java
index 3924b2a65528..d0064957da68 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/CompletableFutureMethodHandle.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/CoreServer.java
similarity index 96%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/CoreServer.java
index f9704788735a..f9da059f75b0 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/CoreServer.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.io.IOException;
import java.net.URI;
@@ -38,8 +38,8 @@
import org.eclipse.jetty.websocket.core.server.Negotiation;
import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
-import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameEcho;
-import org.eclipse.jetty.websocket.javax.tests.framehandlers.WholeMessageEcho;
+import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameEcho;
+import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.WholeMessageEcho;
public class CoreServer extends ContainerLifeCycle
{
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/DataUtils.java
similarity index 97%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/DataUtils.java
index 48c01adf8931..89b7e55fdec9 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/DataUtils.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.nio.ByteBuffer;
import java.util.Arrays;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/DummyEndpoint.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/DummyEndpoint.java
index 96d92d56e90c..321a6d27762a 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/DummyEndpoint.java
@@ -16,11 +16,11 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Session;
public class DummyEndpoint extends Endpoint
{
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/EventSocket.java
similarity index 88%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/EventSocket.java
index f65fb4f69440..07846fe78bc8 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/EventSocket.java
@@ -16,22 +16,22 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.CloseReason;
-import javax.websocket.EndpointConfig;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.ClientEndpoint;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.OnClose;
+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.BlockingArrayQueue;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/FunctionMethod.java
similarity index 97%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/FunctionMethod.java
index d6b0bbee06e2..27d039914ea5 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/FunctionMethod.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Fuzzer.java
similarity index 99%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Fuzzer.java
index e2e7366613fc..8d1773a263be 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Fuzzer.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/LocalFuzzer.java
similarity index 99%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/LocalFuzzer.java
index 44053df8719f..f3f098638be4 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/LocalFuzzer.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/LocalServer.java
similarity index 84%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/LocalServer.java
index 89e8ef04481b..739768e9a600 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/LocalServer.java
@@ -16,16 +16,16 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.net.URI;
import java.util.Map;
import java.util.function.BiConsumer;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.websocket.OnMessage;
-import javax.websocket.server.ServerEndpoint;
+import jakarta.websocket.OnMessage;
+import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.http.pathmap.PathSpec;
import org.eclipse.jetty.io.ByteBufferPool;
@@ -48,11 +48,11 @@
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.websocket.core.internal.Parser;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSessionListener;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
-import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer;
-import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerFrameHandlerFactory;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSessionListener;
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
+import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketServerContainer;
+import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketServerFrameHandlerFactory;
import org.eclipse.jetty.websocket.servlet.FrameHandlerFactory;
import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
@@ -174,8 +174,8 @@ protected Handler createRootHandler(Server server) throws Exception
{
servletContextHandler = new ServletContextHandler(server, "/", true, false);
servletContextHandler.setContextPath("/");
- JavaxWebSocketServletContainerInitializer.configure(servletContextHandler, (context, container) ->
- ((JavaxWebSocketServerContainer)container).addSessionListener(trackingListener));
+ JakartaWebSocketServletContainerInitializer.configure(servletContextHandler, (context, container) ->
+ ((JakartaWebSocketServerContainer)container).addSessionListener(trackingListener));
configureServletContextHandler(servletContextHandler);
return servletContextHandler;
}
@@ -263,7 +263,7 @@ public void registerWebSocket(String urlPattern, WebSocketCreator creator)
{
ServletHolder holder = new ServletHolder(new WebSocketServlet()
{
- JavaxWebSocketServerFrameHandlerFactory factory = new JavaxWebSocketServerFrameHandlerFactory(JavaxWebSocketServerContainer.ensureContainer(getServletContext()));
+ JakartaWebSocketServerFrameHandlerFactory factory = new JakartaWebSocketServerFrameHandlerFactory(JakartaWebSocketServerContainer.ensureContainer(getServletContext()));
@Override
public void configure(WebSocketServletFactory factory)
@@ -281,12 +281,12 @@ protected FrameHandlerFactory getFactory()
servletContextHandler.addServlet(holder, urlPattern);
}
- public JavaxWebSocketServerContainer getServerContainer()
+ public JakartaWebSocketServerContainer getServerContainer()
{
if (!servletContextHandler.isRunning())
throw new IllegalStateException("Cannot access ServerContainer when ServletContextHandler isn't running");
- return JavaxWebSocketServerContainer.getContainer(servletContextHandler.getServletContext());
+ return JakartaWebSocketServerContainer.getContainer(servletContextHandler.getServletContext());
}
public Server getServer()
@@ -299,29 +299,29 @@ public TrackingListener getTrackingListener()
return trackingListener;
}
- public static class TrackingListener implements JavaxWebSocketSessionListener
+ public static class TrackingListener implements JakartaWebSocketSessionListener
{
- private BlockingArrayQueue openedSessions = new BlockingArrayQueue<>();
- private BlockingArrayQueue closedSessions = new BlockingArrayQueue<>();
+ private BlockingArrayQueue openedSessions = new BlockingArrayQueue<>();
+ private BlockingArrayQueue closedSessions = new BlockingArrayQueue<>();
@Override
- public void onJavaxWebSocketSessionOpened(JavaxWebSocketSession session)
+ public void onJakartaWebSocketSessionOpened(JakartaWebSocketSession session)
{
openedSessions.offer(session);
}
@Override
- public void onJavaxWebSocketSessionClosed(JavaxWebSocketSession session)
+ public void onJakartaWebSocketSessionClosed(JakartaWebSocketSession session)
{
closedSessions.offer(session);
}
- public BlockingArrayQueue getOpenedSessions()
+ public BlockingArrayQueue getOpenedSessions()
{
return openedSessions;
}
- public BlockingArrayQueue getClosedSessions()
+ public BlockingArrayQueue getClosedSessions()
{
return closedSessions;
}
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/MessageType.java
similarity index 94%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/MessageType.java
index a39b53db179a..9538da57b070 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/MessageType.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
public enum MessageType
{
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/NetworkFuzzer.java
similarity index 99%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/NetworkFuzzer.java
index a82972a61a74..644d5356ea7c 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/NetworkFuzzer.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.io.IOException;
import java.net.URI;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/ParserCapture.java
similarity index 97%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/ParserCapture.java
index 61c261c8aae2..d874e620f0ce 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/ParserCapture.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.nio.ByteBuffer;
import java.util.concurrent.BlockingQueue;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/RawFrameBuilder.java
similarity index 98%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/RawFrameBuilder.java
index b22fb0390ac2..1293d86233f0 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/RawFrameBuilder.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.nio.ByteBuffer;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/SessionMatchers.java
similarity index 68%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/SessionMatchers.java
index 14ad0e426daf..2303578d0854 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/SessionMatchers.java
@@ -16,23 +16,22 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
-import javax.websocket.MessageHandler;
-
-import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
-import org.eclipse.jetty.websocket.javax.tests.matchers.IsMessageHandlerType;
-import org.eclipse.jetty.websocket.javax.tests.matchers.IsMessageHandlerTypeRegistered;
+import jakarta.websocket.MessageHandler;
+import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession;
+import org.eclipse.jetty.websocket.jakarta.tests.matchers.IsMessageHandlerType;
+import org.eclipse.jetty.websocket.jakarta.tests.matchers.IsMessageHandlerTypeRegistered;
import org.hamcrest.Matcher;
public final class SessionMatchers
{
- public static Matcher isMessageHandlerTypeRegistered(MessageType messageType)
+ public static Matcher isMessageHandlerTypeRegistered(MessageType messageType)
{
return IsMessageHandlerTypeRegistered.isMessageHandlerTypeRegistered(messageType);
}
- public static Matcher isMessageHandlerType(JavaxWebSocketSession session, MessageType messageType)
+ public static Matcher isMessageHandlerType(JakartaWebSocketSession session, MessageType messageType)
{
return IsMessageHandlerType.isMessageHandlerType(session, messageType);
}
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Sha1Sum.java
similarity index 98%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Sha1Sum.java
index 4841866690e8..6b24d423f126 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Sha1Sum.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.io.File;
import java.io.IOException;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Timeouts.java
similarity index 95%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Timeouts.java
index dae5eff1799b..cb677cdc3236 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Timeouts.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.util.concurrent.TimeUnit;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/UnitGenerator.java
similarity index 98%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/UnitGenerator.java
index d02b876655cc..0fadd6c31473 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/UnitGenerator.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.nio.ByteBuffer;
import java.util.Arrays;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/UpgradeUtils.java
similarity index 96%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/UpgradeUtils.java
index b60d67a996a5..442a79d9cf2f 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/UpgradeUtils.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.util.Map;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSEndpointTracker.java
similarity index 96%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSEndpointTracker.java
index 72210ab2e3a2..c792a9218fae 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSEndpointTracker.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.nio.ByteBuffer;
import java.util.concurrent.BlockingQueue;
@@ -24,11 +24,11 @@
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import javax.websocket.CloseReason;
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.Endpoint;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Session;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.hamcrest.Matcher;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSEventTracker.java
similarity index 95%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSEventTracker.java
index 3f14ad774451..f10d871e304c 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSEventTracker.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.nio.ByteBuffer;
import java.util.concurrent.BlockingQueue;
@@ -24,13 +24,13 @@
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import javax.websocket.CloseReason;
-import javax.websocket.EndpointConfig;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnError;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.hamcrest.Matcher;
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSServer.java
similarity index 92%
rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java
rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSServer.java
index 0ddcbca31a48..7d0af19d76f0 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java
+++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSServer.java
@@ -16,7 +16,7 @@
// ========================================================================
//
-package org.eclipse.jetty.websocket.javax.tests;
+package org.eclipse.jetty.websocket.jakarta.tests;
import java.io.File;
import java.io.IOException;
@@ -36,16 +36,16 @@
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.resource.PathResource;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration;
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketConfiguration;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
/**
- * Utility to build out exploded directory WebApps, in the /target/tests/ directory, for testing out servers that use javax.websocket endpoints.
+ * Utility to build out exploded directory WebApps, in the /target/tests/ directory, for testing out servers that use jakarta.websocket endpoints.
*
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/javax.websocket/index.html b/tests/test-webapps/test-jetty-webapp/src/main/webapp/jakarta.websocket/index.html
similarity index 98%
rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/javax.websocket/index.html
rename to tests/test-webapps/test-jetty-webapp/src/main/webapp/jakarta.websocket/index.html
index 7172f47e824e..050a0b1e3efc 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/webapp/javax.websocket/index.html
+++ b/tests/test-webapps/test-jetty-webapp/src/main/webapp/jakarta.websocket/index.html
@@ -104,7 +104,7 @@
-This is a demonstration of the Jetty's support for javax.websocket server sockets.
+This is a demonstration of the Jetty's support for jakarta.websocket server sockets.