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 2012/11/28 19:44:10 UTC
svn commit: r1414860 - in /qpid/branches/0.20/qpid: doc/book/src/java-broker/
doc/book/src/java-broker/Java-Broker-Getting-Started.xml java/broker/bin/
java/broker/bin/qpid-server.bat
Author: robbie
Date: Wed Nov 28 18:44:10 2012
New Revision: 1414860
URL: http://svn.apache.org/viewvc?rev=1414860&view=rev
Log:
QPID-4456: ensure the qpid-server.bat script for windows picks up the broker plugins. Update example output from running the startup commands.
merge from trunk r1413444
Modified:
qpid/branches/0.20/qpid/doc/book/src/java-broker/ (props changed)
qpid/branches/0.20/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
qpid/branches/0.20/qpid/java/broker/bin/ (props changed)
qpid/branches/0.20/qpid/java/broker/bin/qpid-server.bat
Propchange: qpid/branches/0.20/qpid/doc/book/src/java-broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 28 18:44:10 2012
@@ -0,0 +1,7 @@
+/qpid/branches/0.5.x-dev/qpid/doc/book/src/java-broker:892761,894875
+/qpid/branches/0.6-release-windows-installer/doc/book/src/java-broker:926803
+/qpid/branches/0.6-release-windows-installer/qpid/doc/book/src/java-broker:926803,927233
+/qpid/branches/java-network-refactor/qpid/doc/book/src/java-broker:805429-825319
+/qpid/branches/qpid-2935/qpid/doc/book/src/java-broker:1061302-1072333
+/qpid/branches/qpid-3346/qpid/doc/book/src/java-broker:1144319-1179855
+/qpid/trunk/qpid/doc/book/src/java-broker:1412358-1412359,1413415,1413444
Modified: qpid/branches/0.20/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml?rev=1414860&r1=1414859&r2=1414860&view=diff
==============================================================================
--- qpid/branches/0.20/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml (original)
+++ qpid/branches/0.20/qpid/doc/book/src/java-broker/Java-Broker-Getting-Started.xml Wed Nov 28 18:44:10 2012
@@ -36,22 +36,25 @@
<title>Starting/Stopping on Windows</title>
<para>Firstly change to the installation directory used during the <link linkend="Java-Broker-Installation-InstallationWindows">installation</link>
and ensure that the <link linkend="Java-Broker-Installation-InstallationWindows-SettingQPIDWORK">QPID_WORK environment variable is set</link>.</para>
- <para>Now use the qpid-server.bat to start the server</para>
+ <para>Now use the <command>qpid-server.bat</command> to start the server</para>
<programlisting><![CDATA[bin\qpid-server.bat]]></programlisting>
<para>Output similar to the following will be seen:</para>
<screen>[Broker] BRK-1006 : Using configuration : C:\qpid\qpid-broker-&qpidCurrentRelease;\etc\config.xml
[Broker] BRK-1007 : Using logging configuration : C:\qpid\qpid-broker-&qpidCurrentRelease;\etc\log4j.xml
-[Broker] MNG-1001 : Startup
-[Broker] MNG-1002 : Starting : RMI Registry : Listening on port 8999
-[Broker] MNG-1002 : Starting : JMX RMIConnectorServer : Listening on port 9099
-[Broker] MNG-1004 : Ready
-[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: 1363863
+[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: 1411386
[Broker] BRK-1010 : Platform : JVM : Sun Microsystems Inc. version: 1.6.0_24-b07 OS : Windows 7 version: 6.1 arch: amd64
[Broker] BRK-1011 : Maximum Memory : 1,069,416,448 bytes
+[Broker] MNG-1001 : Web Management Startup
+[Broker] MNG-1002 : Starting : HTTP : Listening on port 8080
+[Broker] MNG-1004 : Web Management Ready
+[Broker] MNG-1001 : JMX Management Startup
+[Broker] MNG-1002 : Starting : RMI Registry : Listening on port 8999
+[Broker] MNG-1002 : Starting : JMX RMIConnectorServer : Listening on port 9099
+[Broker] MNG-1004 : JMX Management Ready
[Broker] BRK-1002 : Starting : Listening on TCP port 5672
[Broker] BRK-1004 : Qpid Broker Ready</screen>
- <para>The BRK-1004 message confirms that the Broker is ready for work. The MNG-1002 and BRK-1004 confirm the ports to
- which the Broker is listening (for JMX management and AMQP respectively).</para>
+ <para>The BRK-1004 message confirms that the Broker is ready for work. The MNG-1002 and BRK-1002 confirm the ports to
+ which the Broker is listening (for HTTP/JMX management and AMQP respectively).</para>
<para>To stop the Broker, use Control-C or use the Shutdown MBean made from the <xref
linkend="Java-Broker-Configuring-And-Managing-JMX"/></para>
</section>
@@ -64,17 +67,20 @@
<para>Output similar to the following will be seen:</para>
<screen>[Broker] BRK-1006 : Using configuration : /usr/local/qpid/qpid-broker-&qpidCurrentRelease;/etc/config.xml
[Broker] BRK-1007 : Using logging configuration : /usr/local/qpid/qpid-broker-&qpidCurrentRelease;/etc/log4j.xml
-[Broker] MNG-1001 : Startup
+[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: 1411386
+[Broker] BRK-1010 : Platform : JVM : Apple Inc. version: 1.6.0_35-b10-428-11M3811 OS : Mac OS X version: 10.8.2 arch: x86_64
+[Broker] BRK-1011 : Maximum Memory : 1,070,399,488 bytes
+[Broker] MNG-1001 : Web Management Startup
+[Broker] MNG-1002 : Starting : HTTP : Listening on port 8080
+[Broker] MNG-1004 : Web Management Ready
+[Broker] MNG-1001 : JMX Management Startup
[Broker] MNG-1002 : Starting : RMI Registry : Listening on port 8999
[Broker] MNG-1002 : Starting : JMX RMIConnectorServer : Listening on port 9099
-[Broker] MNG-1004 : Ready
-[Broker] BRK-1001 : Startup : Version: &qpidCurrentRelease; Build: 1363863
-[Broker] BRK-1010 : Platform : JVM : Apple Inc. version: 1.6.0_35-b10-428-11M3811 OS : Mac OS X version: 10.8.2 arch: x86_64
-[Broker] BRK-1011 : Maximum Memory : 1,069,416,448 bytes
+[Broker] MNG-1004 : JMX Management Ready
[Broker] BRK-1002 : Starting : Listening on TCP port 5672
[Broker] BRK-1004 : Qpid Broker Ready</screen>
- <para>The BRK-1004 message confirms that the Broker is ready for work. The MNG-1002 and BRK-1004 confirm the ports to
- which the Broker is listening (for JMX management and AMQP respectively).</para>
+ <para>The BRK-1004 message confirms that the Broker is ready for work. The MNG-1002 and BRK-1002 confirm the ports to
+ which the Broker is listening (for HTTP/JMX management and AMQP respectively).</para>
<para>To stop the Broker, use Control-C from the controlling shell, use the
<command>bin/qpid.stop</command> script, or use <command>kill -TERM <pid></command> or
the Shutdown MBean from <xref linkend="Java-Broker-Configuring-And-Managing-JMX"/></para>
Propchange: qpid/branches/0.20/qpid/java/broker/bin/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/bin:r1413444
Modified: qpid/branches/0.20/qpid/java/broker/bin/qpid-server.bat
URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/broker/bin/qpid-server.bat?rev=1414860&r1=1414859&r2=1414860&view=diff
==============================================================================
--- qpid/branches/0.20/qpid/java/broker/bin/qpid-server.bat (original)
+++ qpid/branches/0.20/qpid/java/broker/bin/qpid-server.bat Wed Nov 28 18:44:10 2012
@@ -76,8 +76,8 @@ echo Using CLASSPATH: %CLASSPATH%
goto afterQpidClasspath
:noQpidClasspath
-echo Warning: Qpid classpath not set. CLASSPATH set to %QPID_HOME%\lib\qpid-all.jar
-set CLASSPATH=%QPID_HOME%\lib\qpid-all.jar;%QPID_HOME%\lib\opt\*
+echo Warning: Qpid classpath not set. CLASSPATH set to %QPID_HOME%\lib\qpid-all.jar;%QPID_HOME%\lib\plugins\*;%QPID_HOME%\lib\opt\*
+set CLASSPATH=%QPID_HOME%\lib\qpid-all.jar;%QPID_HOME%\lib\plugins\*;%QPID_HOME%\lib\opt\*
:afterQpidClasspath
REM start parsing -run arguments
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org