diff --git a/jetty-ee10/jetty-ee10-annotations/src/test/java/org/eclipse/jetty/ee10/annotations/TestAnnotationIntrospector.java b/jetty-ee10/jetty-ee10-annotations/src/test/java/org/eclipse/jetty/ee10/annotations/TestAnnotationIntrospector.java index ca145c52b84..1910d8c7737 100644 --- a/jetty-ee10/jetty-ee10-annotations/src/test/java/org/eclipse/jetty/ee10/annotations/TestAnnotationIntrospector.java +++ b/jetty-ee10/jetty-ee10-annotations/src/test/java/org/eclipse/jetty/ee10/annotations/TestAnnotationIntrospector.java @@ -51,8 +51,8 @@ public class TestAnnotationIntrospector holder.setHeldClass(ServletE.class); assertTrue(introspector.isIntrospectable(new ServletE(), holder)); - //a JAVAX API sourced servlet can be introspected - holder = new ServletHolder(Source.JAVAX_API); + //a JAKARTA API sourced servlet can be introspected + holder = new ServletHolder(Source.JAKARTA_API); holder.setHeldClass(ServletE.class); assertTrue(introspector.isIntrospectable(new ServletE(), holder)); diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java index d1b43108293..74cfb6c89c7 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java @@ -2141,7 +2141,7 @@ public class ServletContextHandler extends ContextHandler if (holder == null) { //new filter - holder = handler.newFilterHolder(Source.JAVAX_API); + holder = handler.newFilterHolder(Source.JAKARTA_API); holder.setName(filterName); holder.setHeldClass(filterClass); handler.addFilter(holder); @@ -2170,7 +2170,7 @@ public class ServletContextHandler extends ContextHandler if (holder == null) { //new filter - holder = handler.newFilterHolder(Source.JAVAX_API); + holder = handler.newFilterHolder(Source.JAKARTA_API); holder.setName(filterName); holder.setClassName(className); handler.addFilter(holder); @@ -2199,7 +2199,7 @@ public class ServletContextHandler extends ContextHandler if (holder == null) { //new filter - holder = handler.newFilterHolder(Source.JAVAX_API); + holder = handler.newFilterHolder(Source.JAKARTA_API); holder.setName(filterName); holder.setFilter(filter); handler.addFilter(holder); @@ -2229,7 +2229,7 @@ public class ServletContextHandler extends ContextHandler if (holder == null) { //new servlet - holder = handler.newServletHolder(Source.JAVAX_API); + holder = handler.newServletHolder(Source.JAKARTA_API); holder.setName(servletName); holder.setHeldClass(servletClass); handler.addServlet(holder); @@ -2259,7 +2259,7 @@ public class ServletContextHandler extends ContextHandler if (holder == null) { //new servlet - holder = handler.newServletHolder(Source.JAVAX_API); + holder = handler.newServletHolder(Source.JAKARTA_API); holder.setName(servletName); holder.setClassName(className); handler.addServlet(holder); @@ -2288,7 +2288,7 @@ public class ServletContextHandler extends ContextHandler ServletHolder holder = handler.getServlet(servletName); if (holder == null) { - holder = handler.newServletHolder(Source.JAVAX_API); + holder = handler.newServletHolder(Source.JAKARTA_API); holder.setName(servletName); holder.setServlet(servlet); handler.addServlet(holder); @@ -2315,7 +2315,7 @@ public class ServletContextHandler extends ContextHandler if (holder == null) { //new servlet - holder = handler.newServletHolder(Source.JAVAX_API); + holder = handler.newServletHolder(Source.JAKARTA_API); holder.setName(servletName); holder.setForcedPath(jspFile); handler.addServlet(holder); @@ -2600,7 +2600,7 @@ public class ServletContextHandler extends ContextHandler checkListener(t.getClass()); - ListenerHolder holder = getServletHandler().newListenerHolder(Source.JAVAX_API); + ListenerHolder holder = getServletHandler().newListenerHolder(Source.JAKARTA_API); holder.setListener(t); addProgrammaticListener(t); getServletHandler().addListener(holder); diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java index 15b400d2f83..30424a8f105 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java @@ -1070,7 +1070,7 @@ public class ServletHandler extends Handler.Wrapper if (_filterMappings.isEmpty()) { _filterMappings.add(mapping); - if (source == Source.JAVAX_API) + if (source == Source.JAKARTA_API) _matchAfterIndex = 0; } else @@ -1078,7 +1078,7 @@ public class ServletHandler extends Handler.Wrapper //there are existing entries. If this is a programmatic filtermapping, it is added at the end of the list. //If this is a normal filtermapping, it is inserted after all the other filtermappings (matchBefores and normals), //but before the first matchAfter filtermapping. - if (Source.JAVAX_API == source) + if (Source.JAKARTA_API == source) { _filterMappings.add(mapping); if (_matchAfterIndex < 0) @@ -1116,12 +1116,12 @@ public class ServletHandler extends Handler.Wrapper if (_filterMappings.isEmpty()) { _filterMappings.add(mapping); - if (Source.JAVAX_API == source) + if (Source.JAKARTA_API == source) _matchBeforeIndex = 0; } else { - if (Source.JAVAX_API == source) + if (Source.JAKARTA_API == source) { //programmatically defined filter mappings are prepended to mapping list in the order //in which they were defined. In other words, insert this mapping at the tail of the diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHolder.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHolder.java index a290c7d8d8b..e694251bccf 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHolder.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHolder.java @@ -943,7 +943,7 @@ public class ServletHolder extends Holder implements Comparable reg.setInitParameter(null, "foo")); diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientClassLoaderTest.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientClassLoaderTest.java index 8ea9733a0dc..14d13d6a853 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientClassLoaderTest.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/JakartaClientClassLoaderTest.java @@ -136,13 +136,13 @@ public class JakartaClientClassLoaderTest { WSServer.WebApp app = server.createWebApp(contextName); - // Exclude the Javax WebSocket configuration from the webapp (so we use versions from the webapp). + // Exclude the Jakarta WebSocket configuration from the webapp (so we use versions from the webapp). Configuration[] configurations = Configurations.getKnown().stream() .filter(configuration -> !(configuration instanceof JakartaWebSocketConfiguration)) .toArray(Configuration[]::new); app.getWebAppContext().setConfigurations(configurations); - // Copy over the individual jars required for Javax WebSocket. + // Copy over the individual jars required for Jakarta WebSocket. app.createWebInf(); app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee10-websocket-jakarta-client.jar"); app.copyLib(JakartaWebSocketContainer.class, "jetty-ee10-websocket-jakarta-common.jar"); @@ -197,7 +197,7 @@ public class JakartaClientClassLoaderTest app1.copyClass(EchoSocket.class); app1.deploy(); - // Do not exclude JavaxWebSocketConfiguration for this webapp (we need the websocket server classes). + // Do not exclude JakartaWebSocketConfiguration for this webapp (we need the websocket server classes). WSServer.WebApp app2 = server.createWebApp("echo"); app2.createWebInf(); app2.copyClass(EchoSocket.class); diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/JettyClientClassLoaderTest.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/JettyClientClassLoaderTest.java index 2b4cd4e104b..3e493d91b05 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/JettyClientClassLoaderTest.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/JettyClientClassLoaderTest.java @@ -161,7 +161,7 @@ public class JettyClientClassLoaderTest { WebAppTester.WebApp app = webAppTester.createWebApp(contextName); - // Copy over the individual jars required for Javax WebSocket. + // Copy over the individual jars required for Jetty WebSocket. app.createWebInf(); app.copyLib(Configurable.class, "jetty-websocket-jetty-api.jar"); app.copyLib(WebSocketClient.class, "jetty-websocket-jetty-client.jar"); diff --git a/jetty-ee9/jetty-ee9-annotations/src/test/java/org/eclipse/jetty/ee9/annotations/TestAnnotationIntrospector.java b/jetty-ee9/jetty-ee9-annotations/src/test/java/org/eclipse/jetty/ee9/annotations/TestAnnotationIntrospector.java index 4b40faec328..e491cddce84 100644 --- a/jetty-ee9/jetty-ee9-annotations/src/test/java/org/eclipse/jetty/ee9/annotations/TestAnnotationIntrospector.java +++ b/jetty-ee9/jetty-ee9-annotations/src/test/java/org/eclipse/jetty/ee9/annotations/TestAnnotationIntrospector.java @@ -51,8 +51,8 @@ public class TestAnnotationIntrospector holder.setHeldClass(ServletE.class); assertTrue(introspector.isIntrospectable(new ServletE(), holder)); - //a JAVAX API sourced servlet can be introspected - holder = new ServletHolder(Source.JAVAX_API); + //a JAKARTA API sourced servlet can be introspected + holder = new ServletHolder(Source.JAKARTA_API); holder.setHeldClass(ServletE.class); assertTrue(introspector.isIntrospectable(new ServletE(), holder)); diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletContextHandler.java b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletContextHandler.java index cac45961c52..416ecb0b240 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletContextHandler.java +++ b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletContextHandler.java @@ -1050,7 +1050,7 @@ public class ServletContextHandler extends ContextHandler if (holder == null) { //new filter - holder = handler.newFilterHolder(Source.JAVAX_API); + holder = handler.newFilterHolder(Source.JAKARTA_API); holder.setName(filterName); holder.setHeldClass(filterClass); handler.addFilter(holder); @@ -1079,7 +1079,7 @@ public class ServletContextHandler extends ContextHandler if (holder == null) { //new filter - holder = handler.newFilterHolder(Source.JAVAX_API); + holder = handler.newFilterHolder(Source.JAKARTA_API); holder.setName(filterName); holder.setClassName(className); handler.addFilter(holder); @@ -1108,7 +1108,7 @@ public class ServletContextHandler extends ContextHandler if (holder == null) { //new filter - holder = handler.newFilterHolder(Source.JAVAX_API); + holder = handler.newFilterHolder(Source.JAKARTA_API); holder.setName(filterName); holder.setFilter(filter); handler.addFilter(holder); @@ -1138,7 +1138,7 @@ public class ServletContextHandler extends ContextHandler if (holder == null) { //new servlet - holder = handler.newServletHolder(Source.JAVAX_API); + holder = handler.newServletHolder(Source.JAKARTA_API); holder.setName(servletName); holder.setHeldClass(servletClass); handler.addServlet(holder); @@ -1168,7 +1168,7 @@ public class ServletContextHandler extends ContextHandler if (holder == null) { //new servlet - holder = handler.newServletHolder(Source.JAVAX_API); + holder = handler.newServletHolder(Source.JAKARTA_API); holder.setName(servletName); holder.setClassName(className); handler.addServlet(holder); @@ -1197,7 +1197,7 @@ public class ServletContextHandler extends ContextHandler ServletHolder holder = handler.getServlet(servletName); if (holder == null) { - holder = handler.newServletHolder(Source.JAVAX_API); + holder = handler.newServletHolder(Source.JAKARTA_API); holder.setName(servletName); holder.setServlet(servlet); handler.addServlet(holder); @@ -1224,7 +1224,7 @@ public class ServletContextHandler extends ContextHandler if (holder == null) { //new servlet - holder = handler.newServletHolder(Source.JAVAX_API); + holder = handler.newServletHolder(Source.JAKARTA_API); holder.setName(servletName); holder.setForcedPath(jspFile); handler.addServlet(holder); @@ -1488,7 +1488,7 @@ public class ServletContextHandler extends ContextHandler checkListener(t.getClass()); - ListenerHolder holder = getServletHandler().newListenerHolder(Source.JAVAX_API); + ListenerHolder holder = getServletHandler().newListenerHolder(Source.JAKARTA_API); holder.setListener(t); addProgrammaticListener(t); getServletHandler().addListener(holder); diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHandler.java b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHandler.java index c192fce8108..f5a2a908d33 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHandler.java +++ b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHandler.java @@ -1147,7 +1147,7 @@ public class ServletHandler extends ScopedHandler if (_filterMappings.isEmpty()) { _filterMappings.add(mapping); - if (source == Source.JAVAX_API) + if (source == Source.JAKARTA_API) _matchAfterIndex = 0; } else @@ -1155,7 +1155,7 @@ public class ServletHandler extends ScopedHandler //there are existing entries. If this is a programmatic filtermapping, it is added at the end of the list. //If this is a normal filtermapping, it is inserted after all the other filtermappings (matchBefores and normals), //but before the first matchAfter filtermapping. - if (Source.JAVAX_API == source) + if (Source.JAKARTA_API == source) { _filterMappings.add(mapping); if (_matchAfterIndex < 0) @@ -1193,12 +1193,12 @@ public class ServletHandler extends ScopedHandler if (_filterMappings.isEmpty()) { _filterMappings.add(mapping); - if (Source.JAVAX_API == source) + if (Source.JAKARTA_API == source) _matchBeforeIndex = 0; } else { - if (Source.JAVAX_API == source) + if (Source.JAKARTA_API == source) { //programmatically defined filter mappings are prepended to mapping list in the order //in which they were defined. In other words, insert this mapping at the tail of the diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHolder.java b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHolder.java index b683d4e4bf7..c4c466f959b 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHolder.java +++ b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHolder.java @@ -972,7 +972,7 @@ public class ServletHolder extends Holder implements UserIdentityScope, return clash; //otherwise apply all of them - ServletMapping mapping = new ServletMapping(Source.JAVAX_API); + ServletMapping mapping = new ServletMapping(Source.JAKARTA_API); mapping.setServletName(ServletHolder.this.getName()); mapping.setPathSpecs(urlPatterns); getServletHandler().addServletMapping(mapping); diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/Source.java b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/Source.java index 40e037acc1f..b0c22f160e5 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/Source.java +++ b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/Source.java @@ -25,7 +25,7 @@ import org.eclipse.jetty.util.resource.Resource; public class Source { public static final Source EMBEDDED = new Source(Origin.EMBEDDED); - public static final Source JAVAX_API = new Source(Origin.JAKARTA_API); + public static final Source JAKARTA_API = new Source(Origin.JAKARTA_API); public enum Origin { diff --git a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletHandlerTest.java b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletHandlerTest.java index 9772c1bd386..a536fb0db0d 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletHandlerTest.java +++ b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletHandlerTest.java @@ -55,13 +55,13 @@ public class ServletHandlerTest FilterHolder fh2 = new FilterHolder(new Source(Source.Origin.DESCRIPTOR, "foo.xml")); FilterMapping fm2 = new FilterMapping(); - FilterHolder fh3 = new FilterHolder(Source.JAVAX_API); + FilterHolder fh3 = new FilterHolder(Source.JAKARTA_API); FilterMapping fm3 = new FilterMapping(); - FilterHolder fh4 = new FilterHolder(Source.JAVAX_API); + FilterHolder fh4 = new FilterHolder(Source.JAKARTA_API); FilterMapping fm4 = new FilterMapping(); - FilterHolder fh5 = new FilterHolder(Source.JAVAX_API); + FilterHolder fh5 = new FilterHolder(Source.JAKARTA_API); FilterMapping fm5 = new FilterMapping(); ServletHolder sh1 = new ServletHolder(new Source(Source.Origin.DESCRIPTOR, "foo.xml")); @@ -538,7 +538,7 @@ public class ServletHandlerTest assertThat(mappings[4], is(fm3)); //isMatchAfter = true; //add a programmatic one, isMatchAfter=true - FilterHolder pf = new FilterHolder(Source.JAVAX_API); + FilterHolder pf = new FilterHolder(Source.JAKARTA_API); pf.setName("programmaticA"); FilterMapping pfm = new FilterMapping(); pfm.setFilterHolder(pf); @@ -556,7 +556,7 @@ public class ServletHandlerTest assertThat(mappings[5], is(pfm)); //isMatchAfter = true; //add a programmatic one, isMatchAfter=false - FilterHolder pf2 = new FilterHolder(Source.JAVAX_API); + FilterHolder pf2 = new FilterHolder(Source.JAKARTA_API); pf2.setName("programmaticB"); FilterMapping pfm2 = new FilterMapping(); pfm2.setFilterHolder(pf2); @@ -638,7 +638,7 @@ public class ServletHandlerTest assertThat(mappings[4].getFilterHolder(), is(fh3)); //isMatchAfter = true; //add a programmatic one, isMatchAfter=true - FilterHolder pf = new FilterHolder(Source.JAVAX_API); + FilterHolder pf = new FilterHolder(Source.JAKARTA_API); pf.setServletHandler(handler); pf.setName("programmaticA"); handler.addFilter(pf); @@ -655,7 +655,7 @@ public class ServletHandlerTest assertThat(mappings[5].getFilterHolder(), is(pf)); //isMatchAfter = true; //add a programmatic one, isMatchAfter=false - FilterHolder pf2 = new FilterHolder(Source.JAVAX_API); + FilterHolder pf2 = new FilterHolder(Source.JAKARTA_API); pf2.setServletHandler(handler); pf2.setName("programmaticB"); handler.addFilter(pf2); diff --git a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletHolderTest.java b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletHolderTest.java index 8263f7ec9cb..132715aec3c 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletHolderTest.java +++ b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletHolderTest.java @@ -44,7 +44,7 @@ public class ServletHolderTest @Test public void testInitParams() throws Exception { - ServletHolder holder = new ServletHolder(Source.JAVAX_API); + ServletHolder holder = new ServletHolder(Source.JAKARTA_API); ServletRegistration reg = holder.getRegistration(); assertThrows(IllegalArgumentException.class, () -> reg.setInitParameter(null, "foo")); diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientClassLoaderTest.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientClassLoaderTest.java index be5708d6341..ccc71df660e 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientClassLoaderTest.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/JakartaClientClassLoaderTest.java @@ -136,13 +136,13 @@ public class JakartaClientClassLoaderTest { WSServer.WebApp app = server.createWebApp(contextName); - // Exclude the Javax WebSocket configuration from the webapp (so we use versions from the webapp). + // Exclude the Jakarta WebSocket configuration from the webapp (so we use versions from the webapp). Configuration[] configurations = Configurations.getKnown().stream() .filter(configuration -> !(configuration instanceof JakartaWebSocketConfiguration)) .toArray(Configuration[]::new); app.getWebAppContext().setConfigurations(configurations); - // Copy over the individual jars required for Javax WebSocket. + // Copy over the individual jars required for Jakarta WebSocket. app.createWebInf(); app.copyLib(JakartaWebSocketClientContainerProvider.class, "jetty-ee9-websocket-jakarta-client.jar"); app.copyLib(JakartaWebSocketContainer.class, "jetty-ee9-websocket-jakarta-common.jar"); @@ -197,7 +197,7 @@ public class JakartaClientClassLoaderTest app1.copyClass(EchoSocket.class); app1.deploy(); - // Do not exclude JavaxWebSocketConfiguration for this webapp (we need the websocket server classes). + // Do not exclude JakartaWebSocketConfiguration for this webapp (we need the websocket server classes). WSServer.WebApp app2 = server.createWebApp("echo"); app2.createWebInf(); app2.copyClass(EchoSocket.class); diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyClientClassLoaderTest.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyClientClassLoaderTest.java index cf1da493f7d..876add89916 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyClientClassLoaderTest.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyClientClassLoaderTest.java @@ -160,7 +160,7 @@ public class JettyClientClassLoaderTest { WebAppTester.WebApp app = webAppTester.createWebApp(contextName); - // Copy over the individual jars required for Javax WebSocket. + // Copy over the individual jars required for Jetty WebSocket. app.createWebInf(); app.copyLib(WebSocketPolicy.class, "jetty-ee9-websocket-jetty-api.jar"); app.copyLib(WebSocketClient.class, "jetty-ee9-websocket-jetty-client.jar");