From e3bbb0f718940b171948ae7d4339bef11850593f Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 1 Aug 2023 11:48:09 +1000
Subject: [PATCH] fix websocket demo for ee8 jetty-12

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../src/main/java/org/example/JakartaWebSocketChat.java         | 2 +-
 .../jetty-ee10-demo-jetty-webapp/src/main/webapp/index.html     | 2 +-
 .../webapp/{java.websocket => jakarta.websocket}/index.html     | 0
 .../src/main/java/org/example/JakartaWebSocketChat.java         | 2 +-
 .../jetty-ee9-demo-jetty-webapp/src/main/webapp/index.html      | 2 +-
 .../main/webapp/{java.websocket => javax.websocket}/index.html  | 0
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/{java.websocket => jakarta.websocket}/index.html (100%)
 rename jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/{java.websocket => javax.websocket}/index.html (100%)

diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/java/org/example/JakartaWebSocketChat.java b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/java/org/example/JakartaWebSocketChat.java
index e6a71bc1497..2d24578dbd3 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/java/org/example/JakartaWebSocketChat.java
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/java/org/example/JakartaWebSocketChat.java
@@ -26,7 +26,7 @@ import jakarta.websocket.RemoteEndpoint;
 import jakarta.websocket.Session;
 import jakarta.websocket.server.ServerEndpoint;
 
-@ServerEndpoint(value = "/java.websocket/", subprotocols = {"chat"})
+@ServerEndpoint(value = "/jakarta.websocket/", subprotocols = {"chat"})
 public class JakartaWebSocketChat
 {
     private static final List<JakartaWebSocketChat> members = new CopyOnWriteArrayList<>();
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/index.html
index 03b131b9537..2fdbd165982 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/index.html
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/index.html
@@ -40,7 +40,7 @@
                  <ul>
                    <li><a href="chat/">Long Polling</a></li>
                    <li><a href="jetty.websocket">WebSocket (Jetty API)</a></li>
-                   <li><a href="java.websocket">WebSocket (jakarta.websocket)</a></li>
+                   <li><a href="jakarta.websocket">WebSocket (jakarta.websocket)</a></li>
                  </ul>
                </li>
              </ul>
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/java.websocket/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/jakarta.websocket/index.html
similarity index 100%
rename from jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/java.websocket/index.html
rename to jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/jakarta.websocket/index.html
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/java/org/example/JakartaWebSocketChat.java b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/java/org/example/JakartaWebSocketChat.java
index e6a71bc1497..10931612f1f 100644
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/java/org/example/JakartaWebSocketChat.java
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/java/org/example/JakartaWebSocketChat.java
@@ -26,7 +26,7 @@ import jakarta.websocket.RemoteEndpoint;
 import jakarta.websocket.Session;
 import jakarta.websocket.server.ServerEndpoint;
 
-@ServerEndpoint(value = "/java.websocket/", subprotocols = {"chat"})
+@ServerEndpoint(value = "/javax.websocket/", subprotocols = {"chat"})
 public class JakartaWebSocketChat
 {
     private static final List<JakartaWebSocketChat> members = new CopyOnWriteArrayList<>();
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/index.html
index 8642e39a234..24f1fba00ba 100644
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/index.html
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/index.html
@@ -40,7 +40,7 @@
                  <ul>
                    <li><a href="chat/">Long Polling</a></li>
                    <li><a href="jetty.websocket">WebSocket (Jetty API)</a></li>
-                   <li><a href="java.websocket">WebSocket (jakarta.websocket)</a></li>
+                   <li><a href="javax.websocket">WebSocket (jakarta.websocket)</a></li>
                  </ul>
                </li>
              </ul>
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/java.websocket/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/javax.websocket/index.html
similarity index 100%
rename from jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/java.websocket/index.html
rename to jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/javax.websocket/index.html