split a webapp module for jetty-ee9-websocket-jetty-client

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/pom.xml

@@ -42,7 +42,6 @@
     <dependency>
       <groupId>org.eclipse.jetty.ee10</groupId>
       <artifactId>jetty-ee10-webapp</artifactId>
-      <optional>true</optional>
     </dependency>
   </dependencies>
 

jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client/src/main/java/module-info.java

@@ -17,7 +17,7 @@ module org.eclipse.jetty.ee10.websocket.jetty.client
 {
     requires org.eclipse.jetty.websocket.client;
 
-    requires static transitive org.eclipse.jetty.ee10.webapp;
+    requires transitive org.eclipse.jetty.ee10.webapp;
 
     exports org.eclipse.jetty.ee10.websocket.client.config;
 

jetty-ee8/jetty-ee8-bom/pom.xml

@@ -135,6 +135,11 @@
         <artifactId>jetty-ee8-websocket-jetty-client</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.ee8.websocket</groupId>
+        <artifactId>jetty-ee8-websocket-jetty-client-webapp</artifactId>
+        <version>12.0.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.ee8.websocket</groupId>
         <artifactId>jetty-ee8-websocket-jetty-common</artifactId>

jetty-ee8/jetty-ee8-home/pom.xml

@@ -384,6 +384,10 @@
       <groupId>org.eclipse.jetty.ee8.websocket</groupId>
       <artifactId>jetty-ee8-websocket-jetty-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8.websocket</groupId>
+      <artifactId>jetty-ee8-websocket-jetty-client-webapp</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee8.websocket</groupId>
       <artifactId>jetty-ee8-websocket-javax-server</artifactId>

jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty.ee8.websocket</groupId>
+    <artifactId>jetty-ee8-websocket</artifactId>
+    <version>12.0.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jetty-ee8-websocket-jetty-client-webapp</artifactId>
+  <name>EE8 :: Websocket :: Jetty Client WebApp</name>
+
+  <properties>
+    <ee9.module>jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp</ee9.module>
+    <bundle-symbolic-name>${project.groupId}.client.webapp</bundle-symbolic-name>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Require-Capability>
+              osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
+            </Require-Capability>
+            <Provide-Capability>
+              osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee8.webapp.Configuration
+            </Provide-Capability>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8.websocket</groupId>
+      <artifactId>jetty-ee8-websocket-jetty-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-webapp</artifactId>
+    </dependency>
+  </dependencies>
+
+</project>

jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client.mod

@@ -0,0 +1,26 @@
+# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[description]
+Expose the Jetty WebSocket Client classes to deployed web applications.
+
+[environment]
+ee8
+
+[tags]
+websocket
+
+[depend]
+client
+ee8-annotations
+
+[lib]
+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-webapp-${jetty.version}.jar
+
+[jpms]
+# The implementation needs to access method handles in
+# classes that are in the web application classloader.
+add-reads: org.eclipse.jetty.websocket.jetty.common=ALL-UNNAMED

jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml

@@ -32,16 +32,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>
-            @{argLine} ${jetty.surefire.argLine}
-            --add-modules org.eclipse.jetty.ee8.webapp
-            --add-reads org.eclipse.jetty.ee8.websocket.jetty.client=org.eclipse.jetty.ee8.webapp
-          </argLine>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
@@ -62,15 +52,15 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee8</groupId>
-      <artifactId>jetty-ee8-webapp</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee8</groupId>
+      <artifactId>jetty-ee8-webapp</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-slf4j-impl</artifactId>

jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml

@@ -30,7 +30,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee8.websocket</groupId>
-      <artifactId>jetty-ee8-websocket-jetty-client</artifactId>
+      <artifactId>jetty-ee8-websocket-jetty-client-webapp</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

jetty-ee8/jetty-ee8-websocket/pom.xml

@@ -26,6 +26,7 @@
     <module>jetty-ee8-websocket-servlet</module>
     <module>jetty-ee8-websocket-javax-server</module>
     <module>jetty-ee8-websocket-jetty-client</module>
+    <module>jetty-ee8-websocket-jetty-client-webapp</module>
     <module>jetty-ee8-websocket-jetty-server</module>
     <module>jetty-ee8-websocket-javax-tests</module>
     <module>jetty-ee8-websocket-jetty-tests</module>

jetty-ee8/pom.xml

@@ -356,6 +356,11 @@
           <artifactId>jetty-ee8-websocket-jetty-client</artifactId>
           <version>${project.version}</version>
         </dependency>
+        <dependency>
+          <groupId>org.eclipse.jetty.ee8.websocket</groupId>
+          <artifactId>jetty-ee8-websocket-jetty-client-webapp</artifactId>
+          <version>${project.version}</version>
+        </dependency>
         <dependency>
           <groupId>org.eclipse.jetty.ee8.websocket</groupId>
           <artifactId>jetty-ee8-websocket-jetty-server</artifactId>

jetty-ee9/jetty-ee9-bom/pom.xml

@@ -165,6 +165,11 @@
         <artifactId>jetty-ee9-websocket-jetty-client</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.ee9.websocket</groupId>
+        <artifactId>jetty-ee9-websocket-jetty-client-webapp</artifactId>
+        <version>12.0.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.ee9.websocket</groupId>
         <artifactId>jetty-ee9-websocket-jetty-common</artifactId>

jetty-ee9/jetty-ee9-home/pom.xml

@@ -434,6 +434,10 @@
       <groupId>org.eclipse.jetty.ee9.websocket</groupId>
       <artifactId>jetty-ee9-websocket-jetty-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee9.websocket</groupId>
+      <artifactId>jetty-ee9-websocket-jetty-client-webapp</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee9.websocket</groupId>
       <artifactId>jetty-ee9-websocket-jakarta-server</artifactId>

jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/pom.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty.ee9.websocket</groupId>
+    <artifactId>jetty-ee9-websocket</artifactId>
+    <version>12.0.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jetty-ee9-websocket-jetty-client-webapp</artifactId>
+  <name>EE9 :: Websocket :: Jetty Client WebApp</name>
+
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.client.webapp</bundle-symbolic-name>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Require-Capability>
+              osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
+            </Require-Capability>
+            <Provide-Capability>
+              osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration
+            </Provide-Capability>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee9.websocket</groupId>
+      <artifactId>jetty-ee9-websocket-jetty-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-webapp</artifactId>
+    </dependency>
+  </dependencies>
+
+</project>

jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client.mod

@@ -18,7 +18,7 @@ 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
+lib/ee9-websocket/jetty-ee9-websocket-jetty-client-webapp-${jetty.version}.jar
 
 [jpms]
 # The implementation needs to access method handles in

jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/java/module-info.java

@@ -0,0 +1,25 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+import org.eclipse.jetty.ee9.websocket.client.config.JettyWebSocketClientConfiguration;
+
+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;
+
+    provides org.eclipse.jetty.ee9.webapp.Configuration with JettyWebSocketClientConfiguration;
+}

jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/pom.xml

@@ -14,36 +14,6 @@
     <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
   </properties>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>
-            @{argLine} ${jetty.surefire.argLine}
-            --add-modules org.eclipse.jetty.ee9.webapp
-            --add-reads org.eclipse.jetty.ee9.websocket.jetty.client=org.eclipse.jetty.ee9.webapp
-          </argLine>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Require-Capability>
-              osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
-            </Require-Capability>
-            <Provide-Capability>
-              osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.ee9.webapp.Configuration
-            </Provide-Capability>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.ee9.websocket</groupId>
@@ -61,15 +31,15 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-webapp</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-webapp</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-slf4j-impl</artifactId>

jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/java/module-info.java

@@ -11,8 +11,6 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.ee9.websocket.client.config.JettyWebSocketClientConfiguration;
-
 module org.eclipse.jetty.ee9.websocket.jetty.client
 {
     requires org.eclipse.jetty.websocket.core.client;
@@ -22,10 +20,5 @@ module org.eclipse.jetty.ee9.websocket.jetty.client
     requires transitive org.eclipse.jetty.client;
     requires transitive org.eclipse.jetty.ee9.websocket.jetty.api;
 
-    requires static transitive org.eclipse.jetty.ee9.webapp;
-
     exports org.eclipse.jetty.ee9.websocket.client;
-    exports org.eclipse.jetty.ee9.websocket.client.config;
-
-    provides org.eclipse.jetty.ee9.webapp.Configuration with JettyWebSocketClientConfiguration;
 }

jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/pom.xml

@@ -29,7 +29,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee9.websocket</groupId>
-      <artifactId>jetty-ee9-websocket-jetty-client</artifactId>
+      <artifactId>jetty-ee9-websocket-jetty-client-webapp</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

jetty-ee9/jetty-ee9-websocket/pom.xml

@@ -26,6 +26,7 @@
     <module>jetty-ee9-websocket-jetty-api</module>
     <module>jetty-ee9-websocket-jetty-common</module>
     <module>jetty-ee9-websocket-jetty-client</module>
+    <module>jetty-ee9-websocket-jetty-client-webapp</module>
     <module>jetty-ee9-websocket-jetty-server</module>
     <module>jetty-ee9-websocket-jetty-tests</module>
     <module>jetty-ee9-websocket-servlet</module>

jetty-ee9/pom.xml

@@ -198,6 +198,11 @@
         <artifactId>jetty-ee9-websocket-jetty-client</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.ee9.websocket</groupId>
+        <artifactId>jetty-ee9-websocket-jetty-client-webapp</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.ee9.websocket</groupId>
         <artifactId>jetty-ee9-websocket-jetty-common</artifactId>