Fix examples
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/07ab2001 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/07ab2001 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/07ab2001 Branch: refs/heads/ARTEMIS-780 Commit: 07ab20018d29b7a76899e3b9bfb51f7e6f1d76af Parents: b7e7492 Author: jbertram <[email protected]> Authored: Fri Nov 18 14:09:33 2016 -0600 Committer: jbertram <[email protected]> Committed: Wed Nov 23 09:04:35 2016 -0600 ---------------------------------------------------------------------- .../api/config/ActiveMQDefaultConfiguration.java | 4 ++-- .../api/core/management/ObjectNameBuilder.java | 2 +- .../clustered-durable-subscription/readme.html | 1 - .../ClusteredDurableSubscriptionExample.java | 2 ++ .../main/resources/activemq/server0/broker.xml | 3 +-- .../main/resources/activemq/server1/broker.xml | 3 +-- .../clustered/clustered-grouping/readme.html | 2 -- .../main/resources/activemq/server0/broker.xml | 5 ++--- .../main/resources/activemq/server1/broker.xml | 5 ++--- .../main/resources/activemq/server2/broker.xml | 5 ++--- .../main/resources/activemq/server0/broker.xml | 3 +-- .../main/resources/activemq/server1/broker.xml | 3 +-- .../clustered/clustered-queue/readme.html | 1 - .../main/resources/activemq/server0/broker.xml | 3 +-- .../main/resources/activemq/server1/broker.xml | 3 +-- .../clustered-static-discovery-uri/readme.html | 1 - .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server2/broker.xml | 2 +- .../main/resources/activemq/server3/broker.xml | 2 +- .../clustered-static-discovery/readme.html | 1 - .../main/resources/activemq/server0/broker.xml | 3 +-- .../main/resources/activemq/server1/broker.xml | 3 +-- .../main/resources/activemq/server2/broker.xml | 3 +-- .../main/resources/activemq/server3/broker.xml | 3 +-- .../clustered/clustered-static-oneway/readme.html | 1 - .../main/resources/activemq/server0/broker.xml | 3 +-- .../main/resources/activemq/server1/broker.xml | 3 +-- .../main/resources/activemq/server2/broker.xml | 3 +-- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../clustered/clustered-topic/readme.html | 1 - .../main/resources/activemq/server0/broker.xml | 3 +-- .../main/resources/activemq/server1/broker.xml | 3 +-- .../main/resources/activemq/server0/broker.xml | 5 ++--- .../main/resources/activemq/server1/broker.xml | 5 ++--- .../clustered/symmetric-cluster/readme.html | 1 - .../main/resources/activemq/server0/broker.xml | 3 +-- .../main/resources/activemq/server1/broker.xml | 3 +-- .../main/resources/activemq/server2/broker.xml | 3 +-- .../main/resources/activemq/server3/broker.xml | 3 +-- .../main/resources/activemq/server4/broker.xml | 3 +-- .../main/resources/activemq/server5/broker.xml | 3 +-- .../main/resources/activemq/server0/broker.xml | 9 ++++----- .../main/resources/activemq/server1/broker.xml | 9 ++++----- .../main/resources/activemq/server0/broker.xml | 3 +-- .../main/resources/activemq/server1/broker.xml | 3 +-- .../main/resources/activemq/server0/broker.xml | 1 - .../main/resources/activemq/server1/broker.xml | 1 - .../main/resources/activemq/server0/broker.xml | 3 +-- .../main/resources/activemq/server1/broker.xml | 3 +-- .../main/resources/activemq/server0/broker.xml | 3 +-- .../main/resources/activemq/server1/broker.xml | 3 +-- .../main/resources/activemq/server0/broker.xml | 3 +-- .../main/resources/activemq/server1/broker.xml | 3 +-- .../main/resources/activemq/server2/broker.xml | 3 +-- .../main/resources/activemq/server0/broker.xml | 3 +-- .../main/resources/activemq/server1/broker.xml | 3 +-- .../main/resources/activemq/server0/broker.xml | 7 +++---- .../main/resources/activemq/server1/broker.xml | 3 +-- .../main/resources/activemq/server0/broker.xml | 3 +-- .../main/resources/activemq/server1/broker.xml | 3 +-- .../main/resources/activemq/server0/broker.xml | 10 +++++----- .../main/resources/activemq/server1/broker.xml | 2 +- examples/features/standard/cdi/pom.xml | 12 ++++++++++++ .../main/resources/activemq/server0/broker.xml | 6 +++--- .../main/resources/activemq/server0/broker.xml | 4 ++-- .../main/resources/activemq/server0/broker.xml | 18 +++++++++--------- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 6 +++--- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server1/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../artemis/jms/example/LargeMessageExample.java | 2 +- .../main/resources/activemq/server0/broker.xml | 4 ++-- .../main/resources/activemq/server0/broker.xml | 6 +++--- .../artemis/jms/example/ManagementExample.java | 10 ++++++---- .../main/resources/activemq/server0/broker.xml | 8 ++++---- .../main/resources/activemq/server0/broker.xml | 8 ++++---- .../main/resources/activemq/server0/broker.xml | 8 ++++---- .../jms/example/PreacknowledgeExample.java | 3 ++- .../main/resources/activemq/server0/broker.xml | 4 ++-- .../main/resources/activemq/server0/broker.xml | 4 ++-- .../main/resources/activemq/server0/broker.xml | 4 ++-- .../main/resources/activemq/server0/broker.xml | 6 +++--- .../main/resources/activemq/server0/broker.xml | 6 +++--- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 6 +++--- .../main/resources/activemq/server0/broker.xml | 4 ++-- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 2 +- .../main/resources/activemq/server0/broker.xml | 8 ++++---- .../artemis/jms/example/ProtonCPPExample.java | 3 ++- .../main/resources/activemq/server0/broker.xml | 2 +- 99 files changed, 164 insertions(+), 200 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java index 5511ab6..e6f3795 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java @@ -162,8 +162,8 @@ public final class ActiveMQDefaultConfiguration { // the name of the address that consumers bind to receive management notifications private static SimpleString DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS = new SimpleString("activemq.notifications"); - // The default address used for clustering - private static String DEFAULT_CLUSTER_ADDRESS = "jms"; + // The default address used for clustering, empty string means all addresses + private static String DEFAULT_CLUSTER_ADDRESS = ""; // Cluster username. It applies to all cluster configurations. private static String DEFAULT_CLUSTER_USER = "ACTIVEMQ.CLUSTER.ADMIN.USER"; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java index 019996a..3bbd456 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java @@ -165,7 +165,7 @@ public final class ObjectNameBuilder { * Returns the ObjectName used by JMSQueueControl. */ public ObjectName getJMSQueueObjectName(final String name) throws Exception { - return createObjectName("Queue", name); + return getQueueObjectName(SimpleString.toSimpleString(name), SimpleString.toSimpleString(name)); } /** http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-durable-subscription/readme.html ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-durable-subscription/readme.html b/examples/features/clustered/clustered-durable-subscription/readme.html index d50b2b2..c0a7b2e 100644 --- a/examples/features/clustered/clustered-durable-subscription/readme.html +++ b/examples/features/clustered/clustered-durable-subscription/readme.html @@ -50,7 +50,6 @@ under the License. <p>The cli create method will define this section by default if you use --clustered as a parameter</p> <pre class="prettyprint"> <code><cluster-connection name="my-cluster"> - <address>jms</address> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> <message-load-balancing>STRICT</message-load-balancing> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java b/examples/features/clustered/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java index 7935ce5..d9e61e7 100644 --- a/examples/features/clustered/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java +++ b/examples/features/clustered/clustered-durable-subscription/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredDurableSubscriptionExample.java @@ -124,6 +124,8 @@ public class ClusteredDurableSubscriptionExample { if (connection1 != null) { connection1.close(); } + + Thread.sleep(1000); } } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 2bfaeae..880c184 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 @@ -68,7 +68,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -82,7 +81,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.topic.exampleTopic"> + <security-setting match="exampleTopic"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-durable-subscription/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 8134f27..3efae9e 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 @@ -67,7 +67,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -81,7 +80,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.topic.exampleTopic"> + <security-setting match="exampleTopic"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-grouping/readme.html ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-grouping/readme.html b/examples/features/clustered/clustered-grouping/readme.html index 7bce8f2..e066ca9 100644 --- a/examples/features/clustered/clustered-grouping/readme.html +++ b/examples/features/clustered/clustered-grouping/readme.html @@ -37,7 +37,6 @@ under the License. <code> <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -60,7 +59,6 @@ under the License. <code> <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> <message-load-balancing>STRICT</message-load-balancing> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 4520059..07e2c81 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 @@ -69,7 +69,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -81,7 +80,7 @@ under the License. <grouping-handler name="my-grouping-handler"> <type>LOCAL</type> - <address>jms</address> + <address>exampleQueue</address> <timeout>5000</timeout> <group-timeout>-1</group-timeout> <reaper-period>30000</reaper-period> @@ -91,7 +90,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 4765f7a..0d681c8 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 @@ -68,7 +68,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -80,7 +79,7 @@ under the License. <grouping-handler name="my-grouping-handler"> <type>REMOTE</type> - <address>jms</address> + <address>exampleQueue</address> <timeout>5000</timeout> </grouping-handler> @@ -88,7 +87,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-grouping/src/main/resources/activemq/server2/broker.xml ---------------------------------------------------------------------- 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 16bf2eb..c3a637f 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 @@ -68,7 +68,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -80,7 +79,7 @@ under the License. <grouping-handler name="my-grouping-handler"> <type>REMOTE</type> - <address>jms</address> + <address>exampleQueue</address> <timeout>5000</timeout> </grouping-handler> @@ -88,7 +87,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/broker.xml index 17809e5..763f6aa 100644 --- a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/broker.xml @@ -69,7 +69,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -83,7 +82,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/broker.xml index 267eae7..da3ffa3 100644 --- a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/broker.xml @@ -68,7 +68,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -82,7 +81,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-queue/readme.html ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-queue/readme.html b/examples/features/clustered/clustered-queue/readme.html index b5fce81..a39fc4c 100644 --- a/examples/features/clustered/clustered-queue/readme.html +++ b/examples/features/clustered/clustered-queue/readme.html @@ -40,7 +40,6 @@ under the License. and to load balance the messages between the nodes.</p> <pre class="prettyprint"> <code><cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 eb30a90..e0ee6e6 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 @@ -67,7 +67,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -81,7 +80,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 531fed1..84a8014 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 @@ -68,7 +68,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -82,7 +81,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-discovery-uri/readme.html ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-discovery-uri/readme.html b/examples/features/clustered/clustered-static-discovery-uri/readme.html index 88931b9..0dc1205 100644 --- a/examples/features/clustered/clustered-static-discovery-uri/readme.html +++ b/examples/features/clustered/clustered-static-discovery-uri/readme.html @@ -40,7 +40,6 @@ under the License. and to load balance the messages between the nodes.</p> <pre class="prettyprint"> <code><cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server0/broker.xml index be093ab..90ae4a1 100644 --- a/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server0/broker.xml @@ -56,7 +56,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server1/broker.xml index fc3bb2d..5245e12 100644 --- a/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server1/broker.xml @@ -56,7 +56,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server2/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server2/broker.xml b/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server2/broker.xml index 608796f..5f3f611 100644 --- a/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server2/broker.xml +++ b/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server2/broker.xml @@ -52,7 +52,7 @@ <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server3/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server3/broker.xml b/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server3/broker.xml index 950f8cd..53ce43f 100644 --- a/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server3/broker.xml +++ b/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server3/broker.xml @@ -53,7 +53,7 @@ <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-discovery/readme.html ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-discovery/readme.html b/examples/features/clustered/clustered-static-discovery/readme.html index 88931b9..0dc1205 100644 --- a/examples/features/clustered/clustered-static-discovery/readme.html +++ b/examples/features/clustered/clustered-static-discovery/readme.html @@ -40,7 +40,6 @@ under the License. and to load balance the messages between the nodes.</p> <pre class="prettyprint"> <code><cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml index b1bfd11..25361f5 100644 --- a/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server0/broker.xml @@ -52,7 +52,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -68,7 +67,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml index 0412576..14cc4ca 100644 --- a/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server1/broker.xml @@ -52,7 +52,6 @@ under the License. <!-- Clustering configuration --> <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -68,7 +67,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml b/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml index 98b8f04..051de1e 100644 --- a/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml +++ b/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server2/broker.xml @@ -49,7 +49,6 @@ <!-- Clustering configuration --> <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -65,7 +64,7 @@ <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml b/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml index 40bef87..15f0245 100644 --- a/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml +++ b/examples/features/clustered/clustered-static-discovery/src/main/resources/activemq/server3/broker.xml @@ -49,7 +49,6 @@ <!-- Clustering configuration --> <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -65,7 +64,7 @@ <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-oneway/readme.html ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-oneway/readme.html b/examples/features/clustered/clustered-static-oneway/readme.html index 04334a5..e7fb935 100644 --- a/examples/features/clustered/clustered-static-oneway/readme.html +++ b/examples/features/clustered/clustered-static-oneway/readme.html @@ -46,7 +46,6 @@ under the License. <pre class="prettyprint"> <code> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml b/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml index 3e86ed3..d17742f 100644 --- a/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server0/broker.xml @@ -49,7 +49,6 @@ <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -65,7 +64,7 @@ <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml b/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml index 1464ea9..38b513c 100644 --- a/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server1/broker.xml @@ -49,7 +49,6 @@ <!-- Clustering configuration --> <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -65,7 +64,7 @@ <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml b/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml index b1043f5..4ee7800 100644 --- a/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml +++ b/examples/features/clustered/clustered-static-oneway/src/main/resources/activemq/server2/broker.xml @@ -47,7 +47,6 @@ <!-- Clustering configuration --> <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -60,7 +59,7 @@ <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 546e2e6..7d147a3 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 @@ -75,7 +75,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.topic.exampleTopic"> + <security-setting match="exampleTopic"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-topic-uri/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 c7009f7..3140a06 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 @@ -73,7 +73,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.topic.exampleTopic"> + <security-setting match="exampleTopic"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-topic/readme.html ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-topic/readme.html b/examples/features/clustered/clustered-topic/readme.html index e46fca8..a36fd05 100644 --- a/examples/features/clustered/clustered-topic/readme.html +++ b/examples/features/clustered/clustered-topic/readme.html @@ -40,7 +40,6 @@ under the License. and to load balance the messages between the nodes.</p> <pre class="prettyprint"> <code><cluster-connection name="my-cluster"> - <address>jms</address> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> <message-load-balancing>STRICT</message-load-balancing> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-topic/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 a4e8dde..0385356 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 @@ -69,7 +69,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -83,7 +82,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.topic.exampleTopic"> + <security-setting match="exampleTopic"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/clustered-topic/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 78beec3..f03fb5f 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 @@ -67,7 +67,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -81,7 +80,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.topic.exampleTopic"> + <security-setting match="exampleTopic"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 70ff4d4..6df9b2b 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 @@ -67,7 +67,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -81,7 +80,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -97,7 +96,7 @@ under the License. Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed then another one quickly recreated you might want to set it thus, to avoid unnecessary redistribution --> - <address-setting match="jms.#"> + <address-setting match="#"> <redistribution-delay>0</redistribution-delay> </address-setting> </address-settings> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/queue-message-redistribution/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 6fc6f32..5fb5257 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 @@ -68,7 +68,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -82,7 +81,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -98,7 +97,7 @@ under the License. Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed then another one quickly recreated you might want to set it thus, to avoid unnecessary redistribution --> - <address-setting match="jms.#"> + <address-setting match="#"> <redistribution-delay>0</redistribution-delay> </address-setting> </address-settings> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/symmetric-cluster/readme.html ---------------------------------------------------------------------- diff --git a/examples/features/clustered/symmetric-cluster/readme.html b/examples/features/clustered/symmetric-cluster/readme.html index 043057d..78665d6 100644 --- a/examples/features/clustered/symmetric-cluster/readme.html +++ b/examples/features/clustered/symmetric-cluster/readme.html @@ -53,7 +53,6 @@ under the License. <pre class="prettyprint"> <code> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 cd89de7..bce8855 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 @@ -71,7 +71,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -85,7 +84,7 @@ under the License. <security-settings> <!-- Default JMS security --> - <security-setting match="jms.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 d95a1cd..a090399 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 @@ -69,7 +69,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -83,7 +82,7 @@ under the License. <security-settings> <!-- Default JMS security --> - <security-setting match="jms.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server2/broker.xml ---------------------------------------------------------------------- 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 ef006fd..50f3d27 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 @@ -69,7 +69,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -83,7 +82,7 @@ under the License. <security-settings> <!-- Default JMS security --> - <security-setting match="jms.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server3/broker.xml ---------------------------------------------------------------------- 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 a780ace..14b8535 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 @@ -69,7 +69,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -83,7 +82,7 @@ under the License. <security-settings> <!-- Default JMS security --> - <security-setting match="jms.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server4/broker.xml ---------------------------------------------------------------------- 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 20b622e..38a4202 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 @@ -68,7 +68,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -82,7 +81,7 @@ under the License. <security-settings> <!-- Default JMS security --> - <security-setting match="jms.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/clustered/symmetric-cluster/src/main/resources/activemq/server5/broker.xml ---------------------------------------------------------------------- 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 033af43..b450f7b 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 @@ -68,7 +68,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -82,7 +81,7 @@ under the License. <security-settings> <!-- Default JMS security --> - <security-setting match="jms.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 d5fcbf8..b3e052b 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 @@ -69,13 +69,12 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <!-- since the backup servers scale down we need a sensible setting here so the bridge will stop --> <reconnect-attempts>5</reconnect-attempts> <use-duplicate-detection>true</use-duplicate-detection> - <message-load-balancing>STRICT</message-load-balancing> + <message-load-balancing>OFF</message-load-balancing> <max-hops>1</max-hops> <discovery-group-ref discovery-group-name="my-discovery-group"/> </cluster-connection> @@ -104,7 +103,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -112,7 +111,7 @@ under the License. <permission type="consume" roles="guest"/> <permission type="send" roles="guest"/> </security-setting> - <security-setting match="jms.queue.activemq.management.#"> + <security-setting match="activemq.management.#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -120,7 +119,7 @@ under the License. <permission type="consume" roles="guest"/> <permission type="send" roles="guest"/> </security-setting> - <security-setting match="jms.queue.activemq.management"> + <security-setting match="activemq.management"> <permission type="manage" roles="guest"/> </security-setting> </security-settings> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/colocated-failover-scale-down/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 d849b10..de6f79a 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 @@ -69,13 +69,12 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <!-- since the backup servers scale down we need a sensible setting here so the bridge will stop --> <reconnect-attempts>5</reconnect-attempts> <use-duplicate-detection>true</use-duplicate-detection> - <message-load-balancing>STRICT</message-load-balancing> + <message-load-balancing>OFF</message-load-balancing> <max-hops>1</max-hops> <discovery-group-ref discovery-group-name="my-discovery-group"/> </cluster-connection> @@ -102,7 +101,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -110,7 +109,7 @@ under the License. <permission type="consume" roles="guest"/> <permission type="send" roles="guest"/> </security-setting> - <security-setting match="jms.queue.activemq.management.#"> + <security-setting match="activemq.management.#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -118,7 +117,7 @@ under the License. <permission type="consume" roles="guest"/> <permission type="send" roles="guest"/> </security-setting> - <security-setting match="jms.queue.activemq.management"> + <security-setting match="activemq.management"> <permission type="manage" roles="guest"/> </security-setting> </security-settings> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/colocated-failover/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 f569d39..c1d103f 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 @@ -67,7 +67,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -100,7 +99,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/colocated-failover/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 71015e5..0a33683 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 @@ -67,7 +67,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> @@ -100,7 +99,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/ha/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml index db98aa0..7d6b0a1 100644 --- a/examples/features/ha/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/ha-policy-autobackup/src/main/resources/activemq/server0/broker.xml @@ -77,7 +77,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/ha/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml index 760ce0d..435444b 100644 --- a/examples/features/ha/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/ha-policy-autobackup/src/main/resources/activemq/server1/broker.xml @@ -77,7 +77,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/replicated-failback-static/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/ha/replicated-failback-static/src/main/resources/activemq/server0/broker.xml b/examples/features/ha/replicated-failback-static/src/main/resources/activemq/server0/broker.xml index f6fa349..d7bdaec 100644 --- a/examples/features/ha/replicated-failback-static/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/ha/replicated-failback-static/src/main/resources/activemq/server0/broker.xml @@ -62,7 +62,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <static-connectors> <connector-ref>netty-backup-connector</connector-ref> @@ -73,7 +72,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/replicated-failback-static/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/ha/replicated-failback-static/src/main/resources/activemq/server1/broker.xml b/examples/features/ha/replicated-failback-static/src/main/resources/activemq/server1/broker.xml index 9b89d80..0ef447d 100644 --- a/examples/features/ha/replicated-failback-static/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/ha/replicated-failback-static/src/main/resources/activemq/server1/broker.xml @@ -64,7 +64,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <static-connectors> <connector-ref>netty-live-connector</connector-ref> @@ -75,7 +74,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/replicated-failback/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 c7f4783..089bb7b 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 @@ -78,7 +78,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <discovery-group-ref discovery-group-name="dg-group1"/> </cluster-connection> @@ -87,7 +86,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/replicated-failback/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 da5a656..52aa733 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 @@ -79,7 +79,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <discovery-group-ref discovery-group-name="dg-group1"/> </cluster-connection> @@ -88,7 +87,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 43f1693..f6e061b 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 @@ -72,7 +72,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <discovery-group-ref discovery-group-name="dg-group1"/> </cluster-connection> @@ -81,7 +80,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 7f17fb8..5208153 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 @@ -72,7 +72,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <discovery-group-ref discovery-group-name="dg-group1"/> </cluster-connection> @@ -81,7 +80,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/replicated-multiple-failover/src/main/resources/activemq/server2/broker.xml ---------------------------------------------------------------------- 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 c5f06cc..b43bd18 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 @@ -72,7 +72,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <discovery-group-ref discovery-group-name="dg-group1"/> </cluster-connection> @@ -81,7 +80,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 f8b076a..b8fca09 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 @@ -73,7 +73,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <discovery-group-ref discovery-group-name="dg-group1"/> </cluster-connection> @@ -82,7 +81,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/replicated-transaction-failover/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 f64af4e..9844163 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 @@ -73,7 +73,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <discovery-group-ref discovery-group-name="dg-group1"/> </cluster-connection> @@ -83,7 +82,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/ha/scale-down/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 559bb5a..dfb1e2c 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 @@ -67,7 +67,6 @@ under the License. <cluster-connections> <cluster-connection name="my-cluster"> - <address>jms</address> <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <reconnect-attempts>5</reconnect-attempts> @@ -84,7 +83,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.exampleQueue"> + <security-setting match="exampleQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -92,7 +91,7 @@ under the License. <permission type="consume" roles="guest"/> <permission type="send" roles="guest"/> </security-setting> - <security-setting match="jms.queue.activemq.management"> + <security-setting match="activemq.management"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -101,7 +100,7 @@ under the License. <permission type="send" roles="guest"/> <permission type="manage" roles="guest"/> </security-setting> - <security-setting match="jms.queue.activemq.management.*"> + <security-setting match="activemq.management.*"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/>
