diff options
Diffstat (limited to 'qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java index 4927956c6c..ddda137bcc 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java @@ -48,11 +48,8 @@ public class Main private static final Option OPTION_CONFIGURATION_STORE_TYPE = OptionBuilder.withArgName("type").hasArg() .withDescription("use given store type").withLongOpt("store-type").create("st"); - private static final Option OPTION_INITIAL_CONFIGURATION_STORE_PATH = OptionBuilder.withArgName("path").hasArg() - .withDescription("pass the location of initial store to use to create a user store").withLongOpt("initial-store-path").create("isp"); - - private static final Option OPTION_INITIAL_CONFIGURATION_STORE_TYPE = OptionBuilder.withArgName("type").hasArg() - .withDescription("the type of initial store").withLongOpt("initial-store-type").create("ist"); + private static final Option OPTION_INITIAL_CONFIGURATION_PATH = OptionBuilder.withArgName("path").hasArg() + .withDescription("pass the location of initial JSON config to use when creating a new configuration store").withLongOpt("initial-config-path").create("icp"); private static final Option OPTION_LOG_CONFIG_FILE = OptionBuilder.withArgName("file").hasArg() @@ -84,8 +81,7 @@ public class Main OPTIONS.addOption(OPTION_CONFIGURATION_STORE_TYPE); OPTIONS.addOption(OPTION_LOG_CONFIG_FILE); OPTIONS.addOption(OPTION_LOG_WATCH); - OPTIONS.addOption(OPTION_INITIAL_CONFIGURATION_STORE_PATH); - OPTIONS.addOption(OPTION_INITIAL_CONFIGURATION_STORE_TYPE); + OPTIONS.addOption(OPTION_INITIAL_CONFIGURATION_PATH); OPTIONS.addOption(OPTION_MANAGEMENT_MODE); OPTIONS.addOption(OPTION_RMI_PORT); OPTIONS.addOption(OPTION_CONNECTOR_PORT); @@ -194,15 +190,10 @@ public class Main options.setLogConfigFile(logConfig); } - String initialConfigurationStore = _commandLine.getOptionValue(OPTION_INITIAL_CONFIGURATION_STORE_PATH.getOpt()); - if (initialConfigurationStore != null) - { - options.setInitialConfigurationStoreLocation(initialConfigurationStore); - } - String initailConfigurationStoreType = _commandLine.getOptionValue(OPTION_INITIAL_CONFIGURATION_STORE_TYPE.getOpt()); - if (initailConfigurationStoreType != null) + String initialConfigLocation = _commandLine.getOptionValue(OPTION_INITIAL_CONFIGURATION_PATH.getOpt()); + if (initialConfigLocation != null) { - options.setInitialConfigurationStoreType(initailConfigurationStoreType); + options.setInitialConfigurationLocation(initialConfigLocation); } boolean managmentMode = _commandLine.hasOption(OPTION_MANAGEMENT_MODE.getOpt()); |