Update websocket artifact IDs

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

aggregates/jetty-all/pom.xml

@@ -183,12 +183,12 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-server</artifactId>
+      <artifactId>websocket-javax-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-client</artifactId>
+      <artifactId>websocket-jetty-client</artifactId>
       <version>${project.version}</version>
     </dependency>
     <!-- http/2 support -->

aggregates/jetty-websocket-all/pom.xml

@@ -113,7 +113,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-server</artifactId>
+      <artifactId>websocket-javax-server</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>

examples/embedded/pom.xml

@@ -52,7 +52,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-server</artifactId>
+      <artifactId>websocket-javax-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -62,7 +62,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-server</artifactId>
+      <artifactId>websocket-jetty-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -136,7 +136,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-client</artifactId>
+      <artifactId>websocket-jetty-client</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

jetty-bom/pom.xml

@@ -341,37 +341,37 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>javax-websocket-client</artifactId>
+        <artifactId>websocket-javax-client</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>javax-websocket-server</artifactId>
+        <artifactId>websocket-javax-server</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>javax-websocket-common</artifactId>
+        <artifactId>websocket-javax-common</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>jetty-websocket-api</artifactId>
+        <artifactId>websocket-jetty-api</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>jetty-websocket-client</artifactId>
+        <artifactId>websocket-jetty-client</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>jetty-websocket-common</artifactId>
+        <artifactId>websocket-jetty-common</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>jetty-websocket-server</artifactId>
+        <artifactId>websocket-jetty-server</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>

jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-base-vs-home.adoc

@@ -189,8 +189,8 @@ Note: order presented here is how they would appear on the classpath.
 32:                      1.2 | ${jetty.home}/lib/annotations/javax.annotation-api-1.2.jar
 33:          {VERSION} | ${jetty.home}/lib/jetty-deploy-{VERSION}.jar
 34:                      1.0 | ${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar
-35:          {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-client-{VERSION}.jar
+35:          {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-client-{VERSION}.jar
-36:          {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-server-{VERSION}.jar
+36:          {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-server-{VERSION}.jar
 37:          {VERSION} | ${jetty.home}/lib/websocket/websocket-api-{VERSION}.jar
 38:          {VERSION} | ${jetty.home}/lib/websocket/websocket-client-{VERSION}.jar
 39:          {VERSION} | ${jetty.home}/lib/websocket/websocket-common-{VERSION}.jar

jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-classpath.adoc

@@ -98,8 +98,8 @@ Note: order presented here is how they would appear on the classpath.
 32:                      1.2 | ${jetty.home}/lib/annotations/javax.annotation-api-1.2.jar
 33:               {VERSION} | ${jetty.home}/lib/jetty-deploy-{VERSION}.jar
 34:                      1.0 | ${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar
-35:               {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-client-{VERSION}.jar
+35:               {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-client-{VERSION}.jar
-36:               {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-server-{VERSION}.jar
+36:               {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-server-{VERSION}.jar
 37:               {VERSION} | ${jetty.home}/lib/websocket/websocket-api-{VERSION}.jar
 38:               {VERSION} | ${jetty.home}/lib/websocket/websocket-client-{VERSION}.jar
 39:               {VERSION} | ${jetty.home}/lib/websocket/websocket-common-{VERSION}.jar

jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/chapter.adoc

@@ -21,12 +21,12 @@
 
 These pages are works in progress that have not been moved to their respective sections yet.
 
-include::jetty-websocket-api.adoc[]
+include::websocket-jetty-api.adoc[]
-include::jetty-websocket-api-events.adoc[]
+include::websocket-jetty-api-events.adoc[]
-include::jetty-websocket-api-session.adoc[]
+include::websocket-jetty-api-session.adoc[]
-include::jetty-websocket-api-send-message.adoc[]
+include::websocket-jetty-api-send-message.adoc[]
-include::jetty-websocket-api-annotations.adoc[]
+include::websocket-jetty-api-annotations.adoc[]
-include::jetty-websocket-api-listener.adoc[]
+include::websocket-jetty-api-listener.adoc[]
-include::jetty-websocket-api-adapter.adoc[]
+include::websocket-jetty-api-adapter.adoc[]
-include::jetty-websocket-server-api.adoc[]
+include::websocket-jetty-server-api.adoc[]
-include::jetty-websocket-client-api.adoc[]
+include::websocket-jetty-client-api.adoc[]

jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-adapter.adoc

@@ -16,14 +16,14 @@
 //  ========================================================================
 //
 
-[[jetty-websocket-api-adapter]]
+[[websocket-jetty-api-adapter]]
 === Using the WebSocketAdapter
 
 A basic adapter for managing the Session object on the WebSocketListener.
 
 [source, java, subs="{sub-order}"]
 ----
-include::{SRCDIR}/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AdapterEchoSocket.java[]
+include::{SRCDIR}/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AdapterEchoSocket.java[]
 ----
 
 This is a convenience class to make using the WebSocketListener easier, and provides some useful methods to check the state of the Session.

jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-annotations.adoc

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-[[jetty-websocket-api-annotations]]
+[[websocket-jetty-api-annotations]]
 === Using WebSocket Annotations
 
 The most basic form of WebSocket is a marked up POJO with annotations
@@ -24,7 +24,7 @@ provided by the Jetty WebSocket API.
 
 [source, java, subs="{sub-order}"]
 ----
-include::{SRCDIR}/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AnnotatedEchoSocket.java[]
+include::{SRCDIR}/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/AnnotatedEchoSocket.java[]
 ----
 
 The above example is a simple WebSocket echo endpoint that will echo back any TEXT messages it receives.

jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-events.adoc

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-[[jetty-websocket-api-events]]
+[[websocket-jetty-api-events]]
 === WebSocket Events
 
 Every WebSocket can receive various events:

jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-listener.adoc

@@ -16,14 +16,14 @@
 //  ========================================================================
 //
 
-[[jetty-websocket-api-listener]]
+[[websocket-jetty-api-listener]]
 === Using WebSocketListener
 
 The basic form of a WebSocket using the link:{JDURL}/org/eclipse/jetty/websocket/api/WebSocketListener.html[`org.eclipse.jetty.websocket.api.WebSocketListener`] for incoming events.
 
 [source, java, subs="{sub-order}"]
 ----
-include::{SRCDIR}/jetty-websocket/jetty-websocket-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/ListenerEchoSocket.java[]
+include::{SRCDIR}/jetty-websocket/websocket-jetty-common/src/test/java/org/eclipse/jetty/websocket/common/endpoints/adapters/ListenerEchoSocket.java[]
 ----
 
 This is by far the most basic and best performing (speed and memory wise) WebSocket implementation you can create.

jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-send-message.adoc

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-[[jetty-websocket-api-send-message]]
+[[websocket-jetty-api-send-message]]
 === Send Messages to Remote Endpoint
 
 The most important feature of the Session is access to the link:{JDURL}/org/eclipse/jetty/websocket/api/RemoteEndpoint.html[`org.eclipse.jetty.websocket.api.RemoteEndpoint`] needed to send messages.

jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-session.adoc

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-[[jetty-websocket-api-session]]
+[[websocket-jetty-api-session]]
 === WebSocket Session
 
 The link:{JDURL}/org/eclipse/jetty/websocket/api/Session.html[Session] object can be used to:

jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api.adoc

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-[[jetty-websocket-api]]
+[[websocket-jetty-api]]
 === Jetty WebSocket API Usage
 
 Jetty provides its own more powerful WebSocket API, with a common core API for both server and client use of WebSockets.

jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-client-api.adoc

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-[[jetty-websocket-client-api]]
+[[websocket-jetty-client-api]]
 === Jetty WebSocket Client API
 
 Jetty also provides a Jetty WebSocket Client Library to write make talking to WebSocket servers easier.
@@ -38,14 +38,14 @@ To use the WebSocketClient you will need to hook up a WebSocket object instance
 
 [source, java, subs="{sub-order}"]
 ----
-include::{SRCDIR}/jetty-websocket/jetty-websocket-client/src/test/java/examples/SimpleEchoClient.java[]
+include::{SRCDIR}/jetty-websocket/websocket-jetty-client/src/test/java/examples/SimpleEchoClient.java[]
 ----
 
 The above example connects to a remote WebSocket server and hands off a SimpleEchoSocket to perform the logic on the websocket once connected, waiting for the socket to register that it has closed.
 
 [source, java, subs="{sub-order}"]
 ----
-include::{SRCDIR}/jetty-websocket/jetty-websocket-client/src/test/java/examples/SimpleEchoSocket.java[]
+include::{SRCDIR}/jetty-websocket/websocket-jetty-client/src/test/java/examples/SimpleEchoSocket.java[]
 ----
 
 When the SimpleEchoSocket connects, it sends 2 Text messages and then closes the socket.

jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-server-api.adoc

@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-[[jetty-websocket-server-api]]
+[[websocket-jetty-server-api]]
 === Jetty WebSocket Server API
 
 Jetty provides the ability to wire up WebSocket endpoints to Servlet Path Specs via the use of a `JettyWebSocketServlet` bridge servlet.
@@ -31,7 +31,7 @@ To wire up your WebSocket to a specific path via the `JettyWebSocketServlet`, yo
 
 [source, java, subs="{sub-order}"]
 ----
-include::{SRCDIR}/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java[]
+include::{SRCDIR}/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java[]
 ----
 
 This example will create a Servlet mapped via the http://docs.oracle.com/javaee/6/api/javax/servlet/annotation/WebServlet.html[@WebServlet] annotation to the Servlet path spec of `"/echo"` (or you can do this manually in the `WEB-INF/web.xml` of your web application) which will create MyEchoSocket instances when encountering HTTP Upgrade requests.
@@ -57,7 +57,7 @@ If you have a more complicated creation scenario, you might want to provide your
 
 [source, java, subs="{sub-order}"]
 ----
-include::{SRCDIR}/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java[]
+include::{SRCDIR}/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java[]
 ----
 
 Here we show a `JettyWebSocketCreator` that will utilize the http://tools.ietf.org/html/rfc6455#section-1.9[WebSocket subprotocol] information from request to determine what WebSocket type should be
@@ -65,7 +65,7 @@ created.
 
 [source, java, subs="{sub-order}"]
 ----
-include::{SRCDIR}/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java[]
+include::{SRCDIR}/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java[]
 ----
 
 When you want a custom `JettyWebSocketCreator`, use link:{JDURL}/org/eclipse/jetty/websocket/servlet/JettyWebSocketServletFactory.html#setCreator(org.eclipse.jetty.websocket.servlet.JettyWebSocketCreator)[`JettyWebSocketServletFactory.setCreator(JettyWebSocketCreator creator)`] and the `JettyWebSocketServletFactory` will use your creator for all incoming Upgrade requests on this servlet.

jetty-gcloud/jetty-gcloud-session-manager/pom.xml

@@ -71,7 +71,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-server</artifactId>
+      <artifactId>websocket-jetty-server</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

jetty-hazelcast/pom.xml

@@ -58,7 +58,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-server</artifactId>
+      <artifactId>websocket-jetty-server</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

jetty-home/pom.xml

@@ -636,12 +636,12 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-server</artifactId>
+      <artifactId>websocket-jetty-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-server</artifactId>
+      <artifactId>websocket-javax-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

jetty-maven-plugin/pom.xml

@@ -218,12 +218,12 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-server</artifactId>
+      <artifactId>websocket-javax-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-server</artifactId>
+      <artifactId>websocket-jetty-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

jetty-osgi/test-jetty-osgi/pom.xml

@@ -280,25 +280,25 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-api</artifactId>
+      <artifactId>websocket-jetty-api</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-common</artifactId>
+      <artifactId>websocket-jetty-common</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-client</artifactId>
+      <artifactId>websocket-jetty-client</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-client</artifactId>
+      <artifactId>websocket-javax-client</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
@@ -310,7 +310,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-server</artifactId>
+      <artifactId>websocket-jetty-server</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
@@ -321,7 +321,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-server</artifactId>
+      <artifactId>websocket-javax-server</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>

jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java

@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -148,15 +147,15 @@ public class TestOSGiUtil
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-plus").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-annotations").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core").versionAsInProject().start());
-        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-api").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-api").versionAsInProject().start());
-        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-common").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-common").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-servlet").versionAsInProject().start());
-        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-server").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-server").versionAsInProject().start());
-        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-client").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-client").versionAsInProject().start());
 
-        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("javax-websocket-common").versionAsInProject().noStart());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-javax-common").versionAsInProject().noStart());
-        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("javax-websocket-client").versionAsInProject().noStart());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-javax-client").versionAsInProject().noStart());
-        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("javax-websocket-server").versionAsInProject().noStart());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-javax-server").versionAsInProject().noStart());
         res.add(mavenBundle().groupId("org.eclipse.jetty.toolchain").artifactId("jetty-javax-websocket-api").versionAsInProject().noStart());
         res.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("jetty-osgi-boot").versionAsInProject().start());
         return res;

jetty-runner/pom.xml

@@ -113,7 +113,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-server</artifactId>
+      <artifactId>websocket-jetty-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

jetty-websocket/websocket-core/pom.xml

@@ -71,7 +71,7 @@
               <rules>
                 <bannedDependencies>
                   <includes>
-                    <include>org.eclipse.jetty.websocket:jetty-websocket-api</include>
+                    <include>org.eclipse.jetty.websocket:websocket-jetty-api</include>
                     <include>javax.websocket</include>
                   </includes>
                 </bannedDependencies>

jetty-websocket/websocket-javax-client/pom.xml

@@ -7,8 +7,8 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>javax-websocket-client</artifactId>
+  <artifactId>websocket-javax-client</artifactId>
-  <name>Jetty :: Websocket :: javax.websocket :: Client Implementation</name>
+  <name>Jetty :: Websocket :: javax.websocket :: Client</name>
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.javax.client</bundle-symbolic-name>
@@ -17,7 +17,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-common</artifactId>
+      <artifactId>websocket-javax-common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

jetty-websocket/websocket-javax-common/pom.xml

@@ -7,8 +7,8 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>javax-websocket-common</artifactId>
+  <artifactId>websocket-javax-common</artifactId>
-  <name>Jetty :: Websocket :: javax.websocket :: Common Impl</name>
+  <name>Jetty :: Websocket :: javax.websocket :: Common</name>
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.javax.common</bundle-symbolic-name>

jetty-websocket/websocket-javax-server/pom.xml

@@ -7,8 +7,8 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>javax-websocket-server</artifactId>
+  <artifactId>websocket-javax-server</artifactId>
-  <name>Jetty :: Websocket :: javax.websocket.server :: Server Implementation</name>
+  <name>Jetty :: Websocket :: javax.websocket :: Server</name>
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.javax.server</bundle-symbolic-name>
@@ -17,7 +17,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-client</artifactId>
+      <artifactId>websocket-javax-client</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

jetty-websocket/websocket-javax-tests/pom.xml

@@ -7,8 +7,8 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>javax-websocket-tests</artifactId>
+  <artifactId>websocket-javax-tests</artifactId>
-  <name>Jetty :: Websocket :: javax.websocket :: Integration Tests</name>
+  <name>Jetty :: Websocket :: javax.websocket :: Tests</name>
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.javax.tests</bundle-symbolic-name>
@@ -17,12 +17,12 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-client</artifactId>
+      <artifactId>websocket-javax-client</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-server</artifactId>
+      <artifactId>websocket-javax-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnClient.java

@@ -59,8 +59,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  * Running Autobahn Fuzzing Server (which you run this client implementation against):
  * </p>
  * <pre>
- *     # Change to javax-websocket-tests directory first.
+ *     # Change to websocket-javax-tests directory first.
- *     $ cd jetty-websocket/javax-websocket-tests/
+ *     $ cd jetty-websocket/websocket-javax-tests/
  *     $ wstest --mode=fuzzingserver --spec=fuzzingserver.json
  *
  *     # Report output is configured (in the fuzzingserver.json) at location:

jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnServer.java

@@ -49,8 +49,8 @@ import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletCont
  * Running Autobahn Fuzzing Client (against this server implementation):
  * </p>
  * <pre>
- *     # Change to javax-websocket-tests directory first.
+ *     # Change to websocket-javax-tests directory first.
- *     $ cd jetty-websocket/javax-websocket-tests/
+ *     $ cd jetty-websocket/websocket-javax-tests/
  *     $ wstest --mode=fuzzingclient --spec=fuzzingclient.json
  *
  *     # Report output is configured (in the fuzzingclient.json) at location:

jetty-websocket/websocket-jetty-api/pom.xml

@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>jetty-websocket-api</artifactId>
+  <artifactId>websocket-jetty-api</artifactId>
   <name>Jetty :: Websocket :: org.eclipse.jetty.websocket :: API</name>
 
   <properties>

jetty-websocket/websocket-jetty-client/pom.xml

@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>jetty-websocket-client</artifactId>
+  <artifactId>websocket-jetty-client</artifactId>
   <name>Jetty :: Websocket :: org.eclipse.jetty.websocket :: Client</name>
 
   <properties>
@@ -17,12 +17,12 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-api</artifactId>
+      <artifactId>websocket-jetty-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-common</artifactId>
+      <artifactId>websocket-jetty-common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

jetty-websocket/websocket-jetty-common/pom.xml

@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>jetty-websocket-common</artifactId>
+  <artifactId>websocket-jetty-common</artifactId>
   <name>Jetty :: Websocket :: org.eclipse.jetty.websocket :: Common</name>
 
   <properties>
@@ -48,7 +48,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-api</artifactId>
+      <artifactId>websocket-jetty-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

jetty-websocket/websocket-jetty-server/pom.xml

@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>jetty-websocket-server</artifactId>
+  <artifactId>websocket-jetty-server</artifactId>
   <name>Jetty :: Websocket :: org.eclipse.jetty.websocket :: Server</name>
 
   <properties>
@@ -38,12 +38,12 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-api</artifactId>
+      <artifactId>websocket-jetty-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-common</artifactId>
+      <artifactId>websocket-jetty-common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

jetty-websocket/websocket-jetty-tests/pom.xml

@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>jetty-websocket-tests</artifactId>
+  <artifactId>websocket-jetty-tests</artifactId>
   <name>Jetty :: Websocket :: org.eclipse.jetty.websocket :: Tests</name>
 
   <properties>
@@ -17,19 +17,19 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-api</artifactId>
+      <artifactId>websocket-jetty-api</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-client</artifactId>
+      <artifactId>websocket-jetty-client</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-server</artifactId>
+      <artifactId>websocket-jetty-server</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnClient.java

@@ -65,8 +65,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  * Running Autobahn Fuzzing Server (which you run this client implementation against):
  * </p>
  * <pre>
- *     # Change to jetty-websocket-tests directory first.
+ *     # Change to websocket-jetty-tests directory first.
- *     $ cd jetty-websocket/jetty-websocket-tests/
+ *     $ cd jetty-websocket/websocket-jetty-tests/
  *     $ wstest --mode=fuzzingserver --spec=fuzzingserver.json
  *
  *     # Report output is configured (in the fuzzingserver.json) at location:

jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/autobahn/JettyAutobahnServer.java

@@ -49,8 +49,8 @@ import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerI
  * Running Autobahn Fuzzing Client (against this server implementation):
  * </p>
  * <pre>
- *     # Change to jetty-websocket-tests directory first.
+ *     # Change to websocket-jetty-tests directory first.
- *     $ cd jetty-websocket/jetty-websocket-tests/
+ *     $ cd jetty-websocket/websocket-jetty-tests/
  *     $ wstest --mode=fuzzingclient --spec=fuzzingclient.json
  *
  *     # Report output is configured (in the fuzzingclient.json) at location:

jetty-websocket/websocket-servlet/pom.xml

@@ -32,7 +32,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-api</artifactId>
+      <artifactId>websocket-jetty-api</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
@@ -65,7 +65,7 @@
               <rules>
                 <bannedDependencies>
                   <includes>
-                    <include>org.eclipse.jetty.websocket:jetty-websocket-api</include>
+                    <include>org.eclipse.jetty.websocket:websocket-jetty-api</include>
                     <include>javax.websocket</include>
                   </includes>
                 </bannedDependencies>

tests/test-integration/pom.xml

@@ -134,19 +134,19 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-server</artifactId>
+      <artifactId>websocket-jetty-server</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-client</artifactId>
+      <artifactId>websocket-jetty-client</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-server</artifactId>
+      <artifactId>websocket-javax-server</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

tests/test-quickstart/pom.xml

@@ -80,12 +80,12 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-server</artifactId>
+      <artifactId>websocket-javax-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-server</artifactId>
+      <artifactId>websocket-jetty-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

tests/test-webapps/test-jetty-webapp/pom.xml

@@ -199,19 +199,19 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-api</artifactId>
+      <artifactId>websocket-jetty-api</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>jetty-websocket-server</artifactId>
+      <artifactId>websocket-jetty-server</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>javax-websocket-server</artifactId>
+      <artifactId>websocket-javax-server</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>