You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/05/19 14:19:47 UTC

[1/2] activemq-artemis git commit: rename connector and acceptor to artemis

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 318595d64 -> 4b157934e


rename connector and acceptor to artemis


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ef322b5e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ef322b5e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ef322b5e

Branch: refs/heads/master
Commit: ef322b5eb2f821543136e9745a5d7affe7f52d7e
Parents: 318595d
Author: Andy Taylor <an...@gmail.com>
Authored: Tue May 19 11:50:14 2015 +0100
Committer: Andy Taylor <an...@gmail.com>
Committed: Tue May 19 11:50:46 2015 +0100

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/cli/commands/etc/broker.xml      | 4 ++--
 .../activemq/artemis/cli/commands/etc/cluster-settings.txt       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ef322b5e/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index 851572e..7df74a8 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -38,12 +38,12 @@ under the License.
 
       <connectors>
          <!-- Default Connector.  Returned to clients during broadcast and distributed around cluster.  See broadcast and discovery-groups -->
-         <connector name="activemq">tcp://${activemq.remoting.default.host:${host}}:${activemq.remoting.default.port:${default.port}}</connector>
+         <connector name="artemis">tcp://${activemq.remoting.default.host:${host}}:${activemq.remoting.default.port:${default.port}}</connector>
       </connectors>
 
       <acceptors>
          <!-- Default ActiveMQ Artemis Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
-         <acceptor name="activemq">tcp://${activemq.remoting.default.host:${host}}:${activemq.remoting.default.port:${default.port}}</acceptor>
+         <acceptor name="artemis">tcp://${activemq.remoting.default.host:${host}}:${activemq.remoting.default.port:${default.port}}</acceptor>
 
          <!-- AMQP Acceptor.  Listens on default AMQP port for AMQP traffic.-->
          <acceptor name="amqp">tcp://${activemq.remoting.amqp.host:${host}}:${activemq.remoting.amqp.port:${amqp.port}}?protocols=AMQP</acceptor>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ef322b5e/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
index 7d9229c..18460ed 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
@@ -4,7 +4,7 @@
             <group-address>231.7.7.7</group-address>
             <group-port>9876</group-port>
             <broadcast-period>5000</broadcast-period>
-            <connector-ref>activemq</connector-ref>
+            <connector-ref>artemis</connector-ref>
          </broadcast-group>
       </broadcast-groups>
 


[2/2] activemq-artemis git commit: This closes #266 on RA changes

Posted by cl...@apache.org.
This closes #266 on RA changes


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4b157934
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4b157934
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4b157934

Branch: refs/heads/master
Commit: 4b157934e3818f4724b82f90a883b33ee3eb287b
Parents: 318595d ef322b5
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue May 19 08:17:31 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 19 08:17:31 2015 -0400

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/cli/commands/etc/broker.xml      | 4 ++--
 .../activemq/artemis/cli/commands/etc/cluster-settings.txt       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------