Merge pull request #4536 from eclipse/jetty-10.0.x-4447-websocketModules

Issue #4447 - separate modules for jetty and javax websockets

jetty-websocket/websocket-core/src/main/config/modules/websocket.mod

@@ -0,0 +1,11 @@
+DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[description]
+Enable both jetty and javax websocket modules for deployed web applications.
+
+[tags]
+websocket
+
+[depend]
+websocket-jetty
+websocket-javax

jetty-websocket/websocket-javax-server/src/main/config/modules/websocket.mod → jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod

@@ -1,16 +1,20 @@
 DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enable websockets for deployed web applications
+Enable javax.websocket for deployed web applications.
+
+[tags]
+websocket
 
 [depend]
-# websocket client needs jetty-client
 client
-# javax.websocket needs annotations
 annotations
 
 [lib]
-lib/websocket/*.jar
+lib/websocket/websocket-core-${jetty.version}.jar
+lib/websocket/websocket-servlet-${jetty.version}.jar
+lib/websocket/jetty-javax-websocket-api-1.1.2.jar
+lib/websocket/websocket-javax-*.jar
 
 [jpms]
 # The implementation needs to access method handles in

jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod

@@ -0,0 +1,21 @@
+DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[description]
+Enable the Jetty WebSocket API for deployed web applications.
+
+[tags]
+websocket
+
+[depend]
+client
+annotations
+
+[lib]
+lib/websocket/websocket-core-${jetty.version}.jar
+lib/websocket/websocket-servlet-${jetty.version}.jar
+lib/websocket/websocket-jetty-*.jar
+
+[jpms]
+# The implementation needs to access method handles in
+# classes that are in the web application classloader.
+add-reads: org.eclipse.jetty.websocket.common=ALL-UNNAMED