Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A399A10965 for ; Wed, 10 Dec 2014 16:11:30 +0000 (UTC) Received: (qmail 14486 invoked by uid 500); 10 Dec 2014 16:11:29 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 14411 invoked by uid 500); 10 Dec 2014 16:11:29 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 13246 invoked by uid 99); 10 Dec 2014 16:11:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Dec 2014 16:11:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E63F4A23D76; Wed, 10 Dec 2014 16:11:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbertram@apache.org To: commits@activemq.apache.org Date: Wed, 10 Dec 2014 16:11:58 -0000 Message-Id: <14f2434701c64983a56800ede47522bb@git.apache.org> In-Reply-To: <34f402ddf8314dd6a70969b26485f39b@git.apache.org> References: <34f402ddf8314dd6a70969b26485f39b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [32/37] activemq-6 git commit: ACTIVEMQ6-51 Example server bootstrapping http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml new file mode 100644 index 0000000..b19c11f --- /dev/null +++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml @@ -0,0 +1,75 @@ + + + + server1/paging + + server1/bindings + + server1/journal + + server1/large-messages + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + + 5000 + test-jgroups-file_ping.xml + active_broadcast_channel + netty-connector + + + + + + test-jgroups-file_ping.xml + active_broadcast_channel + 10000 + + + + + +

jms

+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-jms.xml new file mode 100644 index 0000000..847659f --- /dev/null +++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-jms.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.xml new file mode 100644 index 0000000..ae30546 --- /dev/null +++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties new file mode 100644 index 0000000..7905109 --- /dev/null +++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties @@ -0,0 +1,2 @@ +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5446 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml new file mode 100644 index 0000000..38ad144 --- /dev/null +++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml deleted file mode 100644 index 43692a4..0000000 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server0/activemq-configuration.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - server0/paging - - server0/bindings - - server0/journal - - server0/large-messages - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - - 5000 - test-jgroups-file_ping.xml - active_broadcast_channel - netty-connector - - - - - - test-jgroups-file_ping.xml - active_broadcast_channel - 10000 - - - - - -

jms

- netty-connector - 500 - true - true - 1 - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-jms.xml deleted file mode 100644 index 847659f..0000000 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-jms.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-users.xml deleted file mode 100644 index ae30546..0000000 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/activemq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/client-jndi.properties ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/client-jndi.properties deleted file mode 100644 index 7905109..0000000 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/client-jndi.properties +++ /dev/null @@ -1,2 +0,0 @@ -java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory -java.naming.provider.url=tcp://localhost:5446 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/test-jgroups-file_ping.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/test-jgroups-file_ping.xml b/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/test-jgroups-file_ping.xml deleted file mode 100644 index 38ad144..0000000 --- a/examples/jms/clustered-jgroups/src/main/resources/hornetq/server1/test-jgroups-file_ping.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/pom.xml b/examples/jms/clustered-queue/pom.xml index dfb3c5a..c2e912c 100644 --- a/examples/jms/clustered-queue/pom.xml +++ b/examples/jms/clustered-queue/pom.xml @@ -36,7 +36,7 @@ start - ${basedir}/target/classes/activemq/server0 + ${basedir}/target/classes/activemq/server0 udp-address @@ -51,9 +51,7 @@ start - 1199 - 1198 - ${basedir}/target/classes/activemq/server1 + ${basedir}/target/classes/activemq/server1 true @@ -82,7 +80,7 @@ stop - ${basedir}/target/classes/activemq/server0 + ${basedir}/target/classes/activemq/server0 @@ -91,7 +89,7 @@ stop - ${basedir}/target/classes/activemq/server1 + ${basedir}/target/classes/activemq/server1 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java b/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java index 5c1874d..2da1881 100644 --- a/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java +++ b/examples/jms/clustered-queue/src/main/java/org/apache/activemq/jms/example/ClusteredQueueExample.java @@ -16,6 +16,8 @@ */ package org.apache.activemq.jms.example; +import java.util.Hashtable; + import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.MessageConsumer; @@ -54,7 +56,11 @@ public class ClusteredQueueExample extends ActiveMQExample try { // Step 1. Get an initial context for looking up JNDI from server 0 - ic0 = getContext(0); + Hashtable properties = new Hashtable(); + properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory"); + properties.put("java.naming.provider.url", args[0]); + properties.put("queue.queue/exampleQueue", "exampleQueue"); + ic0 = new InitialContext(properties); // Step 2. Look-up the JMS Queue object from JNDI Queue queue = (Queue)ic0.lookup("queue/exampleQueue"); @@ -63,7 +69,10 @@ public class ClusteredQueueExample extends ActiveMQExample ConnectionFactory cf0 = (ConnectionFactory)ic0.lookup("ConnectionFactory"); // Step 4. Get an initial context for looking up JNDI from server 1 - ic1 = getContext(1); + properties = new Hashtable(); + properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory"); + properties.put("java.naming.provider.url", args[1]); + ic1 = new InitialContext(properties); // Step 5. Look-up a JMS Connection Factory object from JNDI on server 1 ConnectionFactory cf1 = (ConnectionFactory)ic1.lookup("ConnectionFactory"); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml new file mode 100644 index 0000000..8ddc2c8 --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml @@ -0,0 +1,74 @@ + + + + target/server0/data/messaging/bindings + + target/server0/data/messaging/journal + + target/server0/data/messaging/largemessages + + target/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +

jms

+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-jms.xml new file mode 100644 index 0000000..847659f --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-jms.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.xml new file mode 100644 index 0000000..ae30546 --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml new file mode 100644 index 0000000..8455252 --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml @@ -0,0 +1,75 @@ + + + + + target/server1/data/messaging/bindings + + target/server1/data/messaging/journal + + target/server1/data/messaging/largemessages + + target/server1/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +

jms

+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-jms.xml new file mode 100644 index 0000000..847659f --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-jms.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.xml new file mode 100644 index 0000000..ae30546 --- /dev/null +++ b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-configuration.xml deleted file mode 100644 index 8ddc2c8..0000000 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-configuration.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - target/server0/data/messaging/bindings - - target/server0/data/messaging/journal - - target/server0/data/messaging/largemessages - - target/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -

jms

- netty-connector - 500 - true - true - 1 - - - - - - - - - - - - - - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-jms.xml deleted file mode 100644 index 847659f..0000000 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-jms.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-users.xml deleted file mode 100644 index ae30546..0000000 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server0/activemq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-configuration.xml deleted file mode 100644 index 8455252..0000000 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-configuration.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - target/server1/data/messaging/bindings - - target/server1/data/messaging/journal - - target/server1/data/messaging/largemessages - - target/server1/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -

jms

- netty-connector - 500 - true - true - 1 - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-jms.xml deleted file mode 100644 index 847659f..0000000 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-jms.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-users.xml deleted file mode 100644 index ae30546..0000000 --- a/examples/jms/clustered-queue/src/main/resources/hornetq/server1/activemq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/pom.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/pom.xml b/examples/jms/clustered-standalone/pom.xml index 427ec71..fe99c7c 100644 --- a/examples/jms/clustered-standalone/pom.xml +++ b/examples/jms/clustered-standalone/pom.xml @@ -36,7 +36,7 @@ start - ${basedir}/target/classes/activemq/server0 + ${basedir}/target/classes/activemq/server0 udp-address @@ -51,9 +51,7 @@ start - 1199 - 1198 - ${basedir}/target/classes/activemq/server1 + ${basedir}/target/classes/activemq/server1 true @@ -69,9 +67,7 @@ start - 1299 - 1298 - ${basedir}/target/classes/activemq/server2 + ${basedir}/target/classes/activemq/server2 true @@ -107,7 +103,7 @@ stop - ${basedir}/target/classes/activemq/server0 + ${basedir}/target/classes/activemq/server0 @@ -116,7 +112,7 @@ stop - ${basedir}/target/classes/activemq/server1 + ${basedir}/target/classes/activemq/server1 @@ -125,7 +121,7 @@ stop - ${basedir}/target/classes/activemq/server2 + ${basedir}/target/classes/activemq/server2 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java b/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java index 28704ce..e516469 100644 --- a/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java +++ b/examples/jms/clustered-standalone/src/main/java/org/apache/activemq/jms/example/ClusteredStandaloneExample.java @@ -16,6 +16,8 @@ */ package org.apache.activemq.jms.example; +import java.util.Hashtable; + import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.MessageConsumer; @@ -28,24 +30,7 @@ import javax.naming.InitialContext; import org.apache.activemq.common.example.ActiveMQExample; /** - * - * This example demonstrates a distributed topic, and needs three servers to be started before the example is run. - * - * The example will not spawn the servers itself. - * - * The servers should be started using ./run.sh ../config/stand-alone/clustered - * - * If running on the same physical box, make sure that each server: - * - * a) uses a different data directory - * b) uses different ports for the netty acceptor - * c) uses different ports for JNDI - * - * Update server[0|1|2]/client-jndi.properties to the correct ports and hosts for the 3 servers - * * @author Tim Fox - * - * */ public class ClusteredStandaloneExample extends ActiveMQExample { @@ -69,11 +54,21 @@ public class ClusteredStandaloneExample extends ActiveMQExample try { - initialContext0 = getContext(0); - - initialContext1 = getContext(1); - - initialContext2 = getContext(2); + Hashtable properties = new Hashtable(); + properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory"); + properties.put("java.naming.provider.url", args[0]); + properties.put("topic.topic/exampleTopic", "exampleTopic"); + initialContext0 = new InitialContext(properties); + + properties = new Hashtable(); + properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory"); + properties.put("java.naming.provider.url", args[1]); + initialContext1 = new InitialContext(properties); + + properties = new Hashtable(); + properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory"); + properties.put("java.naming.provider.url", args[2]); + initialContext2 = new InitialContext(properties); // First we demonstrate a distributed topic. // We create a connection on each node, create a consumer on each connection and send some http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml new file mode 100644 index 0000000..f57cc35 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml @@ -0,0 +1,74 @@ + + + + target/server0/data/messaging/bindings + + target/server0/data/messaging/journal + + target/server0/data/messaging/largemessages + + target/server0/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +

jms

+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-jms.xml new file mode 100644 index 0000000..845dfe1 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-jms.xml @@ -0,0 +1,8 @@ + + + + + + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.xml new file mode 100644 index 0000000..ae30546 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml new file mode 100644 index 0000000..22efe1d --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml @@ -0,0 +1,75 @@ + + + + + target/server1/data/messaging/bindings + + target/server1/data/messaging/journal + + target/server1/data/messaging/largemessages + + target/server1/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +

jms

+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-jms.xml new file mode 100644 index 0000000..845dfe1 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-jms.xml @@ -0,0 +1,8 @@ + + + + + + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.xml new file mode 100644 index 0000000..ae30546 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml new file mode 100644 index 0000000..b186ea2 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml @@ -0,0 +1,75 @@ + + + + + target/server2/data/messaging/bindings + + target/server2/data/messaging/journal + + target/server2/data/messaging/largemessages + + target/server2/data/messaging/paging + + + + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory + + + + + + + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory + + + + + + + + ${udp-address:231.7.7.7} + 9876 + 100 + netty-connector + + + + + + ${udp-address:231.7.7.7} + 9876 + 10000 + + + + + +

jms

+ netty-connector + 500 + true + true + 1 + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-jms.xml new file mode 100644 index 0000000..845dfe1 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-jms.xml @@ -0,0 +1,8 @@ + + + + + + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.xml new file mode 100644 index 0000000..ae30546 --- /dev/null +++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-users.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-configuration.xml deleted file mode 100644 index f57cc35..0000000 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-configuration.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - target/server0/data/messaging/bindings - - target/server0/data/messaging/journal - - target/server0/data/messaging/largemessages - - target/server0/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -

jms

- netty-connector - 500 - true - true - 1 - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml deleted file mode 100644 index 845dfe1..0000000 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-jms.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-users.xml deleted file mode 100644 index ae30546..0000000 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server0/activemq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-configuration.xml deleted file mode 100644 index 22efe1d..0000000 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-configuration.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - target/server1/data/messaging/bindings - - target/server1/data/messaging/journal - - target/server1/data/messaging/largemessages - - target/server1/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -

jms

- netty-connector - 500 - true - true - 1 - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml deleted file mode 100644 index 212fbd1..0000000 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-jms.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-users.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-users.xml deleted file mode 100644 index ae30546..0000000 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server1/activemq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/a102983d/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-configuration.xml deleted file mode 100644 index b186ea2..0000000 --- a/examples/jms/clustered-standalone/src/main/resources/hornetq/server2/activemq-configuration.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - target/server2/data/messaging/bindings - - target/server2/data/messaging/journal - - target/server2/data/messaging/largemessages - - target/server2/data/messaging/paging - - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - - - -

jms