Websocket Configuration
*This configuration configures the WebAppContext server/system classes to - * be able to see the org.eclipse.jetty.websocket package. - *
+ * be able to see the {@code org.eclipse.jetty.websocket.javax} packages. */ public class JavaxWebSocketConfiguration extends AbstractConfiguration { @@ -37,6 +36,7 @@ public JavaxWebSocketConfiguration() { addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class); addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName()); + protectAndExpose("org.eclipse.jetty.websocket.util.server."); // For WebSocketUpgradeFilter protectAndExpose("org.eclipse.jetty.websocket.javax.server.config."); protectAndExpose("org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider"); diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index cc3c39db8324..c4226c69b7bd 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -35,6 +35,12 @@Websocket Configuration
+ *This configuration configures the WebAppContext server/system classes to + * be able to see the {@code org.eclipse.jetty.websocket.client} package.
+ */ +public class JettyWebSocketClientConfiguration extends AbstractConfiguration +{ + private static final Logger LOG = LoggerFactory.getLogger(JettyWebSocketClientConfiguration.class); + + public JettyWebSocketClientConfiguration() + { + addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class); + addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName()); + + protectAndExpose("org.eclipse.jetty.websocket.api."); + protectAndExpose("org.eclipse.jetty.websocket.client."); + hide("org.eclipse.jetty.client.impl."); + hide("org.eclipse.jetty.client.config."); + } +} diff --git a/jetty-websocket/websocket-jetty-client/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration b/jetty-websocket/websocket-jetty-client/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration new file mode 100644 index 000000000000..376b7dbf6edc --- /dev/null +++ b/jetty-websocket/websocket-jetty-client/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration @@ -0,0 +1 @@ +org.eclipse.jetty.websocket.client.config.JettyWebSocketClientConfiguration \ No newline at end of file diff --git a/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod index 5c24a906fb5a..8194e1e74889 100644 --- a/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod +++ b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod @@ -7,12 +7,10 @@ Enable the Jetty WebSocket API for deployed web applications. websocket [depend] -client annotations [lib] lib/websocket/websocket-core-common-${jetty.version}.jar -lib/websocket/websocket-core-client-${jetty.version}.jar lib/websocket/websocket-core-server-${jetty.version}.jar lib/websocket/websocket-util-${jetty.version}.jar lib/websocket/websocket-util-server-${jetty.version}.jar diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java index a2caa2480b28..5115c0005e0c 100644 --- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java +++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java @@ -18,11 +18,7 @@ package org.eclipse.jetty.websocket.server.config; -import java.util.ServiceLoader; - -import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.webapp.AbstractConfiguration; -import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.FragmentConfiguration; import org.eclipse.jetty.webapp.MetaInfConfiguration; import org.eclipse.jetty.webapp.WebAppConfiguration; @@ -34,12 +30,8 @@ /** *Websocket Configuration
*This configuration configures the WebAppContext server/system classes to - * be able to see the org.eclipse.jetty.websocket package. - * This class is defined in the webapp package, as it implements the {@link Configuration} interface, - * which is unknown to the websocket package. However, the corresponding {@link ServiceLoader} - * resource is defined in the websocket package, so that this configuration only be - * loaded if the jetty-websocket jars are on the classpath. - *
+ * be able to see the {@code org.eclipse.jetty.websocket.api}, {@code org.eclipse.jetty.websocket.server} and + * {@code org.eclipse.jetty.websocket.util.server} packages. */ public class JettyWebSocketConfiguration extends AbstractConfiguration { @@ -48,39 +40,12 @@ public class JettyWebSocketConfiguration extends AbstractConfiguration public JettyWebSocketConfiguration() { addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class); + addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName()); - if (isAvailable("org.eclipse.jetty.osgi.annotations.AnnotationConfiguration")) - addDependents("org.eclipse.jetty.osgi.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName()); - else if (isAvailable("org.eclipse.jetty.annotations.AnnotationConfiguration")) - addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName()); - else - throw new RuntimeException("Unable to add AnnotationConfiguration dependent (not present in classpath)"); - - protectAndExpose( - "org.eclipse.jetty.websocket.api.", - "org.eclipse.jetty.websocket.server.", - "org.eclipse.jetty.websocket.util.server."); // For WebSocketUpgradeFilter - - hide("org.eclipse.jetty.server.internal.", - "org.eclipse.jetty.server.config."); - } - - @Override - public boolean isAvailable() - { - return isAvailable("org.eclipse.jetty.websocket.common.JettyWebSocketFrame"); - } - - private boolean isAvailable(String classname) - { - try - { - return Loader.loadClass(classname) != null; - } - catch (Throwable e) - { - LOG.trace("IGNORED", e); - return false; - } + protectAndExpose("org.eclipse.jetty.websocket.api."); + protectAndExpose("org.eclipse.jetty.websocket.server."); + protectAndExpose("org.eclipse.jetty.websocket.util.server."); // For WebSocketUpgradeFilter + hide("org.eclipse.jetty.server.internal."); + hide("org.eclipse.jetty.server.config."); } } diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index 64ae2dc689b6..cd84e13f3972 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -47,7 +47,6 @@ import org.eclipse.jetty.websocket.api.StatusCode; import org.eclipse.jetty.websocket.api.WebSocketListener; import org.eclipse.jetty.websocket.client.WebSocketClient; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnJre; import org.junit.jupiter.api.condition.DisabledOnOs; @@ -129,7 +128,7 @@ public void testQuickStartGenerationAndRun() throws Exception Path quickstartWebXml = webInf.resolve("quickstart-web.xml"); assertTrue(Files.exists(quickstartWebXml)); assertNotEquals(0, Files.size(quickstartWebXml)); - + int port = distribution.freePort(); try (JettyHomeTester.Run run3 = distribution.start("jetty.http.port=" + port, "jetty.quickstart.mode=QUICKSTART")) @@ -145,7 +144,7 @@ public void testQuickStartGenerationAndRun() throws Exception } } } - + @Test public void testSimpleWebAppWithJSP() throws Exception { @@ -376,7 +375,6 @@ public void testLog4j2ModuleWithSimpleWebAppWithJSP() throws Exception } } - @Disabled @ParameterizedTest @ValueSource(strings = {"http", "https"}) public void testWebsocketClientInWebappProvidedByServer(String scheme) throws Exception @@ -389,11 +387,12 @@ public void testWebsocketClientInWebappProvidedByServer(String scheme) throws Ex .mavenLocalRepository(System.getProperty("mavenRepoPath")) .build(); + String module = "https".equals(scheme) ? "test-keystore," + scheme : scheme; String[] args1 = { "--create-startd", "--approve-all-licenses", - "--add-to-start=resources,server,webapp,deploy,jsp,jmx,servlet,servlets,websocket,test-keystore," + scheme - }; + "--add-to-start=resources,server,webapp,deploy,jsp,jmx,servlet,servlets,websocket,websocket-jetty-client," + module, + }; try (JettyHomeTester.Run run1 = distribution.start(args1)) { assertTrue(run1.awaitFor(5, TimeUnit.SECONDS)); @@ -425,7 +424,6 @@ public void testWebsocketClientInWebappProvidedByServer(String scheme) throws Ex } } - @Disabled @ParameterizedTest @ValueSource(strings = {"http", "https"}) public void testWebsocketClientInWebapp(String scheme) throws Exception @@ -457,7 +455,7 @@ public void testWebsocketClientInWebapp(String scheme) throws Exception "jetty.http.port=" + port, "jetty.ssl.port=" + port, // "jetty.server.dumpAfterStart=true", - }; + }; try (JettyHomeTester.Run run2 = distribution.start(args2)) { @@ -515,8 +513,8 @@ public void testWebAppWithProxyAndJPMS() throws Exception /** * This reproduces some classloading issue with MethodHandles in JDK14-15, this has been fixed in JDK16. - * @see JDK-8244090 * @throws Exception if there is an error during the test. + * @see JDK-8244090 */ @ParameterizedTest @ValueSource(strings = {"", "--jpms"}) @@ -641,5 +639,4 @@ public void testStartStopLog4j2Modules() throws Exception } } } - } diff --git a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml index 1ba112c51714..bcbf1c1e5415 100644 --- a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml @@ -13,6 +13,15 @@