diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJakartaServer.java
similarity index 98%
rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java
rename to examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJakartaServer.java
index 6466f9a2ed0b..c94213c66736 100644
--- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java
+++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJakartaServer.java
@@ -30,7 +30,7 @@
/**
* Example of setting up a jakarta.websocket server with Jetty embedded
*/
-public class WebSocketJsrServer
+public class WebSocketJakartaServer
{
/**
* A server socket endpoint
diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJsrServerTest.java b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJakartaServerTest.java
similarity index 88%
rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJsrServerTest.java
rename to examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJakartaServerTest.java
index 2ec78c73d141..442533d334d9 100644
--- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJsrServerTest.java
+++ b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJakartaServerTest.java
@@ -39,14 +39,14 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-public class WebSocketJsrServerTest
+public class WebSocketJakartaServerTest
{
private Server server;
@BeforeEach
public void startServer() throws Exception
{
- server = WebSocketJsrServer.createServer(0);
+ server = WebSocketJakartaServer.createServer(0);
server.start();
}
@@ -59,15 +59,15 @@ public void stopServer() throws Exception
@Test
public void testGetEcho() throws Exception
{
- WebSocketContainer javaxWebSocketClient = ContainerProvider.getWebSocketContainer();
- javaxWebSocketClient.setDefaultMaxSessionIdleTimeout(2000);
+ WebSocketContainer jakartaWebSocketClient = ContainerProvider.getWebSocketContainer();
+ jakartaWebSocketClient.setDefaultMaxSessionIdleTimeout(2000);
try
{
URI wsUri = WSURI.toWebsocket(server.getURI().resolve("/echo"));
TrackingClientEndpoint clientEndpoint = new TrackingClientEndpoint();
- Session session = javaxWebSocketClient.connectToServer(clientEndpoint, null, wsUri);
+ Session session = jakartaWebSocketClient.connectToServer(clientEndpoint, null, wsUri);
session.getBasicRemote().sendText("Hello World");
String response = clientEndpoint.messages.poll(2, SECONDS);
@@ -75,7 +75,7 @@ public void testGetEcho() throws Exception
}
finally
{
- LifeCycle.stop(javaxWebSocketClient);
+ LifeCycle.stop(jakartaWebSocketClient);
}
}
diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc
index 4049372b087c..88e412d272b3 100644
--- a/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc
+++ b/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc
@@ -139,7 +139,7 @@ Here is an example, setting the context attribute in code (although you can also
----
WebAppContext context = new WebAppContext();
context.setAttribute("org.eclipse.jetty.containerInitializerOrder",
- "org.eclipse.jetty.websocket.jakarta.server.JavaxWebSocketServletContainerInitializer, com.acme.Foo.MySCI, *");
+ "org.eclipse.jetty.websocket.jakarta.server.JakartaWebSocketServletContainerInitializer, com.acme.Foo.MySCI, *");
----
In this example, we ensure that the `WebSocketServerContainerInitializer` is the very first `ServletContainerInitializer` that is called, followed by MySCI and then any other `ServletContainerInitializer` instances that were discovered but not yet called.
diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/frameworks/osgi.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/frameworks/osgi.adoc
index 91a680c30b6e..9039b85a4d17 100644
--- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/frameworks/osgi.adoc
+++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/frameworks/osgi.adoc
@@ -1157,6 +1157,6 @@ In addition, as the feature group includes websocket, you will need to download
|=======================================================================
|Jar |Bundle Symbolic Name |Location
|jakarta.websocket-api |jakarta.websocket-api
-|https://repo1.maven.org/maven2/javax/websocket/websocket-api[Maven
+|https://repo1.maven.org/maven2/jakarta/websocket/jakarta.websocket-api/[Maven
central]
|=======================================================================
diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/intro/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/intro/chapter.adoc
index 91b871b8d88c..12d99819ccc0 100644
--- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/intro/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/intro/chapter.adoc
@@ -113,12 +113,12 @@ Disable Websocket for a particular webapp:::
This can be a significant impost if your webapp contains a lot of classes and/or jar files.
To completely disable websockets and avoid all setup costs associated with it for a particular webapp, use instead the context attribute `org.eclipse.jetty.containerInitializerExclusionPattern`, described next, which allows you to exclude the websocket ServletContainerInitializer that causes the scanning.
Completely disable Websocket for a particular webapp:::
- Set the `org.eclipse.jetty.containerInitializerExclusionPattern` link:#context_attributes[context attribute] to include `org.eclipse.jetty.websocket.jakarta.server.JavaxWebSocketServletContainerInitializer`.
+ Set the `org.eclipse.jetty.containerInitializerExclusionPattern` link:#context_attributes[context attribute] to include `org.eclipse.jetty.websocket.jakarta.server.JakartaWebSocketServletContainerInitializer`.
Here's an example of doing this in code, although you can do the link:#intro-jetty-configuration-webapps[same in xml]:
+
[source, java, subs="{sub-order}"]
----
WebAppContext context = new WebAppContext();
context.setAttribute("org.eclipse.jetty.containerInitializerExclusionPattern",
- "org.eclipse.jetty.websocket.jakarta.server.JavaxWebSocketServletContainerInitializer|com.acme.*");
+ "org.eclipse.jetty.websocket.jakarta.server.JakartaWebSocketServletContainerInitializer|com.acme.*");
----
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index 478f43eb1d3a..2e6473a000bd 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -196,7 +196,7 @@
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/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java
index cfd70ab4f12a..8d48fd4eb9e5 100644
--- a/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java
+++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java
@@ -39,7 +39,7 @@ public JakartaWebSocketConfiguration()
addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName());
protectAndExpose("org.eclipse.jetty.websocket.servlet."); // For WebSocketUpgradeFilter
protectAndExpose("org.eclipse.jetty.websocket.jakarta.server.config.");
- protectAndExpose("JakartaWebSocketClientContainerProvider");
+ protectAndExpose("org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainerProvider");
hide("org.eclipse.jetty.websocket.jakarta.server.internal");
}
}
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
index c9da57fff82f..ef90e5feddc8 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
@@ -57,7 +57,7 @@ public static JettyWebSocketServerContainer getContainer(ServletContext servletC
public static JettyWebSocketServerContainer ensureContainer(ServletContext servletContext)
{
- ServletContextHandler contextHandler = ServletContextHandler.getServletContextHandler(servletContext, "Javax Websocket");
+ ServletContextHandler contextHandler = ServletContextHandler.getServletContextHandler(servletContext, "Jakarta Websocket");
if (contextHandler.getServer() == null)
throw new IllegalStateException("Server has not been set on the ServletContextHandler");
diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxWebSocketTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JakartaWebSocketTest.java
similarity index 98%
rename from tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxWebSocketTest.java
rename to tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JakartaWebSocketTest.java
index 68e3fde38efa..65bb42ac9df6 100644
--- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxWebSocketTest.java
+++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JakartaWebSocketTest.java
@@ -34,7 +34,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class JavaxWebSocketTest
+public class JakartaWebSocketTest
{
private static XmlBasedJettyServer server;
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JakartaWebSocketChat.java
similarity index 89%
rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java
rename to tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JakartaWebSocketChat.java
index d3dfb901248d..3c044283547c 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java
+++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JakartaWebSocketChat.java
@@ -32,9 +32,9 @@
import jakarta.websocket.server.ServerEndpoint;
@ServerEndpoint(value = "/jakarta.websocket/", subprotocols = {"chat"})
-public class JavaxWebSocketChat
+public class JakartaWebSocketChat
{
- private static final List