Update default protocol support / configuration

Updates the out of the box configuration files as shipped with the
distribution.  Changes the default connector to use port 61616 to aid
migration of ActiveMQ 5.x clients.  Configures acceptors with port and
protocol as follows:

61616: Core protocol, OpenWire, STOMP, AMQP
5445:  Core Protocol, STOMP (aimed at legacy HornetQ clients)
5672:  AMQP
61613: Stomp

distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml

@@ -37,13 +37,22 @@ under the License.
       <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
 
       <connectors>
-         <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
-         <connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
+         <!-- Default Connector.  Returned to clients during broadcast and distributed around cluster.  See broadcast and discovery-groups -->
+         <connector name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</connector>
       </connectors>
 
       <acceptors>
-         <acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
-         <acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
+         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP  -->
+         <acceptor name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</acceptor>
+
+         <!-- AMQP Connector.  Listens on default AMQP port for AMQP traffic.  -->
+         <acceptor name="amqp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5672}?protocols=AMQP</acceptor>
+
+         <!-- STOMP Acceptor.  Enables ActiveMQ Core protocol, OpenWire and STOMP.  -->
+         <acceptor name="stomp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61613}?protocols=STOMP</acceptor>
+
+         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients  -->
+         <acceptor name="hornetq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 
       <broadcast-groups>
@@ -51,7 +60,7 @@ under the License.
             <group-address>231.7.7.7</group-address>
             <group-port>9876</group-port>
             <broadcast-period>5000</broadcast-period>
-            <connector-ref>netty</connector-ref>
+            <connector-ref>activemq</connector-ref>
          </broadcast-group>
       </broadcast-groups>
 
@@ -66,7 +75,7 @@ under the License.
       <cluster-connections>
          <cluster-connection name="my-cluster">
             <address>jms</address>
-            <connector-ref>netty</connector-ref>
+            <connector-ref>activemq</connector-ref>
             <discovery-group-ref discovery-group-name="dg-group1"/>
          </cluster-connection>
       </cluster-connections>

distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml

@@ -35,13 +35,22 @@ under the License.
       <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
 
       <connectors>
-         <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
-         <connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
+         <!-- Default Connector.  Returned to clients during broadcast and distributed around cluster.  See broadcast and discovery-groups -->
+         <connector name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</connector>
       </connectors>
 
       <acceptors>
-         <acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
-         <acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
+         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP  -->
+         <acceptor name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</acceptor>
+
+         <!-- AMQP Connector.  Listens on default AMQP port for AMQP traffic.  -->
+         <acceptor name="amqp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5672}?protocols=AMQP</acceptor>
+
+         <!-- STOMP Acceptor.  Enables ActiveMQ Core protocol, OpenWire and STOMP.  -->
+         <acceptor name="stomp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61613}?protocols=STOMP</acceptor>
+
+         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients  -->
+         <acceptor name="hornetq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 
       <security-settings>

distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml

@@ -42,13 +42,22 @@ under the License.
       <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
 
       <connectors>
-         <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
-         <connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
+         <!-- Default Connector.  Returned to clients during broadcast. -->
+         <connector name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</connector>
       </connectors>
 
       <acceptors>
-         <acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
-         <acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
+         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP  -->
+         <acceptor name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</acceptor>
+
+         <!-- AMQP Connector.  Listens on default AMQP port for AMQP traffic.  -->
+         <acceptor name="amqp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5672}?protocols=AMQP</acceptor>
+
+         <!-- STOMP Acceptor.  Enables ActiveMQ Core protocol, OpenWire and STOMP.  -->
+         <acceptor name="stomp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61613}?protocols=STOMP</acceptor>
+
+         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients  -->
+         <acceptor name="hornetq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 
       <broadcast-groups>
@@ -56,7 +65,7 @@ under the License.
             <group-address>231.7.7.7</group-address>
             <group-port>9876</group-port>
             <broadcast-period>5000</broadcast-period>
-            <connector-ref>netty</connector-ref>
+            <connector-ref>activemq</connector-ref>
          </broadcast-group>
       </broadcast-groups>
 
@@ -71,7 +80,7 @@ under the License.
       <cluster-connections>
          <cluster-connection name="my-cluster">
             <address>jms</address>
-            <connector-ref>netty</connector-ref>
+            <connector-ref>activemq</connector-ref>
             <discovery-group-ref discovery-group-name="dg-group1"/>
          </cluster-connection>
       </cluster-connections>

distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml

@@ -42,13 +42,22 @@ under the License.
       <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
 
       <connectors>
-         <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
-         <connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
+         <!-- Default Connector.  Returned to clients during broadcast and distributed around cluster.  See broadcast and discovery-groups -->
+         <connector name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</connector>
       </connectors>
 
       <acceptors>
-         <acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
-         <acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
+         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP  -->
+         <acceptor name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</acceptor>
+
+         <!-- AMQP Acceptor.  Listens on default STOMP port for AMQP traffic.  -->
+         <acceptor name="amqp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5672}?protocols=AMQP</acceptor>
+
+         <!-- STOMP Acceptor.  Enables ActiveMQ Core protocol, OpenWire and STOMP.  -->
+         <acceptor name="stomp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61613}?protocols=STOMP</acceptor>
+
+         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients  -->
+         <acceptor name="hornetq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 
       <broadcast-groups>
@@ -56,7 +65,7 @@ under the License.
             <group-address>231.7.7.7</group-address>
             <group-port>9876</group-port>
             <broadcast-period>5000</broadcast-period>
-            <connector-ref>netty</connector-ref>
+            <connector-ref>activemq</connector-ref>
          </broadcast-group>
       </broadcast-groups>
 
@@ -71,7 +80,7 @@ under the License.
       <cluster-connections>
          <cluster-connection name="my-cluster">
             <address>jms</address>
-            <connector-ref>netty</connector-ref>
+            <connector-ref>activemq</connector-ref>
             <discovery-group-ref discovery-group-name="dg-group1"/>
          </cluster-connection>
       </cluster-connections>