#9145 fix websocket module

Signed-off-by: Ludovic Orban <[email protected]>
jetty · Jan 24, 2023 · 293b963 · 293b963
1 parent 974d83e
commit 293b963
Show file tree

Hide file tree

Showing 14 changed files with 129 additions and 36 deletions.
diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/config/modules/websocket.mod b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/config/modules/websocket.mod
diff --git a/jetty-ee10/jetty-ee10-home/pom.xml b/jetty-ee10/jetty-ee10-home/pom.xml
@@ -40,26 +40,51 @@
               <outputDirectory>${assembly-directory}</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-lib-core-websocket-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty.websocket</includeGroupIds>
+              <includeTypes>jar</includeTypes>
+              <outputDirectory>${assembly-directory}/lib</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-lib-ee10-websocket-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee10.websocket</includeGroupIds>
+              <includeGroupIds>org.eclipse.jetty.ee10.websocket</includeGroupIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/ee10-websocket</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-lib-core-websocket-src-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty.websocket</includeGroupIds>
+              <includeTypes>jar</includeTypes>
+              <classifier>sources</classifier>
+              <outputDirectory>${source-assembly-directory}/lib</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-lib-ee10-websocket-src-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee10.websocket</includeGroupIds>
+              <includeGroupIds>org.eclipse.jetty.ee10.websocket</includeGroupIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
               <outputDirectory>${source-assembly-directory}/lib/ee10-websocket</outputDirectory>

diff --git a/...et/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod b/...et/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod
@@ -12,9 +12,9 @@ client
 ee10-annotations
 
 [lib]
-lib/ee10-websocket/jetty-websocket-core-common-${jetty.version}.jar
-lib/ee10-websocket/jetty-websocket-core-client-${jetty.version}.jar
-lib/ee10-websocket/jetty-websocket-core-server-${jetty.version}.jar
+lib/jetty-websocket-core-common-${jetty.version}.jar
+lib/jetty-websocket-core-client-${jetty.version}.jar
+lib/jetty-websocket-core-server-${jetty.version}.jar
 lib/ee10-websocket/jetty-ee10-websocket-servlet-${jetty.version}.jar
 lib/ee10-websocket/jakarta.websocket-client-api-@[email protected]
 lib/ee10-websocket/jakarta.websocket-api-@[email protected]

diff --git a/...jetty-ee10-websocket-jetty-client/src/main/config/modules/ee10-websocket-jetty-client.mod b/...jetty-ee10-websocket-jetty-client/src/main/config/modules/ee10-websocket-jetty-client.mod
@@ -14,8 +14,8 @@ client
 ee10-annotations
 
 [lib]
-lib/ee10-websocket/jetty-websocket-core-common-${jetty.version}.jar
-lib/ee10-websocket/jetty-websocket-core-client-${jetty.version}.jar
+lib/jetty-websocket-core-common-${jetty.version}.jar
+lib/jetty-websocket-core-client-${jetty.version}.jar
 lib/ee10-websocket/jetty-ee10-websocket-jetty-api-${jetty.version}.jar
 lib/ee10-websocket/jetty-ee10-websocket-jetty-common-${jetty.version}.jar
 lib/ee10-websocket/jetty-ee10-websocket-jetty-client-${jetty.version}.jar

diff --git a/...socket/jetty-ee10-websocket-jetty-server/src/main/config/modules/ee10-websocket-jetty.mod b/...socket/jetty-ee10-websocket-jetty-server/src/main/config/modules/ee10-websocket-jetty.mod
@@ -11,8 +11,8 @@ ee10
 ee10-annotations
 
 [lib]
-lib/ee10-websocket/jetty-ee10-websocket-core-common-${jetty.version}.jar
-lib/ee10-websocket/jetty-ee10-websocket-core-server-${jetty.version}.jar
+lib/jetty-ee10-websocket-core-common-${jetty.version}.jar
+lib/jetty-ee10-websocket-core-server-${jetty.version}.jar
 lib/ee10-websocket/jetty-ee10-websocket-servlet-${jetty.version}.jar
 lib/ee10-websocket/jetty-ee10-websocket-jetty-api-${jetty.version}.jar
 lib/ee10-websocket/jetty-ee10-websocket-jetty-common-${jetty.version}.jar

diff --git a/jetty-ee8/jetty-ee8-home/pom.xml b/jetty-ee8/jetty-ee8-home/pom.xml
@@ -39,27 +39,53 @@
               <outputDirectory>${assembly-directory}</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-lib-core-websocket-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty.toolchain,org.eclipse.jetty.websocket</includeGroupIds>
+              <excludeArtifactIds>jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core*</excludeArtifactIds>
+              <includeTypes>jar</includeTypes>
+              <outputDirectory>${assembly-directory}/lib</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-lib-ee8-websocket-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>org.eclipse.jetty.toolchain,org.eclipse.jetty.websocket,org.eclipse.jetty.ee8.websocket</includeGroupIds>
+              <includeGroupIds>org.eclipse.jetty.ee8.websocket</includeGroupIds>
               <excludeArtifactIds>jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core*</excludeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/ee8-websocket</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-lib-core-websocket-src-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty.websocket</includeGroupIds>
+              <includeTypes>jar</includeTypes>
+              <classifier>sources</classifier>
+              <outputDirectory>${source-assembly-directory}/lib</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-lib-ee8-websocket-src-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee8.websocket</includeGroupIds>
+              <includeGroupIds>org.eclipse.jetty.ee8.websocket</includeGroupIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
               <outputDirectory>${source-assembly-directory}/lib/ee8-websocket</outputDirectory>

diff --git a/...ebsocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod b/...ebsocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod
@@ -12,9 +12,9 @@ client
 ee8-annotations
 
 [lib]
-lib/ee8-websocket/jetty-websocket-core-common-${jetty.version}.jar
-lib/ee8-websocket/jetty-websocket-core-client-${jetty.version}.jar
-lib/ee8-websocket/jetty-websocket-core-server-${jetty.version}.jar
+lib/jetty-websocket-core-common-${jetty.version}.jar
+lib/jetty-websocket-core-client-${jetty.version}.jar
+lib/jetty-websocket-core-server-${jetty.version}.jar
 lib/ee8-websocket/jetty-ee8-websocket-servlet-${jetty.version}.jar
 lib/ee8-websocket/jetty-javax-websocket-api-@[email protected]
 lib/ee8-websocket/jetty-ee8-websocket-javax-client-${jetty.version}.jar

diff --git a/...t/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod b/...t/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod
@@ -14,8 +14,8 @@ client
 ee8-annotations
 
 [lib]
-lib/ee8-websocket/jetty-websocket-core-common-${jetty.version}.jar
-lib/ee8-websocket/jetty-websocket-core-client-${jetty.version}.jar
+lib/jetty-websocket-core-common-${jetty.version}.jar
+lib/jetty-websocket-core-client-${jetty.version}.jar
 lib/ee8-websocket/jetty-ee8-websocket-jetty-api-${jetty.version}.jar
 lib/ee8-websocket/jetty-ee8-websocket-jetty-common-${jetty.version}.jar
 lib/ee8-websocket/jetty-ee8-websocket-jetty-client-${jetty.version}.jar

diff --git a/...ebsocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod b/...ebsocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod
@@ -13,8 +13,8 @@ websocket
 ee8-annotations
 
 [lib]
-lib/ee8-websocket/jetty-websocket-core-common-${jetty.version}.jar
-lib/ee8-websocket/jetty-websocket-core-server-${jetty.version}.jar
+lib/jetty-websocket-core-common-${jetty.version}.jar
+lib/jetty-websocket-core-server-${jetty.version}.jar
 lib/ee8-websocket/jetty-ee8-websocket-servlet-${jetty.version}.jar
 lib/ee8-websocket/jetty-ee8-websocket-jetty-api-${jetty.version}.jar
 lib/ee8-websocket/jetty-ee8-websocket-jetty-common-${jetty.version}.jar

diff --git a/jetty-ee9/jetty-ee9-home/pom.xml b/jetty-ee9/jetty-ee9-home/pom.xml
@@ -39,26 +39,51 @@
               <outputDirectory>${assembly-directory}</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-lib-core-websocket-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty.websocket</includeGroupIds>
+              <includeTypes>jar</includeTypes>
+              <outputDirectory>${assembly-directory}/lib</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-lib-ee9-websocket-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee9.websocket</includeGroupIds>
+              <includeGroupIds>org.eclipse.jetty.ee9.websocket</includeGroupIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/ee9-websocket</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-lib-core-websocket-src-deps</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>org.eclipse.jetty.websocket</includeGroupIds>
+              <includeTypes>jar</includeTypes>
+              <classifier>sources</classifier>
+              <outputDirectory>${source-assembly-directory}/lib</outputDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-lib-ee9-websocket-src-deps</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee9.websocket</includeGroupIds>
+              <includeGroupIds>org.eclipse.jetty.ee9.websocket</includeGroupIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
               <outputDirectory>${source-assembly-directory}/lib/ee9-websocket</outputDirectory>

diff --git a/...cket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod b/...cket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod
@@ -12,9 +12,9 @@ client
 ee9-annotations
 
 [lib]
-lib/ee9-websocket/jetty-websocket-core-common-${jetty.version}.jar
-lib/ee9-websocket/jetty-websocket-core-client-${jetty.version}.jar
-lib/ee9-websocket/jetty-websocket-core-server-${jetty.version}.jar
+lib/jetty-websocket-core-common-${jetty.version}.jar
+lib/jetty-websocket-core-client-${jetty.version}.jar
+lib/jetty-websocket-core-server-${jetty.version}.jar
 lib/ee9-websocket/jetty-ee9-websocket-servlet-${jetty.version}.jar
 lib/ee9-websocket/jetty-jakarta-websocket-api-@[email protected]
 lib/ee9-websocket/jetty-ee9-websocket-jakarta-client-${jetty.version}.jar

diff --git a/...t/jetty-ee9-websocket-jetty-client/src/main/config/modules/ee9-websocket-jetty-client.mod b/...t/jetty-ee9-websocket-jetty-client/src/main/config/modules/ee9-websocket-jetty-client.mod
@@ -14,8 +14,8 @@ client
 ee9-annotations
 
 [lib]
-lib/ee9-websocket/jetty-websocket-core-common-${jetty.version}.jar
-lib/ee9-websocket/jetty-websocket-core-client-${jetty.version}.jar
+lib/jetty-websocket-core-common-${jetty.version}.jar
+lib/jetty-websocket-core-client-${jetty.version}.jar
 lib/ee9-websocket/jetty-ee9-websocket-jetty-api-${jetty.version}.jar
 lib/ee9-websocket/jetty-ee9-websocket-jetty-common-${jetty.version}.jar
 lib/ee9-websocket/jetty-ee9-websocket-jetty-client-${jetty.version}.jar

diff --git a/...ebsocket/jetty-ee9-websocket-jetty-server/src/main/config/modules/ee9-websocket-jetty.mod b/...ebsocket/jetty-ee9-websocket-jetty-server/src/main/config/modules/ee9-websocket-jetty.mod
@@ -11,8 +11,8 @@ ee9
 ee9-annotations
 
 [lib]
-lib/ee9-websocket/jetty-websocket-core-common-${jetty.version}.jar
-lib/ee9-websocket/jetty-websocket-core-server-${jetty.version}.jar
+lib/jetty-websocket-core-common-${jetty.version}.jar
+lib/jetty-websocket-core-server-${jetty.version}.jar
 lib/ee9-websocket/jetty-ee9-websocket-servlet-${jetty.version}.jar
 lib/ee9-websocket/jetty-ee9-websocket-jetty-api-${jetty.version}.jar
 lib/ee9-websocket/jetty-ee9-websocket-jetty-common-${jetty.version}.jar

diff --git a/...t-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/ModulesTest.java b/...t-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/ModulesTest.java
@@ -49,4 +49,30 @@ public void testOpenidModules(String module) throws Exception
             assertThat(run.awaitFor(5, TimeUnit.SECONDS), is(true));
         }
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"ee8-websocket-javax", "ee9-websocket-jakarta", "ee10-websocket-jakarta"})
+    public void testWebsocketModules(String module) throws Exception
+    {
+        String jettyVersion = System.getProperty("jettyVersion");
+        JettyHomeTester distribution = JettyHomeTester.Builder.newInstance()
+            .jettyVersion(jettyVersion)
+            .mavenLocalRepository(System.getProperty("mavenRepoPath"))
+            .build();
+
+        // Add module.
+        try (JettyHomeTester.Run run = distribution.start("--add-modules=" + module))
+        {
+            run.awaitFor(5, TimeUnit.SECONDS);
+            assertThat(run.getExitValue(), is(0));
+        }
+
+        // Verify that Jetty starts.
+        try (JettyHomeTester.Run run = distribution.start())
+        {
+            assertThat(run.awaitConsoleLogsFor("Started oejs.Server", 5, TimeUnit.SECONDS), is(true));
+            run.stop();
+            assertThat(run.awaitFor(5, TimeUnit.SECONDS), is(true));
+        }
+    }
 }