You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/12/02 11:34:31 UTC

svn commit: r1772329 - in /qpid/java/trunk: broker/src/main/java/org/apache/qpid/server/Main.java doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml

Author: kwall
Date: Fri Dec  2 11:34:31 2016
New Revision: 1772329

URL: http://svn.apache.org/viewvc?rev=1772329&view=rev
Log:
QPID-7487: [Java Broker] Remove dead command line option --overwrite-store

Modified:
    qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java
    qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml

Modified: qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1772329&r1=1772328&r2=1772329&view=diff
==============================================================================
--- qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java Fri Dec  2 11:34:31 2016
@@ -83,9 +83,6 @@ public class Main
     private static final Option OPTION_INITIAL_CONFIGURATION_PATH = OptionBuilder.withArgName("path").hasArg()
             .withDescription("set the location of initial JSON config to use when creating/overwriting a broker configuration store").withLongOpt("initial-config-path").create("icp");
 
-    private static final Option OPTION_OVERWRITE_CONFIGURATION_STORE = OptionBuilder.withDescription("overwrite the broker configuration store with the current initial configuration")
-            .withLongOpt("overwrite-store").create("os");
-
     private static final Option OPTION_CREATE_INITIAL_CONFIG = OptionBuilder.withArgName("path").hasOptionalArg().withDescription("create a copy of the initial config file, either to an" +
             " optionally specified file path, or as " + SystemConfig.DEFAULT_INITIAL_CONFIG_NAME + " in the current directory")
             .withLongOpt("create-initial-config").create("cic");
@@ -114,7 +111,6 @@ public class Main
         OPTIONS.addOption(OPTION_VERSION);
         OPTIONS.addOption(OPTION_CONFIGURATION_STORE_PATH);
         OPTIONS.addOption(OPTION_CONFIGURATION_STORE_TYPE);
-        OPTIONS.addOption(OPTION_OVERWRITE_CONFIGURATION_STORE);
         OPTIONS.addOption(OPTION_CREATE_INITIAL_CONFIG);
         OPTIONS.addOption(OPTION_INITIAL_CONFIGURATION_PATH);
         OPTIONS.addOption(OPTION_MANAGEMENT_MODE);

Modified: qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml?rev=1772329&r1=1772328&r2=1772329&view=diff
==============================================================================
--- qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml (original)
+++ qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml Fri Dec  2 11:34:31 2016
@@ -130,11 +130,6 @@
                                                       stay in the quiesced
                                                       state during
                                                       management mode.
- -os,--overwrite-store                                overwrite the broker
-                                                      configuration store
-                                                      with the current
-                                                      initial
-                                                      configuration
  -prop,--config-property <name=value>                 set a configuration
                                                       property to use when
                                                       resolving variables



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org