changeset 11389:1e921eaad167

java -help failing and output out of date
author alanb
date Fri, 12 Dec 2014 12:55:43 +0000
parents 5b1eceaf0cfd
children 1ad0aace4247
files src/java.base/share/classes/jdk/jigsaw/module/runtime/ModuleBootstrap.java src/java.base/share/classes/sun/launcher/resources/launcher.properties
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/jdk/jigsaw/module/runtime/ModuleBootstrap.java	Fri Dec 12 11:12:14 2014 +0000
+++ b/src/java.base/share/classes/jdk/jigsaw/module/runtime/ModuleBootstrap.java	Fri Dec 12 12:55:43 2014 +0000
@@ -137,7 +137,7 @@
         // modules into the set of modules to resolve.
         Set<String> input = Collections.emptySet();
         String cp = System.getProperty("java.class.path");
-        if (cp != null && cp.length() > 0) {
+        if (mainMid == null || (cp != null && cp.length() > 0)) {
             input = finder.allModules()
                           .stream()
                           .map(md -> md.descriptor().name())
--- a/src/java.base/share/classes/sun/launcher/resources/launcher.properties	Fri Dec 12 11:12:14 2014 +0000
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher.properties	Fri Dec 12 12:55:43 2014 +0000
@@ -47,7 +47,8 @@
 \    -module-path <module path>...\n\
 \                  A {0} separated list of directories containing module artifacts\n\
 \    -m <mid> | <module-name>/<main-class>\n\
-\    -mods <module-name>[,<module-name>...]\n\
+\    -addmods <module-name>[,<module-name>...]\n\
+\    -limitmods <module-name>[,<module-name>...]\n
 \    -D<name>=<value>\n\
 \                  set a system property\n\
 \    -verbose:[class|gc|jni]\n\
@@ -114,9 +115,11 @@
 \                      show all property settings and continue\n\
 \    -XshowSettings:locale\n\
 \                      show all locale related settings and continue\n\
-\    -XlistModules     list modules installed in the runtime\n\
+\    -Xoverride:<dir>  directory of module names, each containing class files to\n\
+\                      override the classes in modules linked into the runtime\n\
+\    -XlistModules     list modules linked into the runtime\n\
 \    -XlistModules:verbose\n\
-\                      list modules installed in the runtime with lots of detail\n\n\
+\                      list modules lined into the runtime with lots of detail\n\n\
 The -X options are non-standard and subject to change without notice.\n
 
 # Translators please note do not translate the options themselves