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 2018/05/15 07:52:41 UTC

[2/2] qpid-broker-j git commit: QPID-8167: [Broker-J] Fix documentation and the name of a constant.

QPID-8167: [Broker-J] Fix documentation and the name of a constant.


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/2d85f73e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/2d85f73e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/2d85f73e

Branch: refs/heads/master
Commit: 2d85f73e6704f3b69d40611fd6d52895067fc093
Parents: 86b31af
Author: Keith Wall <kw...@apache.org>
Authored: Tue May 15 08:52:07 2018 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Tue May 15 08:52:07 2018 +0100

----------------------------------------------------------------------
 broker/src/main/java/org/apache/qpid/server/Main.java  | 13 +++++++------
 .../src/docbkx/Java-Broker-Getting-Started.xml         |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2d85f73e/broker/src/main/java/org/apache/qpid/server/Main.java
----------------------------------------------------------------------
diff --git a/broker/src/main/java/org/apache/qpid/server/Main.java b/broker/src/main/java/org/apache/qpid/server/Main.java
index 446cf8b..407eea2 100644
--- a/broker/src/main/java/org/apache/qpid/server/Main.java
+++ b/broker/src/main/java/org/apache/qpid/server/Main.java
@@ -132,10 +132,11 @@ public class Main
                                                                .longOpt("management-mode")
                                                                .build();
 
-    private static final Option OPTION_MM_QUIESCE_VHOST = Option.builder("mmqv")
-                                                                .desc("make virtual host nodes stay in the quiesced state during management mode")
-                                                                .longOpt("management-mode-quiesce-virtualhostnodes")
-                                                                .build();
+    private static final Option OPTION_MM_QUIESCE_VHOST_NODE = Option.builder("mmqv")
+                                                                     .desc("make virtual host nodes stay in the "
+                                                                           + "quiesced state during management mode")
+                                                                     .longOpt("management-mode-quiesce-virtualhostnodes")
+                                                                     .build();
 
     private static final Option OPTION_MM_HTTP_PORT = Option.builder("mmhttp")
                                                             .argName("port")
@@ -170,7 +171,7 @@ public class Main
         OPTIONS.addOption(OPTION_CREATE_INITIAL_CONFIG);
         OPTIONS.addOption(OPTION_INITIAL_CONFIGURATION_PATH);
         OPTIONS.addOption(OPTION_MANAGEMENT_MODE);
-        OPTIONS.addOption(OPTION_MM_QUIESCE_VHOST);
+        OPTIONS.addOption(OPTION_MM_QUIESCE_VHOST_NODE);
         OPTIONS.addOption(OPTION_MM_HTTP_PORT);
         OPTIONS.addOption(OPTION_MM_PASSWORD);
         OPTIONS.addOption(OPTION_CONFIGURATION_PROPERTY);
@@ -276,7 +277,7 @@ public class Main
                     attributes.put(SystemConfig.MANAGEMENT_MODE_HTTP_PORT_OVERRIDE, httpPort);
                 }
 
-                boolean quiesceVhosts = _commandLine.hasOption(OPTION_MM_QUIESCE_VHOST.getOpt());
+                boolean quiesceVhosts = _commandLine.hasOption(OPTION_MM_QUIESCE_VHOST_NODE.getOpt());
                 attributes.put(SystemConfig.MANAGEMENT_MODE_QUIESCE_VIRTUAL_HOSTS, quiesceVhosts);
 
                 String password = _commandLine.getOptionValue(OPTION_MM_PASSWORD.getOpt());

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2d85f73e/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml b/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml
index 3d7a95e..54fd58a 100644
--- a/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml
+++ b/doc/java-broker/src/docbkx/Java-Broker-Getting-Started.xml
@@ -126,7 +126,7 @@
  -mmpass,--management-mode-password &lt;password&gt;        Set the password for
                                                       the management mode
                                                       user mm_admin
- -mmqv,--management-mode-quiesce-virtualhosts         make virtualhosts
+ -mmqv,--management-mode-quiesce-virtualhostnodes     make virtualhost nodes
                                                       stay in the quiesced
                                                       state during
                                                       management mode.


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