Merge pull request #4441 from eclipse/jetty-10.0.x-3678-WebSocketRename

Issue #3678 - WebSocket rename for jetty-10
jetty · Dec 27, 2019 · 093dc84 · 093dc84
2 parents 0d433f5 + db0edf2
commit 093dc84
Show file tree

Hide file tree

Showing 694 changed files with 125 additions and 127 deletions.
diff --git a/aggregates/jetty-all/pom.xml b/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 -->

diff --git a/aggregates/jetty-websocket-all/pom.xml b/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>

diff --git a/examples/embedded/pom.xml b/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>

diff --git a/jetty-bom/pom.xml b/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>

diff --git a/...entation/src/main/asciidoc/distribution-guide/startup/startup-base-vs-home.adoc b/...entation/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
-36:          {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-server-{VERSION}.jar
+35:          {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-client-{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

diff --git a/...cumentation/src/main/asciidoc/distribution-guide/startup/startup-classpath.adoc b/...cumentation/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
-36:               {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-server-{VERSION}.jar
+35:               {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-client-{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

diff --git a/...mentation/src/main/asciidoc/embedded-guide/server/websockets/jetty/chapter.adoc b/...mentation/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::jetty-websocket-api-events.adoc[]
-include::jetty-websocket-api-session.adoc[]
-include::jetty-websocket-api-send-message.adoc[]
-include::jetty-websocket-api-annotations.adoc[]
-include::jetty-websocket-api-listener.adoc[]
-include::jetty-websocket-api-adapter.adoc[]
-include::jetty-websocket-server-api.adoc[]
-include::jetty-websocket-client-api.adoc[]
+include::websocket-jetty-api.adoc[]
+include::websocket-jetty-api-events.adoc[]
+include::websocket-jetty-api-session.adoc[]
+include::websocket-jetty-api-send-message.adoc[]
+include::websocket-jetty-api-annotations.adoc[]
+include::websocket-jetty-api-listener.adoc[]
+include::websocket-jetty-api-adapter.adoc[]
+include::websocket-jetty-server-api.adoc[]
+include::websocket-jetty-client-api.adoc[]
diff --git a/...sciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-adapter.adoc b/...sciidoc/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.
diff --git a/...doc/embedded-guide/server/websockets/jetty/jetty-websocket-api-annotations.adoc b/...doc/embedded-guide/server/websockets/jetty/jetty-websocket-api-annotations.adoc
@@ -16,15 +16,15 @@
 //  ========================================================================
 //
 
-[[jetty-websocket-api-annotations]]
+[[websocket-jetty-api-annotations]]
 === Using WebSocket Annotations
 
 The most basic form of WebSocket is a marked up POJO with annotations
 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.

diff --git a/...asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-events.adoc b/...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:

diff --git a/...ciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-listener.adoc b/...ciidoc/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.

diff --git a/...oc/embedded-guide/server/websockets/jetty/jetty-websocket-api-send-message.adoc b/...oc/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.

diff --git a/...sciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api-session.adoc b/...sciidoc/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:

diff --git a/...c/main/asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-api.adoc b/...c/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.

diff --git a/...asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-client-api.adoc b/...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.

diff --git a/...asciidoc/embedded-guide/server/websockets/jetty/jetty-websocket-server-api.adoc b/...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,15 +57,15 @@ 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
 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.

diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/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>

diff --git a/jetty-hazelcast/pom.xml b/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>

diff --git a/jetty-home/pom.xml b/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>

diff --git a/jetty-maven-plugin/pom.xml b/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>

diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/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>

diff --git a/...y-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java b/...y-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
@@ -107,9 +107,9 @@ public void assertAllBundlesActiveOrResolved()
     @Test
     public void testWebsocket() throws Exception
     {
-        startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket.common");
-        startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket.client");
-        startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket.server");
+        startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.common");
+        startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.client");
+        startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.server");
         startBundle(bundleContext, "org.eclipse.jetty.tests.webapp");
 
         if (Boolean.getBoolean(TestOSGiUtil.BUNDLE_DEBUG))