You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/05/24 13:33:07 UTC
svn commit: r1486017 - in /qpid/trunk/qpid:
doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml
doc/book/src/java-broker/Java-Broker-Getting-Started.xml
java/broker/src/main/java/org/apache/qpid/server/Main.java
Author: robbie
Date: Fri May 24 11:33:07 2013
New Revision: 1486017
URL: http://svn.apache.org/r1486017
Log:
QPID-4881: update docs/help to use quotes for the config property argument, as will be required when using the startup script on Windows
Modified:
qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml
qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml?rev=1486017&r1=1486016&r2=1486017&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Configuring-And-Managing-Config-Files.xml Fri May 24 11:33:07 2013
@@ -278,7 +278,7 @@ $ ./qpid-server -st memory
</para>
<screen>
-$ ./qpid-server -prop qpid.amqp_port=10000 -prop qpid.http_port=10001
+$ ./qpid-server -prop "qpid.amqp_port=10000" -prop "qpid.http_port=10001"
</screen>
<para>
In the example above, property used to set the port number of the default AMQP port is specified with the value 10000, overriding the default value of 5672, and similarly the vlaue 10001 is used to override the default HTTP port number of 8080.
@@ -289,10 +289,9 @@ $ ./qpid-server -prop qpid.amqp_port=100
NOTE: when saving the broker Configuration Store, either during initialisation when generating any required IDs for the 'Initial Configuration', or when required following user-prompted change via the managmenet interface, values are
stored in their resolved state. As such, if a Configuration Store already exists when the broker is started, it is likely that setting a Configuration Property to a value different than it was previously set could have no effect.
</para>
-
-
-
-
+ <para>
+ NOTE: When running the broker on Windows and starting it via the qpid-server.bat file, the "name=value" argument MUST be quoted.
+ </para>
</section>
Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml?rev=1486017&r1=1486016&r2=1486017&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml Fri May 24 11:33:07 2013
@@ -152,10 +152,10 @@
-os Overwrite the broker configuration store
--overwrite-store with the current initial configuration
- -prop <name=value> Set a configuration property to use when
- --config-property <name=value> resolving variables in the broker
+ -prop "<name=value>" Set a configuration property to use when
+ --config-property "<name=value>" resolving variables in the broker
configuration store, with format
- 'name=value'
+ "name=value"
-sp <path> Use given configuration store location
--store-path <path>
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1486017&r1=1486016&r2=1486017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java Fri May 24 11:33:07 2013
@@ -61,7 +61,7 @@ public class Main
.withLongOpt("create-initial-config").create("cic");
private static final Option OPTION_CONFIGURATION_PROPERTY = OptionBuilder.withArgName("name=value").hasArg()
- .withDescription("set a configuration property to use when resolving variables in the broker configuration store, with format 'name=value'")
+ .withDescription("set a configuration property to use when resolving variables in the broker configuration store, with format \"name=value\"")
.withLongOpt("config-property").create("prop");
private static final Option OPTION_LOG_CONFIG_FILE =
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org