jdk-sandbox: comparison jdk/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java

equal deleted inserted replaced

-:4e69b50ccd97
+:86a49ba76f52
 * Initializes/boots the module system.
 *
 * The {@link #boot() boot} method is called early in the startup to initialize
 * the module system. In summary, the boot method creates a Configuration by
 * resolving a set of module names specified via the launcher (or equivalent)
-* -m and -addmods options. The modules are located on a module path that is
+* -m and --add-modules options. The modules are located on a module path that
-* constructed from the upgrade module path, system modules, and application
+* is constructed from the upgrade module path, system modules, and application
 * module path. The Configuration is instantiated as the boot Layer with each
 * module in the the configuration defined to one of the built-in class loaders.
 */
 public final class ModuleBootstrap {
 PerfCounters.defineBaseTime.addElapsedTimeFrom(t1);
 long t2 = System.nanoTime();
-// -upgrademodulepath option specified to launcher
+// --upgrade-module-path option specified to launcher
 ModuleFinder upgradeModulePath
-= createModulePathFinder("jdk.upgrade.module.path");
+= createModulePathFinder("jdk.module.upgrade.path");
 if (upgradeModulePath != null)
 systemModules = ModuleFinder.compose(upgradeModulePath, systemModules);
-// -modulepath option specified to the launcher
+// --module-path option specified to the launcher
 ModuleFinder appModulePath = createModulePathFinder("jdk.module.path");
-// The module finder: [-upgrademodulepath] system [-modulepath]
+// The module finder: [--upgrade-module-path] system [--module-path]
 ModuleFinder finder = systemModules;
 if (appModulePath != null)
 finder = ModuleFinder.compose(finder, appModulePath);
 // The root modules to resolve
 // launcher -m option to specify the main/initial module
 String mainModule = System.getProperty("jdk.module.main");
 if (mainModule != null)
 roots.add(mainModule);
-// additional module(s) specified by -addmods
+// additional module(s) specified by --add-modules
 boolean addAllDefaultModules = false;
 boolean addAllSystemModules = false;
 boolean addAllApplicationModules = false;
-String propValue = System.getProperty("jdk.launcher.addmods");
+String propValue = getAndRemoveProperty("jdk.module.addmods");
 if (propValue != null) {
 for (String mod: propValue.split(",")) {
 switch (mod) {
 case ALL_DEFAULT:
 addAllDefaultModules = true;
 roots.add(mod);
 }
 }
 }
-// -limitmods
+// --limit-modules
-propValue = System.getProperty("jdk.launcher.limitmods");
+propValue = getAndRemoveProperty("jdk.module.limitmods");
 if (propValue != null) {
 Set<String> mods = new HashSet<>();
 for (String mod: propValue.split(",")) {
 mods.add(mod);
 }
 }
 }
 }
 }
-// If `-addmods ALL-SYSTEM` is specified then all observable system
+// If `--add-modules ALL-SYSTEM` is specified then all observable system
 // modules will be resolved.
 if (addAllSystemModules) {
 ModuleFinder f = finder;  // observable modules
 systemModules.findAll()
 .stream()
 .map(ModuleDescriptor::name)
 .filter(mn -> f.find(mn).isPresent())  // observable
 .forEach(mn -> roots.add(mn));
 }
-// If `-addmods ALL-MODULE-PATH` is specified then all observable
+// If `--add-modules ALL-MODULE-PATH` is specified then all observable
 // modules on the application module path will be resolved.
-if  (appModulePath != null && addAllApplicationModules) {
+if (appModulePath != null && addAllApplicationModules) {
 ModuleFinder f = finder;  // observable modules
 appModulePath.findAll()
 .stream()
 .map(ModuleReference::descriptor)
 .map(ModuleDescriptor::name)
 // determine if post resolution checks are needed
 boolean needPostResolutionChecks = true;
 if (baseUri.getScheme().equals("jrt")   // toLowerCase not needed here
 && (upgradeModulePath == null)
 && (appModulePath == null)
-&& (System.getProperty("jdk.launcher.patch.0") == null)) {
+&& (!ModulePatcher.isBootLayerPatched())) {
 needPostResolutionChecks = false;
 }
 PrintStream traceOutput = null;
 if (Boolean.getBoolean("jdk.launcher.traceResolver"))
 }
 PerfCounters.loadModulesTime.addElapsedTimeFrom(t5);
-// -XaddReads and -XaddExports
+// --add-reads and --add-exports
 addExtraReads(bootLayer);
 addExtraExports(bootLayer);
 // total time to initialize
 PerfCounters.bootstrapTime.addElapsedTimeFrom(t0);
 }
 }
 /**
-* Process the -XaddReads options to add any additional read edges that
+* Process the --add-reads options to add any additional read edges that
 * are specified on the command-line.
 */
 private static void addExtraReads(Layer bootLayer) {
 // decode the command line options
-Map<String, Set<String>> map = decode("jdk.launcher.addreads.");
+Map<String, Set<String>> map = decode("jdk.module.addreads.");
 for (Map.Entry<String, Set<String>> e : map.entrySet()) {
 // the key is $MODULE
 String mn = e.getKey();
 }
 }
 /**
-* Process the -XaddExports options to add any additional read edges that
+* Process the --add-exports options to add any additional read edges that
 * are specified on the command-line.
 */
 private static void addExtraExports(Layer bootLayer) {
 // decode the command line options
-Map<String, Set<String>> map = decode("jdk.launcher.addexports.");
+Map<String, Set<String>> map = decode("jdk.module.addexports.");
 for (Map.Entry<String, Set<String>> e : map.entrySet()) {
 // the key is $MODULE/$PACKAGE
 String key = e.getKey();
 }
 }
 /**
-* Decodes the values of -XaddReads or -XaddExports options
+* Decodes the values of --add-reads or --add-exports options
 *
 * The format of the options is: $KEY=$MODULE(,$MODULE)*
 */
 private static Map<String, Set<String>> decode(String prefix) {
 int index = 0;
-String value = System.getProperty(prefix + index);
+// the system property is removed after decoding
+String value = getAndRemoveProperty(prefix + index);
 if (value == null)
 return Collections.emptyMap();
 Map<String, Set<String>> map = new HashMap<>();
 for (String s : rhs.split(",")) {
 if (s.length() > 0) values.add(s);
 }
 index++;
-value = System.getProperty(prefix + index);
+value = getAndRemoveProperty(prefix + index);
 }
 return map;
 }
+/**
+* Gets and remove the named system property
+*/
+private static String getAndRemoveProperty(String key) {
+return (String)System.getProperties().remove(key);
+}
 /**
 * Throws a RuntimeException with the given message
 */
 static void fail(String m) {

changeset 40261	86a49ba76f52
parent 38457	3d019217e322
child 41114	f83e9aebbab4