Repository: activemq-artemis Updated Branches: refs/heads/master 5cd681772 -> 18c9e790f
Add HornetQ protocol to the distro Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/dfe8b14a Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/dfe8b14a Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/dfe8b14a Branch: refs/heads/master Commit: dfe8b14ac0b775fdc39886559d9649cac520dc62 Parents: 074528f Author: Martyn Taylor <[email protected]> Authored: Mon May 11 14:26:02 2015 +0100 Committer: Martyn Taylor <[email protected]> Committed: Mon May 11 14:26:02 2015 +0100 ---------------------------------------------------------------------- .../org/apache/activemq/artemis/cli/commands/etc/broker.xml | 2 +- artemis-distribution/pom.xml | 5 +++++ artemis-distribution/src/main/assembly/dep.xml | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/dfe8b14a/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 e32e966..761c6d9 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 @@ -52,7 +52,7 @@ under the License. <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:${host}}:${activemq.remoting.stomp.port:${stomp.port}}?protocols=STOMP</acceptor> <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Core and STOMP for legacy HornetQ clients. --> - <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:${host}}:${activemq.remoting.hornetq.port:${hq.port}}?protocols=CORE,STOMP</acceptor> + <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:${host}}:${activemq.remoting.hornetq.port:${hq.port}}?protocols=HORNETQ,STOMP</acceptor> </acceptors> ${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-store.settings} http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/dfe8b14a/artemis-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml index d9879c4..7dffc25 100644 --- a/artemis-distribution/pom.xml +++ b/artemis-distribution/pom.xml @@ -117,6 +117,11 @@ <artifactId>artemis-openwire-protocol</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-hornetq-protocol</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>artemis-native</artifactId> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/dfe8b14a/artemis-distribution/src/main/assembly/dep.xml ---------------------------------------------------------------------- diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml index bd8e60b..8433867 100644 --- a/artemis-distribution/src/main/assembly/dep.xml +++ b/artemis-distribution/src/main/assembly/dep.xml @@ -58,6 +58,7 @@ <include>org.apache.activemq:artemis-amqp-protocol</include> <include>org.apache.activemq:artemis-openwire-protocol</include> <include>org.apache.activemq:artemis-proton-plug</include> + <include>org.apache.activemq:artemis-hornetq-protocol</include> <include>org.apache.activemq:artemis-stomp-protocol</include> <include>org.apache.activemq:artemis-ra</include> <include>org.apache.activemq:artemis-selector</include>
