diff --git a/examples/features/clustered/client-side-load-balancing/pom.xml b/examples/features/clustered/client-side-load-balancing/pom.xml index c17eb9d3..13782780 100644 --- a/examples/features/clustered/client-side-load-balancing/pom.xml +++ b/examples/features/clustered/client-side-load-balancing/pom.xml @@ -57,7 +57,7 @@ under the License. ${noServer} ${basedir}/target/server0 - true + tcp://localhost:61617,tcp://localhost:61618 --queues exampleQueue @@ -78,7 +78,7 @@ under the License. ${noServer} ${basedir}/target/server1 - true + tcp://localhost:61616,tcp://localhost:61618 1 -Djava.net.preferIPv4Stack=true @@ -100,7 +100,7 @@ under the License. ${noServer} ${basedir}/target/server2 - true + tcp://localhost:61616,tcp://localhost:61618 2 -Djava.net.preferIPv4Stack=true diff --git a/examples/features/clustered/client-side-load-balancing/readme.md b/examples/features/clustered/client-side-load-balancing/readme.md index f8c1427d..dcc1a018 100644 --- a/examples/features/clustered/client-side-load-balancing/readme.md +++ b/examples/features/clustered/client-side-load-balancing/readme.md @@ -8,10 +8,10 @@ This example demonstrates how connections created from a single JMS Connection f The particular load-balancing policy can be chosen to be random, round-robin or user-defined. Please see the user guide for more details of how to configure the specific load-balancing policy. In this example we will use the default round-robin load balancing policy. -The list of servers over which Apache Artemis will round-robin the connections can either be specified explicitly in the connection factory when instantiating it directly, when configuring it on the broker or configured to use UDP discovery to discover the list of servers over which to round-robin. This example will use UDP discovery to obtain the list. +The list of servers over which Apache Artemis will round-robin the connections can either be specified explicitly in the connection factory when instantiating it directly, when configuring it on the broker or configured to use server discovery to discover the list of servers over which to round-robin. This example will specify explicitly the list of servers. -This example starts three servers which all broadcast their location using UDP discovery. The UDP broadcast configuration can be seen in the `broker.xml` file. +This example starts three servers. The configuration can be seen in the `broker.xml` file. -A JMS ConnectionFactory is deployed on each broker specifying the discovery group that will be used by that connection factory. +A JMS ConnectionFactory is deployed on each broker specifying the list of servers. For more information on Apache Artemis load balancing, and clustering in general, please see the clustering section of the user manual. \ No newline at end of file diff --git a/examples/features/clustered/client-side-load-balancing/src/main/resources/jndi.properties b/examples/features/clustered/client-side-load-balancing/src/main/resources/jndi.properties index d3f932c2..e54ca074 100644 --- a/examples/features/clustered/client-side-load-balancing/src/main/resources/jndi.properties +++ b/examples/features/clustered/client-side-load-balancing/src/main/resources/jndi.properties @@ -16,5 +16,5 @@ # under the License. java.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory -connectionFactory.ConnectionFactory=udp://231.7.7.7:9876 +connectionFactory.ConnectionFactory=(tcp://localhost:61616,tcp://localhost:61617,tcp://localhost:61618) queue.queue/exampleQueue=exampleQueue diff --git a/examples/features/clustered/clustered-durable-subscription/pom.xml b/examples/features/clustered/clustered-durable-subscription/pom.xml index 05be8369..ecda4786 100644 --- a/examples/features/clustered/clustered-durable-subscription/pom.xml +++ b/examples/features/clustered/clustered-durable-subscription/pom.xml @@ -56,17 +56,10 @@ under the License. ${noServer} - true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 -Djava.net.preferIPv4Stack=true - - --cluster-user - my-cluster-user - --cluster-password - my-cluster-password - @@ -76,18 +69,11 @@ under the License. ${noServer} - true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 1 - -Djava.net.preferIPv4Stack=true - - --cluster-user - my-cluster-user - --cluster-password - my-cluster-password - + -Djava.net.preferIPv4Stack=true diff --git a/examples/features/clustered/clustered-durable-subscription/readme.md b/examples/features/clustered/clustered-durable-subscription/readme.md index 4404cdd2..8c286cd8 100644 --- a/examples/features/clustered/clustered-durable-subscription/readme.md +++ b/examples/features/clustered/clustered-durable-subscription/readme.md @@ -21,7 +21,9 @@ The cli create method will define a similar section by default if you use `--clu true STRICT 1 - + + server1-connector + For more information on Apache Artemis load balancing, and clustering in general, please see the "Clusters" chapter of the user manual. \ No newline at end of file diff --git a/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml index 8b899105..939f724a 100644 --- a/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml @@ -32,6 +32,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -40,23 +41,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - my-cluster-user my-cluster-password @@ -67,7 +51,9 @@ under the License. true STRICT 1 - + + server1-connector + diff --git a/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml index 8083ed82..3ea5fef1 100644 --- a/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml @@ -31,6 +31,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -39,23 +40,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - my-cluster-user my-cluster-password @@ -66,7 +50,9 @@ under the License. true STRICT 1 - + + server0-connector + diff --git a/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server0/broker.xml index 2c2f0a6d..a6a69f95 100644 --- a/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server0/broker.xml @@ -33,6 +33,8 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 + tcp://localhost:61618 @@ -41,22 +43,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -68,7 +54,10 @@ under the License. true STRICT 1 - + + server1-connector + server2-connector + diff --git a/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server1/broker.xml index c6f1fc3f..86175a8a 100644 --- a/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server1/broker.xml @@ -32,6 +32,8 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 + tcp://localhost:61618 @@ -40,22 +42,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +53,10 @@ under the License. true STRICT 1 - + + server0-connector + server2-connector + diff --git a/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server2/broker.xml b/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server2/broker.xml index ad565126..e1124b76 100644 --- a/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server2/broker.xml +++ b/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server2/broker.xml @@ -32,6 +32,8 @@ under the License. tcp://localhost:61618 + tcp://localhost:61616 + tcp://localhost:61617 @@ -40,22 +42,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +53,10 @@ under the License. true STRICT 1 - + + server0-connector + server1-connector + diff --git a/examples/features/clustered/clustered-jgroups/pom.xml b/examples/features/clustered/clustered-jgroups/pom.xml index af2f4ec4..e71e8410 100644 --- a/examples/features/clustered/clustered-jgroups/pom.xml +++ b/examples/features/clustered/clustered-jgroups/pom.xml @@ -59,7 +59,7 @@ under the License. ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true -Dartemis.discovery.enabled=true @@ -72,7 +72,7 @@ under the License. ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true -Dartemis.discovery.enabled=true diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/server-ca-truststore.jks b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/server-ca-truststore.jks new file mode 100644 index 00000000..3fe0f29a Binary files /dev/null and b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/server-ca-truststore.jks differ diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/server-keystore.jks b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/server-keystore.jks new file mode 100644 index 00000000..5a7e2c00 Binary files /dev/null and b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/server-keystore.jks differ diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml index 7168aeb1..9edb89d5 100644 --- a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml +++ b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml @@ -21,6 +21,13 @@ bind_port="${jgroups.bind_port:7800}" external_addr="${jgroups.external_addr}" external_port="${jgroups.external_port}" + tls.enabled="true" + tls.client_auth="NEED" + tls.keystore_path="${data.dir}/../etc/server-keystore.jks" + tls.keystore_password="securepass" + tls.keystore_alias="server" + tls.truststore_path="${data.dir}/../etc/server-keystore.jks" + tls.truststore_password="securepass" thread_pool.min_threads="0" thread_pool.max_threads="200" thread_pool.keep_alive_time="30000"/> diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/server-ca-truststore.jks b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/server-ca-truststore.jks new file mode 100644 index 00000000..3fe0f29a Binary files /dev/null and b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/server-ca-truststore.jks differ diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/server-keystore.jks b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/server-keystore.jks new file mode 100644 index 00000000..5a7e2c00 Binary files /dev/null and b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/server-keystore.jks differ diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml index d4693766..cd250c07 100644 --- a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml +++ b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml @@ -21,6 +21,13 @@ bind_port="${jgroups.bind_port:7800}" external_addr="${jgroups.external_addr}" external_port="${jgroups.external_port}" + tls.enabled="true" + tls.client_auth="NEED" + tls.keystore_path="${data.dir}/../etc/server-keystore.jks" + tls.keystore_password="securepass" + tls.keystore_alias="server" + tls.truststore_path="${data.dir}/../etc/server-keystore.jks" + tls.truststore_password="securepass" thread_pool.min_threads="0" thread_pool.max_threads="200" thread_pool.keep_alive_time="30000"/> diff --git a/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml index 83d16969..c29b8e71 100644 --- a/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml @@ -31,6 +31,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -39,22 +40,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +51,9 @@ under the License. true STRICT 1 - + + server1-connector + diff --git a/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml index 46b4dda3..44e6ab38 100644 --- a/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml @@ -32,6 +32,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -40,22 +41,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +52,9 @@ under the License. true STRICT 1 - + + server0-connector + diff --git a/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server0/broker.xml index f1ba5472..a64175a8 100644 --- a/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server0/broker.xml @@ -41,28 +41,11 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - my-cluster-user my-cluster-password - + diff --git a/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server1/broker.xml index d7c800c6..5e709726 100644 --- a/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server1/broker.xml @@ -39,28 +39,12 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password - + diff --git a/examples/features/clustered/clustered-topic/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-topic/src/main/resources/activemq/server0/broker.xml index caf2556e..e76f3e66 100644 --- a/examples/features/clustered/clustered-topic/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-topic/src/main/resources/activemq/server0/broker.xml @@ -32,6 +32,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -41,23 +42,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - my-cluster-user my-cluster-password @@ -68,7 +52,9 @@ under the License. true STRICT 1 - + + server1-connector + diff --git a/examples/features/clustered/clustered-topic/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-topic/src/main/resources/activemq/server1/broker.xml index 573f83ce..105ccda8 100644 --- a/examples/features/clustered/clustered-topic/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-topic/src/main/resources/activemq/server1/broker.xml @@ -31,6 +31,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -39,22 +40,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +51,9 @@ under the License. true STRICT 1 - + + server0-connector + diff --git a/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml index d75d4a92..cbed6e54 100644 --- a/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml @@ -31,6 +31,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -39,22 +40,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +51,9 @@ under the License. true ON_DEMAND 1 - + + server1-connector + diff --git a/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml index eb05b837..2cc8efb8 100644 --- a/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml @@ -32,6 +32,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -40,22 +41,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +52,9 @@ under the License. true ON_DEMAND 1 - + + server0-connector + diff --git a/examples/features/clustered/symmetric-cluster/pom.xml b/examples/features/clustered/symmetric-cluster/pom.xml index 74190e6a..aa23d12e 100644 --- a/examples/features/clustered/symmetric-cluster/pom.xml +++ b/examples/features/clustered/symmetric-cluster/pom.xml @@ -58,7 +58,7 @@ under the License. ${noSever} ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -70,7 +70,7 @@ under the License. ${noSever} ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -82,7 +82,7 @@ under the License. ${noSever} ${basedir}/target/server2 ${basedir}/target/classes/activemq/server2 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -94,7 +94,7 @@ under the License. ${noSever} ${basedir}/target/server3 ${basedir}/target/classes/activemq/server3 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -106,7 +106,7 @@ under the License. ${noSever} ${basedir}/target/server4 ${basedir}/target/classes/activemq/server4 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -118,7 +118,7 @@ under the License. ${noSever} ${basedir}/target/server5 ${basedir}/target/classes/activemq/server5 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true diff --git a/examples/features/clustered/symmetric-cluster/readme.md b/examples/features/clustered/symmetric-cluster/readme.md index bf664042..9ae87e73 100644 --- a/examples/features/clustered/symmetric-cluster/readme.md +++ b/examples/features/clustered/symmetric-cluster/readme.md @@ -18,9 +18,9 @@ The configuration used in this example is very similar to the configuration used To set up Apache Artemis to form a symmetric cluster we simply need to mark each broker as `clustered` and we need to define a `cluster-connection` in `broker.xml`. -The `cluster-connection` tells the nodes what other nodes to make connections to. With a `cluster-connection` each node that we connect to can either be specified indivually, or we can use UDP discovery to find out what other nodes are in the cluster. +The `cluster-connection` tells the nodes what other nodes to make connections to. With a `cluster-connection` each node that we connect to can either be specified indivually, or we can use server discovery to find out what other nodes are in the cluster. -Using UDP discovery makes configuration simpler since we don't have to know what nodes are available at any one time. +Using server discovery makes configuration simpler since we don't have to know what nodes are available at any one time. Here's the relevant snippet from the broker configuration, which tells the broker to form a cluster with the other nodes: @@ -30,6 +30,14 @@ Here's the relevant snippet from the broker configuration, which tells the broke true STRICT 1 + + server1-connector + server2-connector + server3-connector + server4-connector + server5-connector + + diff --git a/examples/features/clustered/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java b/examples/features/clustered/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java index f866b6cd..8b83d0f6 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java +++ b/examples/features/clustered/symmetric-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SymmetricClusterExample.java @@ -25,10 +25,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; -import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; -import org.apache.activemq.artemis.api.jms.JMSFactoryType; /** * This example demonstrates a cluster of three nodes set up in a symmetric topology - i.e. each @@ -63,20 +60,13 @@ public static void main(final String[] args) throws Exception { Connection connection5 = null; try { - // Step 1 - We instantiate a connection factory directly, specifying the UDP address and port for discovering - // the list of servers in the cluster. + // Step 1 - We instantiate a connection factory directly, specifying the list of servers in the cluster. // We could use JNDI to look-up a connection factory, but we'd need to know the JNDI server host and port for - // the - // specific server to do that, and that server might not be available at the time. By creating the + // the specific server to do that, and that server might not be available at the time. By creating the // connection factory directly we avoid having to worry about a JNDI look-up. // In an app server environment you could use HA-JNDI to lookup from the clustered JNDI servers without // having to know about a specific one. - UDPBroadcastEndpointFactory udpCfg = new UDPBroadcastEndpointFactory(); - udpCfg.setGroupAddress("231.7.7.7").setGroupPort(9876); - DiscoveryGroupConfiguration groupConfiguration = new DiscoveryGroupConfiguration(); - groupConfiguration.setBroadcastEndpointFactory(udpCfg); - - ConnectionFactory cf = ActiveMQJMSClient.createConnectionFactoryWithHA(groupConfiguration, JMSFactoryType.CF); + ConnectionFactory cf = ActiveMQJMSClient.createConnectionFactory("(tcp://localhost:61616,tcp://localhost:61617,tcp://localhost:61618,tcp://localhost:61619,tcp://localhost:61620,tcp://localhost:61621)", "servers"); // We give a little while for each server to broadcast its whereabouts to the client Thread.sleep(2000); diff --git a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server0/broker.xml index 3223428f..268113aa 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server0/broker.xml @@ -33,7 +33,11 @@ under the License. tcp://localhost:61616 - + tcp://localhost:61617 + tcp://localhost:61618 + tcp://localhost:61619 + tcp://localhost:61620 + tcp://localhost:61621 @@ -42,22 +46,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -69,7 +57,13 @@ under the License. true ON_DEMAND 1 - + + server1-connector + server2-connector + server3-connector + server4-connector + server5-connector + diff --git a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server1/broker.xml index 292e1c6f..254d14bb 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server1/broker.xml @@ -32,6 +32,11 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 + tcp://localhost:61618 + tcp://localhost:61619 + tcp://localhost:61620 + tcp://localhost:61621 @@ -40,22 +45,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +56,13 @@ under the License. true ON_DEMAND 1 - + + server0-connector + server2-connector + server3-connector + server4-connector + server5-connector + diff --git a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server2/broker.xml b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server2/broker.xml index 187827d5..8d15a26d 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server2/broker.xml +++ b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server2/broker.xml @@ -32,6 +32,11 @@ under the License. tcp://localhost:61618 + tcp://localhost:61616 + tcp://localhost:61617 + tcp://localhost:61619 + tcp://localhost:61620 + tcp://localhost:61621 @@ -40,22 +45,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +56,13 @@ under the License. true ON_DEMAND 1 - + + server0-connector + server1-connector + server3-connector + server4-connector + server5-connector + diff --git a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server3/broker.xml b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server3/broker.xml index 0ba73933..859d288a 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server3/broker.xml +++ b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server3/broker.xml @@ -32,6 +32,11 @@ under the License. tcp://localhost:61619 + tcp://localhost:61616 + tcp://localhost:61617 + tcp://localhost:61618 + tcp://localhost:61620 + tcp://localhost:61621 @@ -40,22 +45,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +56,13 @@ under the License. true ON_DEMAND 1 - + + server0-connector + server1-connector + server2-connector + server4-connector + server5-connector + diff --git a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server4/broker.xml b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server4/broker.xml index e657c971..0f8e6a19 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server4/broker.xml +++ b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server4/broker.xml @@ -31,6 +31,11 @@ under the License. tcp://localhost:61620 + tcp://localhost:61616 + tcp://localhost:61617 + tcp://localhost:61618 + tcp://localhost:61619 + tcp://localhost:61621 @@ -39,22 +44,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +55,13 @@ under the License. true ON_DEMAND 1 - + + server0-connector + server1-connector + server2-connector + server3-connector + server5-connector + diff --git a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server5/broker.xml b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server5/broker.xml index 1267ebd4..8696caf1 100644 --- a/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server5/broker.xml +++ b/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server5/broker.xml @@ -31,6 +31,11 @@ under the License. tcp://localhost:61621 + tcp://localhost:61616 + tcp://localhost:61617 + tcp://localhost:61618 + tcp://localhost:61619 + tcp://localhost:61620 @@ -39,22 +44,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +55,13 @@ under the License. true ON_DEMAND 1 - + + server0-connector + server1-connector + server2-connector + server3-connector + server4-connector + diff --git a/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server0/broker.xml b/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server0/broker.xml index 1b7dd363..9f2b870e 100644 --- a/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server0/broker.xml @@ -51,25 +51,9 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - CLIENT_ID @@ -80,7 +64,9 @@ under the License. guest 2 true - + + server1-connector + diff --git a/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server1/broker.xml b/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server1/broker.xml index 9e4c1b13..eab0119f 100644 --- a/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/connection-router/symmetric-redirect/src/main/resources/activemq/server1/broker.xml @@ -51,25 +51,9 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - CLIENT_ID @@ -80,7 +64,9 @@ under the License. guest 2 true - + + server0-connector + diff --git a/examples/features/ha/client-side-failoverlistener/pom.xml b/examples/features/ha/client-side-failoverlistener/pom.xml index 7c5a3d4c..438a7c6c 100644 --- a/examples/features/ha/client-side-failoverlistener/pom.xml +++ b/examples/features/ha/client-side-failoverlistener/pom.xml @@ -67,6 +67,7 @@ under the License. true false true + tcp://localhost:61617 --cluster-user my-cluster-user @@ -88,6 +89,7 @@ under the License. true true 1 + tcp://localhost:61616 --cluster-user my-cluster-user diff --git a/examples/features/ha/colocated-failover-scale-down/pom.xml b/examples/features/ha/colocated-failover-scale-down/pom.xml index 76bd9362..5a2b8114 100644 --- a/examples/features/ha/colocated-failover-scale-down/pom.xml +++ b/examples/features/ha/colocated-failover-scale-down/pom.xml @@ -63,6 +63,7 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 + -Dbrokerconfig.HAPolicyConfiguration.excludedConnectors=server0-connector,server0-colocated-backup-connector,server1-connector,server1-colocated-backup-connector @@ -75,6 +76,7 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 + -Dbrokerconfig.HAPolicyConfiguration.excludedConnectors=server0-connector,server0-colocated-backup-connector,server1-connector,server1-colocated-backup-connector diff --git a/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml index caa39a46..2ff02f5b 100644 --- a/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml @@ -32,6 +32,10 @@ under the License. vm://0 tcp://localhost:61616 + tcp://localhost:61616 + tcp://localhost:61716 + tcp://localhost:61617 + tcp://localhost:61717 @@ -41,22 +45,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -70,7 +58,12 @@ under the License. true OFF 1 - + + server0-connector + server0-colocated-backup-connector + server1-connector + server1-colocated-backup-connector + diff --git a/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml index 783d80ec..65e2e0d0 100644 --- a/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml @@ -32,6 +32,10 @@ under the License. vm://0 tcp://localhost:61617 + tcp://localhost:61616 + tcp://localhost:61716 + tcp://localhost:61617 + tcp://localhost:61717 @@ -41,22 +45,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -70,7 +58,12 @@ under the License. true OFF 1 - + + server0-connector + server0-colocated-backup-connector + server1-connector + server1-colocated-backup-connector + diff --git a/examples/features/ha/colocated-failover/pom.xml b/examples/features/ha/colocated-failover/pom.xml index 4bac1f0c..68fb4b9a 100644 --- a/examples/features/ha/colocated-failover/pom.xml +++ b/examples/features/ha/colocated-failover/pom.xml @@ -64,6 +64,7 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 + -Dbrokerconfig.HAPolicyConfiguration.excludedConnectors=server0-connector,server0-colocated-backup-connector,server1-connector,server1-colocated-backup-connector @@ -76,6 +77,7 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 + -Dbrokerconfig.HAPolicyConfiguration.excludedConnectors=server0-connector,server0-colocated-backup-connector,server1-connector,server1-colocated-backup-connector diff --git a/examples/features/ha/colocated-failover/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/colocated-failover/src/main/resources/activemq/server0/broker.xml index 30ebc6f7..e61997ea 100644 --- a/examples/features/ha/colocated-failover/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/colocated-failover/src/main/resources/activemq/server0/broker.xml @@ -31,6 +31,10 @@ under the License. tcp://localhost:61616 + tcp://localhost:61616 + tcp://localhost:61716 + tcp://localhost:61617 + tcp://localhost:61717 @@ -39,22 +43,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +54,12 @@ under the License. true STRICT 1 - + + server0-connector + server0-colocated-backup-connector + server1-connector + server1-colocated-backup-connector + diff --git a/examples/features/ha/colocated-failover/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/colocated-failover/src/main/resources/activemq/server1/broker.xml index c1644f75..9f73134f 100644 --- a/examples/features/ha/colocated-failover/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/colocated-failover/src/main/resources/activemq/server1/broker.xml @@ -31,6 +31,10 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 + tcp://localhost:61716 + tcp://localhost:61617 + tcp://localhost:61717 @@ -39,22 +43,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -66,7 +54,12 @@ under the License. true STRICT 1 - + + server0-connector + server0-colocated-backup-connector + server1-connector + server1-colocated-backup-connector + diff --git a/examples/features/ha/multiple-failover-failback/pom.xml b/examples/features/ha/multiple-failover-failback/pom.xml index 5f2566c1..5ecb2b5b 100644 --- a/examples/features/ha/multiple-failover-failback/pom.xml +++ b/examples/features/ha/multiple-failover-failback/pom.xml @@ -66,6 +66,7 @@ under the License. false ../data true + tcp://localhost:61617,tcp://localhost:61618 --cluster-user my-cluster-user @@ -87,6 +88,7 @@ under the License. true ../data true + tcp://localhost:61616,tcp://localhost:61618 --cluster-user my-cluster-user @@ -106,6 +108,7 @@ under the License. ${basedir}/target/server2 true true + tcp://localhost:61616,tcp://localhost:61617 ../data --cluster-user diff --git a/examples/features/ha/multiple-failover/pom.xml b/examples/features/ha/multiple-failover/pom.xml index e6e85bd4..06f10590 100644 --- a/examples/features/ha/multiple-failover/pom.xml +++ b/examples/features/ha/multiple-failover/pom.xml @@ -66,6 +66,7 @@ under the License. false ../data true + tcp://localhost:61617,tcp://localhost:61618 --cluster-user my-cluster-user @@ -87,6 +88,7 @@ under the License. true ../data true + tcp://localhost:61616,tcp://localhost:61618 --cluster-user my-cluster-user @@ -106,6 +108,7 @@ under the License. ${basedir}/target/server2 true true + tcp://localhost:61616,tcp://localhost:61617 ../data --cluster-user diff --git a/examples/features/ha/non-transaction-failover/pom.xml b/examples/features/ha/non-transaction-failover/pom.xml index b9ee59fe..daf9fe79 100644 --- a/examples/features/ha/non-transaction-failover/pom.xml +++ b/examples/features/ha/non-transaction-failover/pom.xml @@ -67,6 +67,7 @@ under the License. false ../data true + tcp://localhost:61617 --cluster-user my-cluster-user @@ -88,6 +89,7 @@ under the License. true ../data true + tcp://localhost:61616 --cluster-user my-cluster-user diff --git a/examples/features/ha/replicated-failback-static/pom.xml b/examples/features/ha/replicated-failback-static/pom.xml index 4b23214f..3ce4db5b 100644 --- a/examples/features/ha/replicated-failback-static/pom.xml +++ b/examples/features/ha/replicated-failback-static/pom.xml @@ -64,7 +64,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} @@ -77,7 +76,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} diff --git a/examples/features/ha/replicated-failback-static/readme.md b/examples/features/ha/replicated-failback-static/readme.md index 9d577ce1..9257ed56 100644 --- a/examples/features/ha/replicated-failback-static/readme.md +++ b/examples/features/ha/replicated-failback-static/readme.md @@ -4,6 +4,6 @@ If you have not already done so, [prepare the broker distribution](../../../../R To run the example, simply type **mvn verify** from this directory. -This example is the same as the "replicated-failback" example but with a "static" clustering configuration (i.e. not using UDP multicast). +This example is the same as the "replicated-failback" example but with a "static" clustering configuration (i.e. not using server discovery). For more information on Apache Artemis failover and HA, and clustering in general, please see the clustering section of the user manual. \ No newline at end of file diff --git a/examples/features/ha/replicated-failback/pom.xml b/examples/features/ha/replicated-failback/pom.xml index 82b9d882..7f6b6997 100644 --- a/examples/features/ha/replicated-failback/pom.xml +++ b/examples/features/ha/replicated-failback/pom.xml @@ -63,7 +63,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} @@ -76,7 +75,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} diff --git a/examples/features/ha/replicated-failback/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/replicated-failback/src/main/resources/activemq/server0/broker.xml index f3c3a097..7021ae2a 100644 --- a/examples/features/ha/replicated-failback/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/replicated-failback/src/main/resources/activemq/server0/broker.xml @@ -43,6 +43,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -50,27 +51,12 @@ under the License. tcp://localhost:61616 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 5000 - - - netty-connector - + + server1-connector + diff --git a/examples/features/ha/replicated-failback/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/replicated-failback/src/main/resources/activemq/server1/broker.xml index dd35ba69..c840ee2f 100644 --- a/examples/features/ha/replicated-failback/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/replicated-failback/src/main/resources/activemq/server1/broker.xml @@ -51,27 +51,12 @@ under the License. tcp://localhost:61617 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 5000 - - - netty-connector - + + netty-live-connector + diff --git a/examples/features/ha/replicated-multiple-failover/pom.xml b/examples/features/ha/replicated-multiple-failover/pom.xml index 46f1981e..b2a0e819 100644 --- a/examples/features/ha/replicated-multiple-failover/pom.xml +++ b/examples/features/ha/replicated-multiple-failover/pom.xml @@ -64,7 +64,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} @@ -77,7 +76,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} @@ -88,7 +86,6 @@ under the License. ${basedir}/target/server2 ${basedir}/target/classes/activemq/server2 - -Dudp-address=${udp-address} diff --git a/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml index 3bdbbdac..2083ebba 100644 --- a/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml @@ -37,6 +37,8 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 + tcp://localhost:61618 @@ -44,30 +46,16 @@ under the License. tcp://localhost:61616 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server1-connector + server2-connector + diff --git a/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml index e2dcd0b2..028f4d81 100644 --- a/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml @@ -37,6 +37,8 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 + tcp://localhost:61618 @@ -44,30 +46,16 @@ under the License. tcp://localhost:61617 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server0-connector + server2-connector + diff --git a/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml b/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml index 74e1affc..840b0f94 100644 --- a/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml +++ b/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml @@ -37,6 +37,8 @@ under the License. tcp://localhost:61618 + tcp://localhost:61616 + tcp://localhost:61617 @@ -44,30 +46,16 @@ under the License. tcp://localhost:61618 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server0-connector + server1-connector + diff --git a/examples/features/ha/replicated-transaction-failover/pom.xml b/examples/features/ha/replicated-transaction-failover/pom.xml index 761f7d2d..de3d8a36 100644 --- a/examples/features/ha/replicated-transaction-failover/pom.xml +++ b/examples/features/ha/replicated-transaction-failover/pom.xml @@ -61,7 +61,7 @@ under the License. ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -72,7 +72,7 @@ under the License. ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true diff --git a/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml index a1d2133d..773ebc87 100644 --- a/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml @@ -38,6 +38,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -45,30 +46,15 @@ under the License. tcp://localhost:61616 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server1-connector + diff --git a/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml index e9f44a52..8e3eacf5 100644 --- a/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml @@ -38,6 +38,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -45,30 +46,15 @@ under the License. tcp://localhost:61617 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server0-connector + diff --git a/examples/features/ha/scale-down/pom.xml b/examples/features/ha/scale-down/pom.xml index 1fa111ea..e5d6c6b1 100644 --- a/examples/features/ha/scale-down/pom.xml +++ b/examples/features/ha/scale-down/pom.xml @@ -62,7 +62,7 @@ under the License. ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true @@ -73,7 +73,7 @@ under the License. ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true + -Djava.net.preferIPv4Stack=true diff --git a/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml index 2a582056..ccc32933 100644 --- a/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml @@ -31,6 +31,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -39,22 +40,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -67,7 +52,9 @@ under the License. true STRICT 1 - + + server1-connector + diff --git a/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml index 6c3b65bd..48ffa659 100644 --- a/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml @@ -40,22 +40,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - my-cluster-user my-cluster-password @@ -68,7 +52,9 @@ under the License. true STRICT 1 - + + server0-connector + diff --git a/examples/features/ha/stop-server-failover/pom.xml b/examples/features/ha/stop-server-failover/pom.xml index 9b84e683..8c908d91 100644 --- a/examples/features/ha/stop-server-failover/pom.xml +++ b/examples/features/ha/stop-server-failover/pom.xml @@ -36,6 +36,11 @@ under the License. + + org.apache.artemis + artemis-cli + ${project.version} + org.apache.artemis artemis-jms-client @@ -62,6 +67,7 @@ under the License. false ../data true + tcp://localhost:61617 --cluster-user my-cluster-user @@ -83,6 +89,7 @@ under the License. true ../data true + tcp://localhost:61616 --cluster-user my-cluster-user @@ -91,38 +98,6 @@ under the License. - - start0 - - cli - - - ${noServer} - true - ${basedir}/target/server0 - tcp://localhost:61616 - - run - - server0 - - - - start1 - - cli - - - ${noServer} - true - ${basedir}/target/server1 - tcp://localhost:61617 - - run - - server1 - - runClient @@ -130,26 +105,10 @@ under the License. org.apache.activemq.artemis.jms.example.StopServerFailoverExample - - - - stop0 - - stop - - - ${noServer} - ${basedir}/target/server0 - - - - stop1 - - stop - - - ${noServer} - ${basedir}/target/server1 + + ${basedir}/target/server0 + ${basedir}/target/server1 + diff --git a/examples/features/ha/stop-server-failover/src/main/java/org/apache/activemq/artemis/jms/example/StopServerFailoverExample.java b/examples/features/ha/stop-server-failover/src/main/java/org/apache/activemq/artemis/jms/example/StopServerFailoverExample.java index 90c95640..eeb83267 100644 --- a/examples/features/ha/stop-server-failover/src/main/java/org/apache/activemq/artemis/jms/example/StopServerFailoverExample.java +++ b/examples/features/ha/stop-server-failover/src/main/java/org/apache/activemq/artemis/jms/example/StopServerFailoverExample.java @@ -26,6 +26,8 @@ import javax.jms.TextMessage; import javax.naming.InitialContext; +import org.apache.activemq.artemis.util.ServerUtil; + /** * A simple example that demonstrates failover of the JMS connection from one node to another * when the live server crashes using a JMS non-transacted session. @@ -39,7 +41,14 @@ public static void main(final String[] args) throws Exception { InitialContext initialContext = null; + + Process[] servers = new Process[2]; + try { + for (int i = 0; i < args.length; i++) { + servers[i] = ServerUtil.startServer(args[i], StopServerFailoverExample.class.getSimpleName() + i, i, 5000); + } + // Step 1. Get an initial context for looking up JNDI from the server #1 initialContext = new InitialContext(); @@ -110,6 +119,10 @@ public static void main(final String[] args) throws Exception { if (initialContext != null) { initialContext.close(); } + + for (int i = 0; i < args.length; i++) { + ServerUtil.killServer(servers[i]); + } } } } diff --git a/examples/features/ha/transaction-failover/pom.xml b/examples/features/ha/transaction-failover/pom.xml index 0486a69d..8087d948 100644 --- a/examples/features/ha/transaction-failover/pom.xml +++ b/examples/features/ha/transaction-failover/pom.xml @@ -61,7 +61,6 @@ under the License. ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} @@ -72,7 +71,6 @@ under the License. ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} diff --git a/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml index aa80caaf..d5ef7e86 100644 --- a/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml @@ -40,6 +40,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -47,30 +48,15 @@ under the License. tcp://localhost:61616 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server1-connector + diff --git a/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml index eb156265..ed621c85 100644 --- a/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml @@ -39,6 +39,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -46,30 +47,15 @@ under the License. tcp://localhost:61617 - - - ${udp-address:231.7.7.7} - 9876 - 1000 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 60000 - - - my-cluster-user my-cluster-password netty-connector - + + server0-connector + diff --git a/examples/features/ha/zookeeper-single-pair-failback/pom.xml b/examples/features/ha/zookeeper-single-pair-failback/pom.xml index 07d4437c..1bb022de 100644 --- a/examples/features/ha/zookeeper-single-pair-failback/pom.xml +++ b/examples/features/ha/zookeeper-single-pair-failback/pom.xml @@ -63,7 +63,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server0 ${basedir}/target/classes/activemq/server0 - -Dudp-address=${udp-address} @@ -76,7 +75,6 @@ under the License. -Djava.net.preferIPv4Stack=true ${basedir}/target/server1 ${basedir}/target/classes/activemq/server1 - -Dudp-address=${udp-address} diff --git a/examples/features/standard/pom.xml b/examples/features/standard/pom.xml index 3963f267..228496b7 100644 --- a/examples/features/standard/pom.xml +++ b/examples/features/standard/pom.xml @@ -33,7 +33,6 @@ under the License. Apache Artemis Standard Examples - 231.7.7.7 ${project.basedir}/../../.. diff --git a/examples/pom.xml b/examples/pom.xml index b12df9ca..4c3bbb3c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -32,7 +32,6 @@ under the License. Apache Artemis Examples - 231.7.7.7 ${project.basedir}/.. diff --git a/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server0/broker.xml b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server0/broker.xml index c6436273..1be633b2 100644 --- a/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server0/broker.xml +++ b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server0/broker.xml @@ -32,6 +32,7 @@ under the License. tcp://localhost:61616 + tcp://localhost:61617 @@ -41,23 +42,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - netty-connector @@ -65,7 +49,9 @@ under the License. true STRICT 1 - + + server1-connector + diff --git a/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server1/broker.xml b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server1/broker.xml index 9ffcc73d..a90a497c 100644 --- a/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server1/broker.xml +++ b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server1/broker.xml @@ -32,6 +32,7 @@ under the License. tcp://localhost:61617 + tcp://localhost:61616 @@ -41,23 +42,6 @@ under the License. - - - ${udp-address:231.7.7.7} - 9876 - 100 - netty-connector - - - - - - ${udp-address:231.7.7.7} - 9876 - 10000 - - - netty-connector @@ -65,7 +49,9 @@ under the License. true STRICT 1 - + + server0-connector +