You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/11/26 15:33:15 UTC

svn commit: r1716690 - in /qpid/java/branches/6.0.x: ./ broker-core/src/main/resources/ doc/book/src/java-broker/ doc/book/src/java-broker/management/channels/

Author: orudyy
Date: Thu Nov 26 14:33:15 2015
New Revision: 1716690

URL: http://svn.apache.org/viewvc?rev=1716690&view=rev
Log:
QPID-6913: [Java Broker] Remove JMX from default configuration
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1716497 https://svn.apache.org/repos/asf/qpid/java/trunk

Modified:
    qpid/java/branches/6.0.x/   (props changed)
    qpid/java/branches/6.0.x/broker-core/src/main/resources/initial-config.json
    qpid/java/branches/6.0.x/doc/book/src/java-broker/   (props changed)
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-JMX.xml

Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:33:15 2015
@@ -9,5 +9,5 @@
 /qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
 /qpid/branches/java-network-refactor/qpid/java:805429-821809
 /qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497
 /qpid/trunk/qpid:796646-796653

Modified: qpid/java/branches/6.0.x/broker-core/src/main/resources/initial-config.json
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/resources/initial-config.json?rev=1716690&r1=1716689&r2=1716690&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-core/src/main/resources/initial-config.json (original)
+++ qpid/java/branches/6.0.x/broker-core/src/main/resources/initial-config.json Thu Nov 26 14:33:15 2015
@@ -90,22 +90,13 @@
     "port" : "${qpid.http_port}",
     "authenticationProvider" : "passwordFile",
     "protocols" : [ "HTTP" ]
-  }, {
-    "name" : "RMI_REGISTRY",
-    "port" : "${qpid.rmi_port}",
-    "protocols" : [ "RMI" ]
-  }, {
-    "name" : "JMX_CONNECTOR",
-    "port" : "${qpid.jmx_port}",
-    "authenticationProvider" : "passwordFile",
-    "protocols" : [ "JMX_RMI" ]
   }],
   "virtualhostnodes" : [ {
     "name" : "default",
     "type" : "JSON",
     "defaultVirtualHostNode" : "true",
     "virtualHostInitialConfiguration" : "${qpid.initial_config_virtualhost_config}"
-  } ],
+  }],
   "plugins" : [ {
     "type" : "MANAGEMENT-HTTP",
     "name" : "httpManagement"

Propchange: qpid/java/branches/6.0.x/doc/book/src/java-broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:33:15 2015
@@ -7,4 +7,4 @@
 /qpid/branches/mcpierce-QPID-4719/qpid/doc/book/src/java-broker:1477004-1477093
 /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/java/trunk/doc/book/src/java-broker:1716086-1716087,1716455,1716489
+/qpid/java/trunk/doc/book/src/java-broker:1716086-1716087,1716455,1716489,1716497

Modified: qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Getting-Started.xml?rev=1716690&r1=1716689&r2=1716690&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Getting-Started.xml (original)
+++ qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Getting-Started.xml Thu Nov 26 14:33:15 2015
@@ -51,10 +51,6 @@
 [Broker] BRK-1010 : Platform : JVM : Oracle Corporation version: 1.7.0_79-b15 OS : Windows 7 version: 6.1 arch: x86 cores: 4
 [Broker] BRK-1011 : Maximum Memory : Heap : 518,979,584 bytes Direct : 1,610,612,736 bytes
 [Broker] BRK-1002 : Starting : Listening on TCP port 5672
-[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] MNG-1001 : Web Management Startup
 [Broker] MNG-1002 : Starting : HTTP : Listening on port 8080
 [Broker] MNG-1004 : Web Management Ready
@@ -81,10 +77,6 @@
 [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-1004 : Qpid Broker Ready</screen>
     <para>The BRK-1004 message confirms that the Broker is ready for work.  The MNG-1002 and BRK-1002 confirm the ports on
     which the Broker is listening (for HTTP/JMX management and AMQP respectively).</para>

Modified: qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-JMX.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-JMX.xml?rev=1716690&r1=1716689&r2=1716690&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-JMX.xml (original)
+++ qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-JMX.xml Thu Nov 26 14:33:15 2015
@@ -42,30 +42,24 @@
                 linkend="Java-Broker-Management-Channel-Web-Console">Web Management
                     Console</link> and the <link
                         linkend="Java-Broker-Management-Channel-REST-API">REST API</link>. Use the
-                Web/REST interfaces in preference to JMX whenever possible. The JMX interface may be
+                Web/REST interfaces in preference to JMX whenever possible. The JMX interface will be
                 withdrawn in a future release.</para>
         </important>
     </section>
 
     <section id="Java-Broker-Management-Channel-JMX-Plugin-DefaultConfiguration">
         <title>Default Configuration</title>
-        <para>By default, the Broker is shipped with JMX enabled.</para>
-        <para>The RMI registry port runs on port <literal>8999</literal> and the JMX connector on
-            port <literal>9099</literal>. The connector is not SSL protected. Qpid will use the
-                <ulink
-                url="&oracleJdkDocUrl;java/lang/management/ManagementFactory.html#getPlatformMBeanServer()"
-                >Platform MBeanServer</ulink>.</para>
-        <para>To change these settings, use the <link
-            linkend="Java-Broker-Management-Channel-Web-Console">Web Management
-                interface</link>.</para>
+        <para>By default, the Broker is shipped with JMX <emphasis>disabled</emphasis>.
+            To enable it, it necessary to add two ports: one serving the protocol JMX_RMI and one for
+            the RMI registry.  This can be done using the Web Management Console.
+        </para>
     </section>
 
     <section id="Java-Broker-Management-Channel-JMX-Plugin-ConnectingToJMX">
         <title>Connecting to JMX</title>
-        <para>The following example uses Jconsole to illustrates how to connect to JMX and assume
-            the defaults described above. Jconsole is a management tool that comes with the JDK. It
-            provides a very simple view of the MBeans, but requires no special configuration to be
-            used with Qpid.</para>
+        <para>The following example uses Jconsole to illustrates how to connect to JMX using jconsole.
+            Jconsole is a management tool that comes with the JDK. It provides a very simple view of the MBeans,
+            but requires no special configuration to be used with Qpid.</para>
         <para>For full details of Jconsole itself refer to Oracle's <ulink url="&oracleJconsole;"
                 >JConsole Guide</ulink>.</para>
         <para>Jconsole can be used to connect to local or remote Java processes. On startup, it



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