Issue #4568 - remaining renames from outside websocket modules

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java → 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

examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJsrServerTest.java → 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,23 +59,23 @@ 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);
             assertThat("Response", response, is("Hello World"));
         }
         finally
         {
-            LifeCycle.stop(javaxWebSocketClient);
+            LifeCycle.stop(jakartaWebSocketClient);
         }
     }
 

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.

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]
 |=======================================================================

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.*");
 ----

jetty-home/pom.xml

@@ -196,7 +196,7 @@
             </configuration>
           </execution>
           <execution>
-            <id>copy-lib-javax-websocket-deps</id>
+            <id>copy-lib-jakarta-websocket-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -209,7 +209,7 @@
             </configuration>
           </execution>
           <execution>
-            <id>copy-lib-javax-websocket-src-deps</id>
+            <id>copy-lib-jakarta-websocket-src-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>

jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml

@@ -96,7 +96,7 @@
             <Item>org.eclipse.jetty.webapp.JmxConfiguration</Item>
             <Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item>
             <Item>org.eclipse.jetty.websocket.server.config.JettyWebSocketConfiguration</Item>
-            <Item>JavaxWebSocketConfiguration</Item>
+            <Item>org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketConfiguration</Item>
             <Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item>
             <Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item>
           </Array>

jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/SimpleJavaxWebSocket.java → jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/SimpleJakartaWebSocket.java

@@ -32,7 +32,7 @@
 
 @ClientEndpoint(
     subprotocols = {"chat"})
-public class SimpleJavaxWebSocket
+public class SimpleJakartaWebSocket
 {
     private Session session;
     public CountDownLatch messageLatch = new CountDownLatch(1);

jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java → jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJakartaWebSocket.java

@@ -47,7 +47,7 @@
  * Test using websocket in osgi
  */
 @RunWith(PaxExam.class)
-public class TestJettyOSGiBootWithJavaxWebSocket
+public class TestJettyOSGiBootWithJakartaWebSocket
 {
     private static final String LOG_LEVEL = "WARN";
 
@@ -60,7 +60,7 @@ public static Option[] configure()
         ArrayList<Option> options = new ArrayList<>();
         // options.add(TestOSGiUtil.optionalRemoteDebug());
         options.add(CoreOptions.junitBundles());
-        options.addAll(TestOSGiUtil.configureJettyHomeAndPort(false, "jetty-http-boot-with-javax-websocket.xml"));
+        options.addAll(TestOSGiUtil.configureJettyHomeAndPort(false, "jetty-http-boot-with-jakarta-websocket.xml"));
         options.add(CoreOptions.bootDelegationPackages("org.xml.sax", "org.xml.*", "org.w3c.*", "javax.sql.*", "javax.xml.*", "javax.activation.*"));
         options.add(CoreOptions.systemPackages("com.sun.org.apache.xalan.internal.res", "com.sun.org.apache.xml.internal.utils",
             "com.sun.org.apache.xml.internal.utils", "com.sun.org.apache.xpath.internal",
@@ -121,7 +121,7 @@ public void testWebsocket() throws Exception
         WebSocketContainer container = ContainerProvider.getWebSocketContainer();
         assertNotNull(container);
 
-        SimpleJavaxWebSocket socket = new SimpleJavaxWebSocket();
+        SimpleJakartaWebSocket socket = new SimpleJakartaWebSocket();
         URI uri = new URI("ws://127.0.0.1:" + port + "/jakarta.websocket/");
         try (Session session = container.connectToServer(socket, uri))
         {

jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Configuration.java

@@ -30,7 +30,7 @@
  * A {@link WebAppContext} is configured by the application of one or more {@link Configuration}
  * instances.  Typically each implemented Configuration is responsible for an aspect of the
  * servlet specification (eg {@link WebXmlConfiguration}, {@link FragmentConfiguration}, etc.)
- * or feature (eg {@code JavaxWebSocketConfiguration}, {@code JmxConfiguration} etc.)
+ * or feature (eg {@code JakartaWebSocketConfiguration}, {@code JmxConfiguration} etc.)
  * </p>
  * <p>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...)}.

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");
     }
 }

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");
 

tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxWebSocketTest.java → 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;
 

tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java → 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<JavaxWebSocketChat> members = new CopyOnWriteArrayList<>();
+    private static final List<JakartaWebSocketChat> members = new CopyOnWriteArrayList<>();
 
     volatile Session session;
     volatile RemoteEndpoint.Async remote;
@@ -63,10 +63,10 @@ public void onMessage(String data)
             return;
         }
 
-        ListIterator<JavaxWebSocketChat> iter = members.listIterator();
+        ListIterator<JakartaWebSocketChat> iter = members.listIterator();
         while (iter.hasNext())
         {
-            JavaxWebSocketChat member = iter.next();
+            JakartaWebSocketChat member = iter.next();
 
             // Test if member is now disconnected
             if (!member.session.isOpen())