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/07/15 15:13:33 UTC
[1/2] activemq-artemis git commit: Enable MQTT in default broker
config
Repository: activemq-artemis
Updated Branches:
refs/heads/master 497d7f157 -> afbfa2eb0
Enable MQTT in default broker config
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4ecbbc93
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4ecbbc93
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4ecbbc93
Branch: refs/heads/master
Commit: 4ecbbc9388a727823631dbff555601115926b68e
Parents: 497d7f1
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue Jul 7 16:24:00 2015 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Wed Jul 15 14:06:49 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/activemq/artemis/cli/commands/Create.java | 3 +++
.../org/apache/activemq/artemis/cli/commands/etc/broker.xml | 4 ++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4ecbbc93/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index ca7484c..b349ad1 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -64,6 +64,8 @@ public class Create extends InputAbstract
private static final Integer HTTP_PORT = 8161;
+ private static final Integer MQTT_PORT = 1883;
+
public static final String BIN_ARTEMIS_CMD = "bin/artemis.cmd";
public static final String BIN_ARTEMIS_SERVICE_EXE = "bin/artemis-service.exe";
public static final String BIN_ARTEMIS_SERVICE_XML = "bin/artemis-service.xml";
@@ -501,6 +503,7 @@ public class Create extends InputAbstract
filters.put("${amqp.port}", String.valueOf(AMQP_PORT + portOffset));
filters.put("${stomp.port}", String.valueOf(STOMP_PORT + portOffset));
filters.put("${hq.port}", String.valueOf(HQ_PORT + portOffset));
+ filters.put("${mqtt.port}", String.valueOf(MQTT_PORT + portOffset));
filters.put("${http.port}", String.valueOf(HTTP_PORT + portOffset));
filters.put("${data.dir}", data);
filters.put("${max-hops}", String.valueOf(maxHops));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4ecbbc93/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 0f5dc3e..a2d0ee7 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
@@ -55,7 +55,11 @@ ${connector-config.settings}
<!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Artemis Core and STOMP for legacy HornetQ clients. -->
<acceptor name="hornetq">tcp://${host}:${hq.port}?protocols=HORNETQ,STOMP</acceptor>
+
+ <!-- MQTT Acceptor -->
+ <acceptor name="hornetq">tcp://${host}:${mqtt.port}?protocols=MQTT</acceptor>
</acceptors>
+
${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-store.settings}
<security-settings>
<security-setting match="#">
[2/2] activemq-artemis git commit: This closes #80 MQTT changes
Posted by cl...@apache.org.
This closes #80 MQTT 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/afbfa2eb
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/afbfa2eb
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/afbfa2eb
Branch: refs/heads/master
Commit: afbfa2eb09be97b5b90da1bd106509f46fb7b0e7
Parents: 497d7f1 4ecbbc9
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Jul 15 09:13:16 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jul 15 09:13:16 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/activemq/artemis/cli/commands/Create.java | 3 +++
.../org/apache/activemq/artemis/cli/commands/etc/broker.xml | 4 ++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------