Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3338 from eclipse/jetty-10.0.x-3333-standalone_jpms 

Fixes #3333 - Jetty 10 standalone cannot start on the module-path.
This commit is contained in:
Simone Bordet 2019-02-08 11:02:58 +01:00 committed by GitHub
parent e2506d4811 6f7e1e3c48
commit 39d8795c6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -585,6 +585,7 @@ public class StartArgs
} }
} }
} }
jmodAdds.add("ALL-MODULE-PATH");
StartLog.debug("Expanded JPMS directives:%nadd-modules: %s%npatch-modules: %s%nadd-opens: %s%nadd-exports: %s%nadd-reads: %s", StartLog.debug("Expanded JPMS directives:%nadd-modules: %s%npatch-modules: %s%nadd-opens: %s%nadd-exports: %s%nadd-reads: %s",
jmodAdds, jmodPatch, jmodOpens, jmodExports, jmodReads); jmodAdds, jmodPatch, jmodOpens, jmodExports, jmodReads);
} }
@ -1110,7 +1111,8 @@ public class StartArgs
if ("--jpms".equals(arg)) if ("--jpms".equals(arg))
{ {
jpms = true; jpms = true;
// Need to fork because we cannot use JDK 9 Module APIs. // Forking is simpler; otherwise we need to add the
// JPMS directives such as "--add-modules" via API.
exec = true; exec = true;
return; return;
} }

23
jetty-websocket/javax-websocket-server/src/main/config/modules/websocket.mod
View File

@ -1,15 +1,18 @@
DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
[description] [description]
Enable websockets for deployed web applications Enable websockets for deployed web applications
[depend] [depend]
# websocket client needs jetty-client # websocket client needs jetty-client
client client
# javax.websocket needs annotations # javax.websocket needs annotations
annotations annotations
[lib]
lib/websocket/*.jar
[lib]
lib/websocket/*.jar
[jpms]
# The implementation needs to access method handles in
# classes that are in the web application classloader.
add-reads: org.eclipse.jetty.websocket.javax.common=ALL-UNNAMED