changes to websocket poms and module-info from review

Signed-off-by: Lachlan Roberts <[email protected]>
jetty · Jun 30, 2023 · e1b0d01 · e1b0d01
1 parent f110946
commit e1b0d01
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 25 deletions.
diff --git a/jetty-ee10/jetty-ee10-bom/pom.xml b/jetty-ee10/jetty-ee10-bom/pom.xml
@@ -142,7 +142,7 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.ee10.websocket</groupId>
-        <artifactId>jetty-ee10-websocket-jetty-client</artifactId>
+        <artifactId>jetty-ee10-websocket-jetty-client-webapp</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>

diff --git a/jetty-ee10/jetty-ee10-home/pom.xml b/jetty-ee10/jetty-ee10-home/pom.xml
@@ -428,7 +428,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee10.websocket</groupId>
-      <artifactId>jetty-ee10-websocket-jetty-client</artifactId>
+      <artifactId>jetty-ee10-websocket-jetty-client-webapp</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee10.websocket</groupId>

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
@@ -22,7 +22,6 @@
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <optional>true</optional>
     </dependency>
   </dependencies>
 

diff --git a/...-ee10-websocket/jetty-ee10-websocket-jakarta-client-webapp/src/main/java/module-info.java b/...-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-websocket-jetty-client/pom.xml → ...e10-websocket-jetty-client-webapp/pom.xml b/...jetty-ee10-websocket-jetty-client/pom.xml → ...e10-websocket-jetty-client-webapp/pom.xml
@@ -7,11 +7,11 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>jetty-ee10-websocket-jetty-client</artifactId>
-  <name>EE10 :: Websocket :: Jetty Client</name>
+  <artifactId>jetty-ee10-websocket-jetty-client-webapp</artifactId>
+  <name>EE10 :: Websocket :: Jetty Client WebApp</name>
 
   <properties>
-    <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
+    <bundle-symbolic-name>${project.groupId}.client.webapp</bundle-symbolic-name>
   </properties>
 
   <build>

diff --git a/...g/modules/ee10-websocket-jetty-client.mod → ...es/ee10-websocket-jetty-client-webapp.mod b/...g/modules/ee10-websocket-jetty-client.mod → ...es/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/...tty-client/src/main/java/module-info.java → ...ent-webapp/src/main/java/module-info.java b/...tty-client/src/main/java/module-info.java → ...ent-webapp/src/main/java/module-info.java
diff --git a/...ig/JettyWebSocketClientConfiguration.java → ...ig/JettyWebSocketClientConfiguration.java b/...ig/JettyWebSocketClientConfiguration.java → ...ig/JettyWebSocketClientConfiguration.java
diff --git a/...g.eclipse.jetty.ee10.webapp.Configuration → ...g.eclipse.jetty.ee10.webapp.Configuration b/...g.eclipse.jetty.ee10.webapp.Configuration → ...g.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
@@ -64,7 +64,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee10.websocket</groupId>
-      <artifactId>jetty-ee10-websocket-jetty-client</artifactId>
+      <artifactId>jetty-ee10-websocket-jetty-client-webapp</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/jetty-ee10/jetty-ee10-websocket/pom.xml b/jetty-ee10/jetty-ee10-websocket/pom.xml
@@ -22,7 +22,7 @@
     <module>jetty-ee10-websocket-jakarta-common</module>
     <module>jetty-ee10-websocket-jakarta-server</module>
     <module>jetty-ee10-websocket-jakarta-tests</module>
-    <module>jetty-ee10-websocket-jetty-client</module>
+    <module>jetty-ee10-websocket-jetty-client-webapp</module>
     <module>jetty-ee10-websocket-jetty-server</module>
     <module>jetty-ee10-websocket-jetty-tests</module>
     <module>jetty-ee10-websocket-servlet</module>

diff --git a/jetty-ee10/pom.xml b/jetty-ee10/pom.xml
@@ -177,7 +177,7 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.ee10.websocket</groupId>
-        <artifactId>jetty-ee10-websocket-jetty-client</artifactId>
+        <artifactId>jetty-ee10-websocket-jetty-client-webapp</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>

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
@@ -35,15 +35,15 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-Description>jakarta.websocket.client WebApp Implementation</Bundle-Description>
+            <Bundle-Description>javax.websocket.client WebApp Implementation</Bundle-Description>
             <Export-Package>
-              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}"
             </Export-Package>
             <Require-Capability>
               osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
             </Require-Capability>
             <Provide-Capability>
-              osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider
+              osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer
             </Provide-Capability>
           </instructions>
         </configuration>

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
@@ -63,15 +63,15 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-Description>jakarta.websocket.client Implementation</Bundle-Description>
+            <Bundle-Description>javax.websocket.client Implementation</Bundle-Description>
             <Export-Package>
-              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}"
             </Export-Package>
             <Require-Capability>
               osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
             </Require-Capability>
             <Provide-Capability>
-              osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider
+              osgi.serviceloader;osgi.serviceloader=javax.websocket.ContainerProvider
             </Provide-Capability>
           </instructions>
         </configuration>

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
@@ -49,7 +49,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>
-            @{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
           </argLine>
         </configuration>
       </plugin>
@@ -59,13 +59,13 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-Description>jakarta.websocket.server Implementation</Bundle-Description>
+            <Bundle-Description>javax.websocket.server Implementation</Bundle-Description>
             <Export-Package>
-              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}"
             </Export-Package>
             <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability>
             <Provide-Capability>
-                  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
             </Provide-Capability>
           </instructions>
         </configuration>

diff --git a/...ig/modules/ee8-websocket-jetty-client.mod → ...les/ee8-websocket-jetty-client-webapp.mod b/...ig/modules/ee8-websocket-jetty-client.mod → ...les/ee8-websocket-jetty-client-webapp.mod
diff --git a/...ty-ee9-websocket/jetty-ee9-websocket-jakarta-client-webapp/src/main/java/module-info.java b/...ty-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/...ig/modules/ee9-websocket-jetty-client.mod → ...les/ee9-websocket-jetty-client-webapp.mod b/...ig/modules/ee9-websocket-jetty-client.mod → ...les/ee9-websocket-jetty-client-webapp.mod
diff --git a/...etty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/java/module-info.java b/...etty-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;