http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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 006b2ca..9abc109 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 @@ -51,7 +51,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> @@ -67,7 +66,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/0861be14/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 e1ec02b..734c216 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 @@ -51,7 +51,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> @@ -67,7 +66,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/0861be14/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 2585fba..d08f9b3 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 @@ -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> @@ -62,7 +61,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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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/0861be14/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"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/ha/scale-down/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 6211cd3..9150adf 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 @@ -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> <reconnect-attempts>5</reconnect-attempts> @@ -94,7 +93,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/0861be14/examples/features/ha/transaction-failover/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- 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 916fdf5..ab54ff0 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 @@ -75,7 +75,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> @@ -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"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/ha/transaction-failover/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- 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 055f04a..0407877 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 @@ -74,7 +74,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> @@ -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"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/standard/bridge/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/bridge/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/bridge/src/main/resources/activemq/server0/broker.xml index 8375901..ad12305 100644 --- a/examples/features/standard/bridge/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/bridge/src/main/resources/activemq/server0/broker.xml @@ -50,8 +50,8 @@ under the License. <!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed before the JMS queue is deployed, so the first time, it otherwise won't find the queue --> <queues> - <queue name="jms.queue.sausage-factory"> - <address>jms.queue.sausage-factory</address> + <queue name="sausage-factory"> + <address>sausage-factory</address> </queue> </queues> @@ -59,8 +59,8 @@ under the License. We specify a filter with the bridge, and a transformer too. The filter and transformer are optional --> <bridges> <bridge name="my-bridge"> - <queue-name>jms.queue.sausage-factory</queue-name> - <forwarding-address>jms.queue.mincing-machine</forwarding-address> + <queue-name>sausage-factory</queue-name> + <forwarding-address>mincing-machine</forwarding-address> <filter string="name='aardvark'"/> <transformer-class-name>org.apache.activemq.artemis.jms.example.HatColourChangeTransformer</transformer-class-name> <reconnect-attempts>-1</reconnect-attempts> @@ -74,7 +74,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.#"> + <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/0861be14/examples/features/standard/bridge/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/bridge/src/main/resources/activemq/server1/broker.xml b/examples/features/standard/bridge/src/main/resources/activemq/server1/broker.xml index 4d6c6e5..9aa1392 100644 --- a/examples/features/standard/bridge/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/standard/bridge/src/main/resources/activemq/server1/broker.xml @@ -45,7 +45,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.queue.#"> + <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/0861be14/examples/features/standard/cdi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/cdi/pom.xml b/examples/features/standard/cdi/pom.xml index ade48c4..be344eb 100644 --- a/examples/features/standard/cdi/pom.xml +++ b/examples/features/standard/cdi/pom.xml @@ -137,6 +137,18 @@ <clientClass>org.apache.activemq.artemis.core.example.CDIExample</clientClass> </configuration> </execution> + <execution> + <id>stop</id> + <goals> + <goal>cli</goal> + </goals> + <configuration> + <ignore>${noServer}</ignore> + <args> + <param>stop</param> + </args> + </configuration> + </execution> </executions> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/standard/dead-letter/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/dead-letter/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/dead-letter/src/main/resources/activemq/server0/broker.xml index a7f3030..3325561 100644 --- a/examples/features/standard/dead-letter/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/dead-letter/src/main/resources/activemq/server0/broker.xml @@ -49,7 +49,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -61,8 +61,8 @@ under the License. <address-settings> <!--override the max-delivery-attempts and dead letter address for the example queue--> - <address-setting match="jms.queue.exampleQueue"> - <dead-letter-address>jms.queue.deadLetterQueue</dead-letter-address> + <address-setting match="exampleQueue"> + <dead-letter-address>deadLetterQueue</dead-letter-address> <max-delivery-attempts>3</max-delivery-attempts> </address-setting> </address-settings> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/standard/delayed-redelivery/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/delayed-redelivery/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/delayed-redelivery/src/main/resources/activemq/server0/broker.xml index e4412b9..7171ad0 100644 --- a/examples/features/standard/delayed-redelivery/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/delayed-redelivery/src/main/resources/activemq/server0/broker.xml @@ -49,7 +49,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -61,7 +61,7 @@ under the License. <address-settings> <!--override the redelivery-delay for the example queue--> - <address-setting match="jms.queue.exampleQueue"> + <address-setting match="exampleQueue"> <redelivery-delay>5000</redelivery-delay> </address-setting> </address-settings> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/standard/divert/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/divert/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/divert/src/main/resources/activemq/server0/broker.xml index 9ad847c..ac264c1 100644 --- a/examples/features/standard/divert/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/divert/src/main/resources/activemq/server0/broker.xml @@ -66,23 +66,23 @@ under the License. <!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed before the JMS queue is deployed, so the first time, it otherwise won't find the queue --> <queues> - <queue name="jms.queue.priceForwarding"> - <address>jms.queue.priceForwarding</address> + <queue name="priceForwarding"> + <address>priceForwarding</address> </queue> </queues> <diverts> <divert name="order-divert"> <routing-name>order-divert</routing-name> - <address>jms.queue.orders</address> - <forwarding-address>jms.topic.spyTopic</forwarding-address> + <address>orders</address> + <forwarding-address>spyTopic</forwarding-address> <exclusive>false</exclusive> </divert> <divert name="prices-divert"> <routing-name>prices-divert</routing-name> - <address>jms.topic.priceUpdates</address> - <forwarding-address>jms.queue.priceForwarding</forwarding-address> + <address>priceUpdates</address> + <forwarding-address>priceForwarding</forwarding-address> <filter string="office='New York'"/> <transformer-class-name>org.apache.activemq.artemis.jms.example.AddForwardingTimeTransformer </transformer-class-name> @@ -94,8 +94,8 @@ under the License. <bridges> <bridge name="price-forward-bridge"> - <queue-name>jms.queue.priceForwarding</queue-name> - <forwarding-address>jms.topic.newYorkPriceUpdates</forwarding-address> + <queue-name>priceForwarding</queue-name> + <forwarding-address>newYorkPriceUpdates</forwarding-address> <reconnect-attempts>-1</reconnect-attempts> <static-connectors> <connector-ref>newyork-connector</connector-ref> @@ -107,7 +107,7 @@ under the License. <security-settings> <!--security for example --> - <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/0861be14/examples/features/standard/divert/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/divert/src/main/resources/activemq/server1/broker.xml b/examples/features/standard/divert/src/main/resources/activemq/server1/broker.xml index 26d6d95..778607e 100644 --- a/examples/features/standard/divert/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/standard/divert/src/main/resources/activemq/server1/broker.xml @@ -50,7 +50,7 @@ under the License. <security-settings> <!--security for example queue--> - <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/0861be14/examples/features/standard/durable-subscription/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/durable-subscription/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/durable-subscription/src/main/resources/activemq/server0/broker.xml index 8e319fa..08c7c40 100644 --- a/examples/features/standard/durable-subscription/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/durable-subscription/src/main/resources/activemq/server0/broker.xml @@ -47,7 +47,7 @@ under the License. <security-settings> <!--security for example topic--> - <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/0861be14/examples/features/standard/expiry/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/expiry/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/expiry/src/main/resources/activemq/server0/broker.xml index 731baaa..32805f1 100644 --- a/examples/features/standard/expiry/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/expiry/src/main/resources/activemq/server0/broker.xml @@ -49,7 +49,7 @@ under the License. <security-settings> <!--security for example queue--> - <security-setting match="jms.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -61,8 +61,8 @@ under the License. <address-settings> <!--override the expiry address for the example--> - <address-setting match="jms.queue.exampleQueue"> - <expiry-address>jms.queue.expiryQueue</expiry-address> + <address-setting match="exampleQueue"> + <expiry-address>expiryQueue</expiry-address> </address-setting> </address-settings> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/standard/http-transport/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/http-transport/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/http-transport/src/main/resources/activemq/server0/broker.xml index d1a4d2a..f91e249 100644 --- a/examples/features/standard/http-transport/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/http-transport/src/main/resources/activemq/server0/broker.xml @@ -47,7 +47,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/0861be14/examples/features/standard/interceptor/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/interceptor/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/interceptor/src/main/resources/activemq/server0/broker.xml index 49e780b..531829c 100644 --- a/examples/features/standard/interceptor/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/interceptor/src/main/resources/activemq/server0/broker.xml @@ -51,7 +51,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/0861be14/examples/features/standard/jms-bridge/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/jms-bridge/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/jms-bridge/src/main/resources/activemq/server0/broker.xml index cf211a7..3b9df04 100644 --- a/examples/features/standard/jms-bridge/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/jms-bridge/src/main/resources/activemq/server0/broker.xml @@ -41,7 +41,7 @@ under the License. </acceptors> <security-settings> - <security-setting match="jms.#"> + <security-setting match="#"> <permission type="consume" roles="guest"/> <permission type="send" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/standard/jms-bridge/src/main/resources/activemq/server1/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/jms-bridge/src/main/resources/activemq/server1/broker.xml b/examples/features/standard/jms-bridge/src/main/resources/activemq/server1/broker.xml index 8ec2378..39089f8 100644 --- a/examples/features/standard/jms-bridge/src/main/resources/activemq/server1/broker.xml +++ b/examples/features/standard/jms-bridge/src/main/resources/activemq/server1/broker.xml @@ -41,7 +41,7 @@ under the License. </acceptors> <security-settings> - <security-setting match="jms.#"> + <security-setting match="#"> <permission type="consume" roles="guest"/> <permission type="send" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/standard/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml index 8e319fa..08c7c40 100644 --- a/examples/features/standard/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/jms-shared-consumer/src/main/resources/activemq/server0/broker.xml @@ -47,7 +47,7 @@ under the License. <security-settings> <!--security for example topic--> - <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/0861be14/examples/features/standard/jmx/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/jmx/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/jmx/src/main/resources/activemq/server0/broker.xml index 90a6178..b251d37 100644 --- a/examples/features/standard/jmx/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/jmx/src/main/resources/activemq/server0/broker.xml @@ -50,7 +50,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"/>
