From a7c0c574969e0944efbd9e82efe967a5406dc24f Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 31 Jan 2020 15:58:20 +1100 Subject: [PATCH 1/3] Issue #4447 - separate modules for jetty and javax websockets Signed-off-by: Lachlan Roberts --- .../src/main/config/modules/websocket.mod | 11 ++++++++++ .../{websocket.mod => websocket-javax.mod} | 12 +++++++---- .../main/config/modules/websocket-jetty.mod | 21 +++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 jetty-websocket/websocket-core/src/main/config/modules/websocket.mod rename jetty-websocket/websocket-javax-server/src/main/config/modules/{websocket.mod => websocket-javax.mod} (53%) create mode 100644 jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod diff --git a/jetty-websocket/websocket-core/src/main/config/modules/websocket.mod b/jetty-websocket/websocket-core/src/main/config/modules/websocket.mod new file mode 100644 index 000000000000..da53af6d2e2a --- /dev/null +++ b/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 diff --git a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket.mod b/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod similarity index 53% rename from jetty-websocket/websocket-javax-server/src/main/config/modules/websocket.mod rename to jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod index d0136c4ca221..b7bdc822e0f3 100644 --- a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket.mod +++ b/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-${websocket.api.version}.jar +lib/websocket/websocket-javax-*.jar [jpms] # The implementation needs to access method handles in diff --git a/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod new file mode 100644 index 000000000000..b5e8fb98aeaf --- /dev/null +++ b/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 jetty websocket 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 From 3344772e2f058d576ef704cb7980cf9f85b87a65 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 3 Feb 2020 18:29:46 +1100 Subject: [PATCH 2/3] Issue #4447 - hard code in version for javax-websocket-api 1.1.2 Signed-off-by: Lachlan Roberts --- .../src/main/config/modules/websocket-javax.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod b/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod index b7bdc822e0f3..26f3514a7539 100644 --- a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod +++ b/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod @@ -13,7 +13,7 @@ annotations [lib] lib/websocket/websocket-core-${jetty.version}.jar lib/websocket/websocket-servlet-${jetty.version}.jar -lib/websocket/jetty-javax-websocket-api-${websocket.api.version}.jar +lib/websocket/jetty-javax-websocket-api-1.1.2.jar lib/websocket/websocket-javax-*.jar [jpms] From b3144dd401ef7da417dbe1a2da8b3db24421e1f6 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 7 Feb 2020 16:14:32 +1100 Subject: [PATCH 3/3] Issue #4447 - update websocket-jetty module description Signed-off-by: Lachlan Roberts --- .../src/main/config/modules/websocket-jetty.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod index b5e8fb98aeaf..e5fd060373f9 100644 --- a/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod +++ b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod @@ -1,7 +1,7 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html [description] -Enable jetty websocket for deployed web applications. +Enable the Jetty WebSocket API for deployed web applications. [tags] websocket