From e1b0d01aa0c77e832697be0c734e7a672e83de6f Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 30 Jun 2023 13:15:03 +1000 Subject: [PATCH] changes to websocket poms and module-info from review Signed-off-by: Lachlan Roberts --- jetty-ee10/jetty-ee10-bom/pom.xml | 2 +- jetty-ee10/jetty-ee10-home/pom.xml | 2 +- .../jetty-ee10-websocket-jakarta-client-webapp/pom.xml | 1 - .../src/main/java/module-info.java | 3 +-- .../pom.xml | 6 +++--- .../modules/ee10-websocket-jetty-client-webapp.mod} | 2 +- .../src/main/java/module-info.java | 0 .../client/config/JettyWebSocketClientConfiguration.java | 0 .../services/org.eclipse.jetty.ee10.webapp.Configuration | 0 .../jetty-ee10-websocket-jetty-tests/pom.xml | 2 +- jetty-ee10/jetty-ee10-websocket/pom.xml | 2 +- jetty-ee10/pom.xml | 2 +- .../jetty-ee8-websocket-javax-client-webapp/pom.xml | 6 +++--- .../jetty-ee8-websocket-javax-client/pom.xml | 6 +++--- .../jetty-ee8-websocket-javax-server/pom.xml | 8 ++++---- ...y-client.mod => ee8-websocket-jetty-client-webapp.mod} | 0 .../src/main/java/module-info.java | 3 +-- ...y-client.mod => ee9-websocket-jetty-client-webapp.mod} | 0 .../src/main/java/module-info.java | 1 - 19 files changed, 21 insertions(+), 25 deletions(-) rename jetty-ee10/jetty-ee10-websocket/{jetty-ee10-websocket-jetty-client => jetty-ee10-websocket-jetty-client-webapp}/pom.xml (87%) rename jetty-ee10/jetty-ee10-websocket/{jetty-ee10-websocket-jetty-client/src/main/config/modules/ee10-websocket-jetty-client.mod => jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod} (85%) rename jetty-ee10/jetty-ee10-websocket/{jetty-ee10-websocket-jetty-client => jetty-ee10-websocket-jetty-client-webapp}/src/main/java/module-info.java (100%) rename jetty-ee10/jetty-ee10-websocket/{jetty-ee10-websocket-jetty-client => jetty-ee10-websocket-jetty-client-webapp}/src/main/java/org/eclipse/jetty/ee10/websocket/client/config/JettyWebSocketClientConfiguration.java (100%) rename jetty-ee10/jetty-ee10-websocket/{jetty-ee10-websocket-jetty-client => jetty-ee10-websocket-jetty-client-webapp}/src/main/resources/META-INF/services/org.eclipse.jetty.ee10.webapp.Configuration (100%) rename jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/{ee8-websocket-jetty-client.mod => ee8-websocket-jetty-client-webapp.mod} (100%) rename jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/{ee9-websocket-jetty-client.mod => ee9-websocket-jetty-client-webapp.mod} (100%) diff --git a/jetty-ee10/jetty-ee10-bom/pom.xml b/jetty-ee10/jetty-ee10-bom/pom.xml index b73e34d34700..40b66a8e20ae 100644 --- a/jetty-ee10/jetty-ee10-bom/pom.xml +++ b/jetty-ee10/jetty-ee10-bom/pom.xml @@ -142,7 +142,7 @@ org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-client + jetty-ee10-websocket-jetty-client-webapp 12.0.0-SNAPSHOT diff --git a/jetty-ee10/jetty-ee10-home/pom.xml b/jetty-ee10/jetty-ee10-home/pom.xml index 3967baaee89b..737483174530 100644 --- a/jetty-ee10/jetty-ee10-home/pom.xml +++ b/jetty-ee10/jetty-ee10-home/pom.xml @@ -428,7 +428,7 @@ org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-client + jetty-ee10-websocket-jetty-client-webapp org.eclipse.jetty.ee10.websocket diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml index 1140cbc406a0..f1b8fbef44e6 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/pom.xml @@ -22,7 +22,6 @@ jakarta.servlet jakarta.servlet-api - true diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/src/main/java/module-info.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/src/main/java/module-info.java index edb18a5ee88a..adfc9280b69a 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/src/main/java/module-info.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/src/main/java/module-info.java @@ -16,9 +16,8 @@ module org.eclipse.jetty.ee10.websocket.jakarta.client.webapp { requires org.slf4j; - - requires transitive org.eclipse.jetty.ee10.websocket.jakarta.client; requires transitive jakarta.servlet; + requires transitive org.eclipse.jetty.ee10.websocket.jakarta.client; exports org.eclipse.jetty.ee10.websocket.jakarta.client.webapp; diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml similarity index 87% rename from jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/pom.xml rename to jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml index 67144ef306df..347d2c5428a2 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/pom.xml @@ -7,11 +7,11 @@ 4.0.0 - jetty-ee10-websocket-jetty-client - EE10 :: Websocket :: Jetty Client + jetty-ee10-websocket-jetty-client-webapp + EE10 :: Websocket :: Jetty Client WebApp - ${project.groupId}.client + ${project.groupId}.client.webapp diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/ee10-websocket-jetty-client.mod b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod similarity index 85% rename from jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/ee10-websocket-jetty-client.mod rename to jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod index fbadd5b7a766..8b67a488f864 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/config/modules/ee10-websocket-jetty-client.mod +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod @@ -15,7 +15,7 @@ ee10-annotations websocket-jetty-client [lib] -lib/ee10-websocket/jetty-ee10-websocket-jetty-client-${jetty.version}.jar +lib/ee10-websocket/jetty-ee10-websocket-jetty-client-webapp-${jetty.version}.jar [jpms] # The implementation needs to access method handles in diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/java/module-info.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/java/module-info.java similarity index 100% rename from jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/java/module-info.java rename to jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/java/module-info.java diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/java/org/eclipse/jetty/ee10/websocket/client/config/JettyWebSocketClientConfiguration.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/java/org/eclipse/jetty/ee10/websocket/client/config/JettyWebSocketClientConfiguration.java similarity index 100% rename from jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/java/org/eclipse/jetty/ee10/websocket/client/config/JettyWebSocketClientConfiguration.java rename to jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/java/org/eclipse/jetty/ee10/websocket/client/config/JettyWebSocketClientConfiguration.java diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/resources/META-INF/services/org.eclipse.jetty.ee10.webapp.Configuration b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/resources/META-INF/services/org.eclipse.jetty.ee10.webapp.Configuration similarity index 100% rename from jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/resources/META-INF/services/org.eclipse.jetty.ee10.webapp.Configuration rename to jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/resources/META-INF/services/org.eclipse.jetty.ee10.webapp.Configuration diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml index 8e32c718a145..92053da9b2b4 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-tests/pom.xml @@ -64,7 +64,7 @@ org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-client + jetty-ee10-websocket-jetty-client-webapp test diff --git a/jetty-ee10/jetty-ee10-websocket/pom.xml b/jetty-ee10/jetty-ee10-websocket/pom.xml index 52efef0f513b..f7f87a8a70fd 100644 --- a/jetty-ee10/jetty-ee10-websocket/pom.xml +++ b/jetty-ee10/jetty-ee10-websocket/pom.xml @@ -22,7 +22,7 @@ jetty-ee10-websocket-jakarta-common jetty-ee10-websocket-jakarta-server jetty-ee10-websocket-jakarta-tests - jetty-ee10-websocket-jetty-client + jetty-ee10-websocket-jetty-client-webapp jetty-ee10-websocket-jetty-server jetty-ee10-websocket-jetty-tests jetty-ee10-websocket-servlet diff --git a/jetty-ee10/pom.xml b/jetty-ee10/pom.xml index 7ca66108ba8f..709668de525c 100644 --- a/jetty-ee10/pom.xml +++ b/jetty-ee10/pom.xml @@ -177,7 +177,7 @@ org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-client + jetty-ee10-websocket-jetty-client-webapp ${project.version} diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml index 87543b5ad19b..10efa8a5c356 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml @@ -35,15 +35,15 @@ true - jakarta.websocket.client WebApp Implementation + javax.websocket.client WebApp Implementation - org.eclipse.jetty.ee8.websocket.jakarta.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + org.eclipse.jetty.ee8.websocket.javax.client.webapp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider + osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml index b58c7b75f958..c2d33750a3d8 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml @@ -63,15 +63,15 @@ true - jakarta.websocket.client Implementation + javax.websocket.client Implementation - org.eclipse.jetty.ee8.websocket.jakarta.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + org.eclipse.jetty.ee8.websocket.javax.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider + osgi.serviceloader;osgi.serviceloader=javax.websocket.ContainerProvider diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml index 29b89a9ee7f4..ad27c1535226 100644 --- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml +++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml @@ -49,7 +49,7 @@ maven-surefire-plugin - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.jakarta.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.jakarta.common=org.eclipse.jetty.websocket.jakarta.server + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.websocket.javax.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.javax.common=org.eclipse.jetty.websocket.javax.server @@ -59,13 +59,13 @@ true - jakarta.websocket.server Implementation + javax.websocket.server Implementation - org.eclipse.jetty.websocket.jakarta.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + org.eclipse.jetty.websocket.javax.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=jakarta.websocket.server.ServerEndpointConfig$Configurator + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=javax.websocket.server.ServerEndpointConfig$Configurator diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod similarity index 100% rename from jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client.mod rename to jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/src/main/java/module-info.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/src/main/java/module-info.java index a96e445fd6a7..b0a7a0ad7907 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/src/main/java/module-info.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/src/main/java/module-info.java @@ -16,9 +16,8 @@ module org.eclipse.jetty.ee9.websocket.jakarta.client.webapp { requires org.slf4j; - - requires transitive org.eclipse.jetty.ee9.websocket.jakarta.client; requires transitive jetty.servlet.api; + requires transitive org.eclipse.jetty.ee9.websocket.jakarta.client; exports org.eclipse.jetty.ee9.websocket.jakarta.client.webapp; diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client.mod b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod similarity index 100% rename from jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client.mod rename to jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/java/module-info.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/java/module-info.java index 4b2a50acd834..dfb73fa6721e 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/java/module-info.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/java/module-info.java @@ -16,7 +16,6 @@ module org.eclipse.jetty.ee9.websocket.jetty.client.webapp { requires org.slf4j; - requires transitive org.eclipse.jetty.ee9.webapp; exports org.eclipse.jetty.ee9.websocket.client.config;