Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#9145 fix websocket modules 

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2023-01-26 16:33:37 +01:00
parent 08a829fdd2
commit 2424c86b34
14 changed files with 131 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/config/modules/websocket.mod
View File

@ -1,9 +1,2 @@
[description]
Enable both jetty and jakarta websocket jetty modules for deployed web applications.
[tags]
websocket
[depend]
websocket-jetty
websocket-jakarta
# Empty on purpose
# TODO delete me after beta release

29
jetty-ee10/jetty-ee10-home/pom.xml
View File

@ -40,6 +40,18 @@
<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>
@ -47,11 +59,24 @@
<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>
@ -59,7 +84,7 @@
<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>

6
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod
View File

@ -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-@jakarta.websocket.api.version@.jar
lib/ee10-websocket/jakarta.websocket-api-@jakarta.websocket.api.version@.jar

4
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/ee10-websocket-jetty-client.mod
View File

@ -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

4
jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/config/modules/ee10-websocket-jetty.mod
View File

@ -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-websocket-core-common-${jetty.version}.jar
lib/jetty-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

30
jetty-ee8/jetty-ee8-home/pom.xml
View File

@ -39,6 +39,19 @@
<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>
<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>
@ -46,12 +59,25 @@
<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.toolchain,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>
@ -59,7 +85,7 @@
<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>

6
jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod
View File

@ -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-@jakarta.websocket.api.version@.jar
lib/ee8-websocket/jetty-ee8-websocket-javax-client-${jetty.version}.jar

4
jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod
View File

@ -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

4
jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod
View File

@ -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

29
jetty-ee9/jetty-ee9-home/pom.xml
View File

@ -39,6 +39,18 @@
<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>
@ -46,11 +58,24 @@
<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>
@ -58,7 +83,7 @@
<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>

6
jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod
View File

@ -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-@jakarta.websocket.api.version@.jar
lib/ee9-websocket/jetty-ee9-websocket-jakarta-client-${jetty.version}.jar

4
jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/config/modules/ee9-websocket-jetty-client.mod
View File

@ -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

4
jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/config/modules/ee9-websocket-jetty.mod
View File

@ -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

26
tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/ModulesTest.java
View File

@ -73,4 +73,30 @@ public class ModulesTest
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));
}
}
}