From 466b75cec2b0844b2e3e2fbbf0c41591486544cd Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 7 Aug 2023 11:17:39 +1000 Subject: [PATCH] fix websocket demo for ee8 jetty-12 Signed-off-by: Lachlan Roberts --- .../jetty/ee10/osgi/test/TestJettyOSGiBootWithWebSocket.java | 2 +- .../eclipse/jetty/ee10/test/websocket/JettyWebSocketTest.java | 2 +- .../ee9/osgi/test/TestJettyOSGiBootWithJakartaWebSocket.java | 2 +- .../jetty/ee9/osgi/test/TestJettyOSGiBootWithWebSocket.java | 2 +- .../eclipse/jetty/ee9/test/websocket/JakartaWebSocketTest.java | 2 +- .../eclipse/jetty/ee9/test/websocket/JettyWebSocketTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootWithWebSocket.java b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootWithWebSocket.java index 1460b094bfd..59c6258a3ed 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootWithWebSocket.java +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestJettyOSGiBootWithWebSocket.java @@ -86,7 +86,7 @@ public class TestJettyOSGiBootWithWebSocket 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/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/websocket/JettyWebSocketTest.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/websocket/JettyWebSocketTest.java index 1e978b622bd..deef07e3f6d 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/websocket/JettyWebSocketTest.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/websocket/JettyWebSocketTest.java @@ -55,7 +55,7 @@ public class JettyWebSocketTest @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/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootWithJakartaWebSocket.java b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootWithJakartaWebSocket.java index feae284f509..80f220bec27 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootWithJakartaWebSocket.java +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootWithJakartaWebSocket.java @@ -108,7 +108,7 @@ public class TestJettyOSGiBootWithJakartaWebSocket 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/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootWithWebSocket.java b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootWithWebSocket.java index eade30c6404..49a2731670f 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootWithWebSocket.java +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestJettyOSGiBootWithWebSocket.java @@ -82,7 +82,7 @@ public class TestJettyOSGiBootWithWebSocket 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/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/websocket/JakartaWebSocketTest.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/websocket/JakartaWebSocketTest.java index 7b0c28685b7..a31dafb2ef5 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/websocket/JakartaWebSocketTest.java +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/websocket/JakartaWebSocketTest.java @@ -58,7 +58,7 @@ public class JakartaWebSocketTest @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/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/websocket/JettyWebSocketTest.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/websocket/JettyWebSocketTest.java index b9cdbcde3d2..ddc347c2d7a 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/websocket/JettyWebSocketTest.java +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/websocket/JettyWebSocketTest.java @@ -55,7 +55,7 @@ public class JettyWebSocketTest @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();