fix websocket demo for ee8 jetty-12

Signed-off-by: Lachlan Roberts <[email protected]>
jetty · Aug 7, 2023 · 466b75c · 466b75c
1 parent 1d52c83
commit 466b75c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/...0-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootWithWebSocket.java b/...0-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootWithWebSocket.java
@@ -86,7 +86,7 @@ public void testWebsocket() throws Exception
         String port = System.getProperty("boot.websocket.port");
         assertNotNull(port);
 
-        URI uri = new URI("ws://127.0.0.1:" + port + "/ee10-demo-jetty/ws/foo");
+        URI uri = new URI("ws://127.0.0.1:" + port + "/ee10-demo-jetty/jetty.websocket/foo");
         WebSocketClient client = new WebSocketClient();
         try
         {

diff --git a/...t-integration/src/test/java/org/eclipse/jetty/ee10/test/websocket/JettyWebSocketTest.java b/...t-integration/src/test/java/org/eclipse/jetty/ee10/test/websocket/JettyWebSocketTest.java
@@ -55,7 +55,7 @@ public static void tearDownServer() throws Exception
     @Test
     public void testChatEndpoint() throws Exception
     {
-        URI uri = WSURI.toWebsocket(server.getServerURI().resolve("/ee10-demo-jetty/ws/foo"));
+        URI uri = WSURI.toWebsocket(server.getServerURI().resolve("/ee10-demo-jetty/jetty.websocket/foo"));
 
         WebSocketClient client = new WebSocketClient();
 

diff --git a/.../src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootWithJakartaWebSocket.java b/.../src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootWithJakartaWebSocket.java
@@ -108,7 +108,7 @@ public void testWebsocket() throws Exception
         Logger log = Logger.getLogger(this.getClass().getName());
 
         SimpleJakartaWebSocket socket = new SimpleJakartaWebSocket();
-        URI uri = new URI("ws://127.0.0.1:" + port + "/ee9-demo-jetty/jakarta.websocket/");
+        URI uri = new URI("ws://127.0.0.1:" + port + "/ee9-demo-jetty/javax.websocket/");
         log.info("Attempting to connect to " + uri);
         try (Session session = container.connectToServer(socket, uri))
         {

diff --git a/...e9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootWithWebSocket.java b/...e9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootWithWebSocket.java
@@ -82,7 +82,7 @@ public void testWebsocket() throws Exception
         String port = System.getProperty("boot.websocket.port");
         assertNotNull(port);
 
-        URI uri = new URI("ws://127.0.0.1:" + port + "/ee9-demo-jetty/ws/foo");
+        URI uri = new URI("ws://127.0.0.1:" + port + "/ee9-demo-jetty/jetty.websocket/foo");
         WebSocketClient client = new WebSocketClient();
         try
         {

diff --git a/...-integration/src/test/java/org/eclipse/jetty/ee9/test/websocket/JakartaWebSocketTest.java b/...-integration/src/test/java/org/eclipse/jetty/ee9/test/websocket/JakartaWebSocketTest.java
@@ -58,7 +58,7 @@ public static void tearDownServer() throws Exception
     @Test
     public void testChatEndpoint() throws Exception
     {
-        URI uri = WSURI.toWebsocket(server.getServerURI().resolve("/ee9-demo-jetty/jakarta.websocket"));
+        URI uri = WSURI.toWebsocket(server.getServerURI().resolve("/ee9-demo-jetty/javax.websocket"));
 
         WebSocketContainer container = ContainerProvider.getWebSocketContainer();
 

diff --git a/...st-integration/src/test/java/org/eclipse/jetty/ee9/test/websocket/JettyWebSocketTest.java b/...st-integration/src/test/java/org/eclipse/jetty/ee9/test/websocket/JettyWebSocketTest.java
@@ -55,7 +55,7 @@ public static void tearDownServer() throws Exception
     @Test
     public void testChatEndpoint() throws Exception
     {
-        URI uri = WSURI.toWebsocket(server.getServerURI().resolve("/ee9-demo-jetty/ws/foo"));
+        URI uri = WSURI.toWebsocket(server.getServerURI().resolve("/ee9-demo-jetty/jetty.websocket/foo"));
 
         WebSocketClient client = new WebSocketClient();