equal
deleted
inserted
replaced
163 Properties argProps = parseString(args); |
163 Properties argProps = parseString(args); |
164 Properties configProps = new Properties(); |
164 Properties configProps = new Properties(); |
165 |
165 |
166 // Load the management properties from the config file |
166 // Load the management properties from the config file |
167 // if config file is not specified readConfiguration implicitly |
167 // if config file is not specified readConfiguration implicitly |
168 // reads <java.home>/lib/management/management.properties |
168 // reads <java.home>/conf/management/management.properties |
169 |
169 |
170 String fname = System.getProperty(CONFIG_FILE); |
170 String fname = System.getProperty(CONFIG_FILE); |
171 readConfiguration(fname, configProps); |
171 readConfiguration(fname, configProps); |
172 |
172 |
173 // management properties can be overridden by system properties |
173 // management properties can be overridden by system properties |
402 String home = System.getProperty("java.home"); |
402 String home = System.getProperty("java.home"); |
403 if (home == null) { |
403 if (home == null) { |
404 throw new Error("Can't find java.home ??"); |
404 throw new Error("Can't find java.home ??"); |
405 } |
405 } |
406 StringBuilder defaultFileName = new StringBuilder(home); |
406 StringBuilder defaultFileName = new StringBuilder(home); |
407 defaultFileName.append(File.separator).append("lib"); |
407 defaultFileName.append(File.separator).append("conf"); |
408 defaultFileName.append(File.separator).append("management"); |
408 defaultFileName.append(File.separator).append("management"); |
409 defaultFileName.append(File.separator).append("management.properties"); |
409 defaultFileName.append(File.separator).append("management.properties"); |
410 // Set file name |
410 // Set file name |
411 fname = defaultFileName.toString(); |
411 fname = defaultFileName.toString(); |
412 } |
412 } |