http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/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/07ab2001/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/07ab2001/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/07ab2001/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/07ab2001/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/07ab2001/examples/features/standard/cdi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/cdi/pom.xml b/examples/features/standard/cdi/pom.xml index e6e00ae..22915cc 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/07ab2001/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/07ab2001/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/07ab2001/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/07ab2001/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/07ab2001/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/07ab2001/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/07ab2001/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/07ab2001/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/07ab2001/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/07ab2001/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/07ab2001/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/07ab2001/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"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java b/examples/features/standard/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java index 702fe41..da47577 100644 --- a/examples/features/standard/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java +++ b/examples/features/standard/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java @@ -46,7 +46,7 @@ public class LargeMessageExample { * This may take some considerable time to create, send and consume - if it takes too long or you * don't have enough disk space just reduce the file size here */ - private static final long FILE_SIZE = 2L * 1024 * 1024 * 1024; // 2 GiB message + private static final long FILE_SIZE = 2L;// * 1024 * 1024 * 1024; // 2 GiB message public static void main(final String[] args) throws Exception { Process server = null; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/last-value-queue/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/last-value-queue/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/last-value-queue/src/main/resources/activemq/server0/broker.xml index 267d8c9..18eb207 100644 --- a/examples/features/standard/last-value-queue/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/last-value-queue/src/main/resources/activemq/server0/broker.xml @@ -46,7 +46,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"/> @@ -58,7 +58,7 @@ under the License. </security-settings> <address-settings> - <address-setting match="jms.queue.exampleQueue"> + <address-setting match="exampleQueue"> <last-value-queue>true</last-value-queue> </address-setting> </address-settings> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/management-notifications/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/management-notifications/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/management-notifications/src/main/resources/activemq/server0/broker.xml index 279f2d2..e74c8bb 100644 --- a/examples/features/standard/management-notifications/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/management-notifications/src/main/resources/activemq/server0/broker.xml @@ -41,7 +41,7 @@ under the License. <paging-directory>./data/messaging/paging</paging-directory> - <management-notification-address>jms.topic.notificationsTopic</management-notification-address> + <management-notification-address>notificationsTopic</management-notification-address> <!-- Netty standard TCP acceptor --> <acceptors> @@ -52,7 +52,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"/> @@ -62,7 +62,7 @@ under the License. </security-setting> <!--security for notification queue--> - <security-setting match="jms.topic.notificationsTopic"> + <security-setting match="notificationsTopic"> <permission type="consume" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> <permission type="deleteNonDurableQueue" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java b/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java index f1ceb3a..a463a13 100644 --- a/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java +++ b/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java @@ -30,6 +30,8 @@ import javax.naming.InitialContext; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper; +import org.apache.activemq.artemis.api.core.management.ResourceNames; +import org.apache.activemq.artemis.api.core.FilterConstants; /** * An example that shows how to manage ActiveMQ Artemis using JMS messages. @@ -81,7 +83,7 @@ public class ManagementExample { // Step 13. Use a helper class to fill the JMS message with management information: // * the name of the resource to manage // * in this case, we want to retrieve the value of the messageCount of the queue - JMSManagementHelper.putAttribute(m, "exampleQueue", "messageCount"); + JMSManagementHelper.putAttribute(m, ResourceNames.QUEUE + "exampleQueue", "messageCount"); // Step 14. Use the requestor to send the request and wait for the reply Message reply = requestor.request(m); @@ -97,7 +99,7 @@ public class ManagementExample { // * the object name of the resource to manage (i.e. the queue) // * in this case, we want to call the "removeMessage" operation with the JMS MessageID // of the message sent to the queue in step 8. - JMSManagementHelper.putOperationInvocation(m, "exampleQueue", "removeMessage", message.getJMSMessageID()); + JMSManagementHelper.putOperationInvocation(m, ResourceNames.QUEUE + "exampleQueue", "removeMessages", FilterConstants.ACTIVEMQ_USERID + " = '" + message.getJMSMessageID() + "'"); // Step 18 Use the requestor to send the request and wait for the reply reply = requestor.request(m); @@ -107,8 +109,8 @@ public class ManagementExample { System.out.println("operation invocation has succeeded: " + success); // Step 20. Use a helper class to retrieve the operation result - // in that case, a boolean which is true if the message was removed, false else - boolean messageRemoved = (Boolean) JMSManagementHelper.getResult(reply); + // in that case, a long which is 1 if the message was removed, 0 else + boolean messageRemoved = 1 == (long) JMSManagementHelper.getResult(reply); System.out.println("message has been removed: " + messageRemoved); // Step 21. Create a JMS Message Consumer on the queue http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/management/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/management/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/management/src/main/resources/activemq/server0/broker.xml index dc62e6f..218e621 100644 --- a/examples/features/standard/management/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/management/src/main/resources/activemq/server0/broker.xml @@ -38,7 +38,7 @@ under the License. <paging-directory>./data/messaging/paging</paging-directory> - <management-address>jms.queue.activemq.management</management-address> + <management-address>activemq.management</management-address> <!-- Netty standard TCP acceptor --> <acceptors> @@ -48,7 +48,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"/> @@ -58,12 +58,12 @@ under the License. </security-setting> <!--security for management queue--> - <security-setting match="jms.queue.activemq.management"> + <security-setting match="activemq.management"> <permission type="manage" roles="guest"/> </security-setting> <!-- security settings for JMS temporary queue --> - <security-setting match="jms.tempqueue.#"> + <security-setting match="#"> <permission type="createNonDurableQueue" roles="guest"/> <permission type="deleteNonDurableQueue" roles="guest"/> <permission type="consume" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/message-counters/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/message-counters/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/message-counters/src/main/resources/activemq/server0/broker.xml index f946982..39bba47 100644 --- a/examples/features/standard/message-counters/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/message-counters/src/main/resources/activemq/server0/broker.xml @@ -55,7 +55,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"/> @@ -65,7 +65,7 @@ under the License. </security-setting> <!--security for dead letter queue--> - <security-setting match="jms.queue.expiryQueue"> + <security-setting match="expiryQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -77,8 +77,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/07ab2001/examples/features/standard/paging/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/paging/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/paging/src/main/resources/activemq/server0/broker.xml index 04c77c4..1da9ff5 100644 --- a/examples/features/standard/paging/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/paging/src/main/resources/activemq/server0/broker.xml @@ -54,7 +54,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"/> @@ -63,7 +63,7 @@ under the License. <permission type="send" roles="guest"/> </security-setting> - <security-setting match="jms.queue.pagingQueue"> + <security-setting match="pagingQueue"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -74,12 +74,12 @@ under the License. </security-settings> <address-settings> - <address-setting match="jms.queue.pagingQueue"> + <address-setting match="pagingQueue"> <max-size-bytes>100000</max-size-bytes> <page-size-bytes>20000</page-size-bytes> </address-setting> - <address-setting match="jms.queue.exampleQueue"> + <address-setting match="exampleQueue"> <max-size-bytes>10485760</max-size-bytes> <page-size-bytes>1048576</page-size-bytes> </address-setting> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java b/examples/features/standard/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java index 8a3fe10..d840c32 100644 --- a/examples/features/standard/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java +++ b/examples/features/standard/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java @@ -31,6 +31,7 @@ import javax.jms.TextMessage; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants; import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper; +import org.apache.activemq.artemis.api.core.management.ResourceNames; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; /** @@ -113,7 +114,7 @@ public class PreacknowledgeExample { Message m = session.createMessage(); - JMSManagementHelper.putAttribute(m, "exampleQueue", "messageCount"); + JMSManagementHelper.putAttribute(m, ResourceNames.QUEUE + "exampleQueue", "messageCount"); Message response = requestor.request(m); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/pre-acknowledge/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/pre-acknowledge/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/pre-acknowledge/src/main/resources/activemq/server0/broker.xml index 4379ab8..c13644b 100644 --- a/examples/features/standard/pre-acknowledge/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/pre-acknowledge/src/main/resources/activemq/server0/broker.xml @@ -45,7 +45,7 @@ under the License. <!-- Other config --> <security-settings> - <security-setting match="jms.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -54,7 +54,7 @@ under the License. <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/standard/queue-requestor/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/queue-requestor/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/queue-requestor/src/main/resources/activemq/server0/broker.xml index 612b35b..64a5ba3 100644 --- a/examples/features/standard/queue-requestor/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/queue-requestor/src/main/resources/activemq/server0/broker.xml @@ -46,7 +46,7 @@ under the License. <security-settings> <!--security for example queues --> - <security-setting match="jms.queue.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -55,7 +55,7 @@ under the License. <permission type="send" roles="guest"/> </security-setting> <!-- security settings for JMS temporary queue --> - <security-setting match="jms.tempqueue.#"> + <security-setting match="#"> <permission type="createNonDurableQueue" roles="guest"/> <permission type="deleteNonDurableQueue" roles="guest"/> <permission type="consume" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/reattach-node/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/reattach-node/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/reattach-node/src/main/resources/activemq/server0/broker.xml index f646990..ec41710 100644 --- a/examples/features/standard/reattach-node/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/reattach-node/src/main/resources/activemq/server0/broker.xml @@ -61,7 +61,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"/> @@ -70,7 +70,7 @@ under the License. <permission type="send" roles="guest"/> </security-setting> - <security-setting match="jms.queue.activemq.management"> + <security-setting match="activemq.management"> <permission type="consume" roles="guest"/> <permission type="send" roles="guest"/> <permission type="manage" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/security-ldap/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/security-ldap/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/security-ldap/src/main/resources/activemq/server0/broker.xml index 667ac95..bb96922 100644 --- a/examples/features/standard/security-ldap/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/security-ldap/src/main/resources/activemq/server0/broker.xml @@ -52,7 +52,7 @@ under the License. <security-settings> <!-- any user can have full control of generic topics --> - <security-setting match="jms.topic.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="user"/> <permission type="deleteDurableQueue" roles="user"/> <permission type="createNonDurableQueue" roles="user"/> @@ -61,7 +61,7 @@ under the License. <permission type="consume" roles="user"/> </security-setting> - <security-setting match="jms.topic.news.europe.#"> + <security-setting match="news.europe.#"> <permission type="createDurableQueue" roles="user"/> <permission type="deleteDurableQueue" roles="user"/> <permission type="createNonDurableQueue" roles="user"/> @@ -70,7 +70,7 @@ under the License. <permission type="consume" roles="news-user"/> </security-setting> - <security-setting match="jms.topic.news.us.#"> + <security-setting match="news.us.#"> <permission type="createDurableQueue" roles="user"/> <permission type="deleteDurableQueue" roles="user"/> <permission type="createNonDurableQueue" roles="user"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/security/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/security/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/security/src/main/resources/activemq/server0/broker.xml index e2dc187..28612c4 100644 --- a/examples/features/standard/security/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/security/src/main/resources/activemq/server0/broker.xml @@ -49,7 +49,7 @@ under the License. <security-settings> <!-- any user can have full control of generic topics --> - <security-setting match="jms.topic.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="user"/> <permission type="deleteDurableQueue" roles="user"/> <permission type="createNonDurableQueue" roles="user"/> @@ -58,7 +58,7 @@ under the License. <permission type="consume" roles="user"/> </security-setting> - <security-setting match="jms.topic.news.europe.#"> + <security-setting match="news.europe.#"> <permission type="createDurableQueue" roles="user"/> <permission type="deleteDurableQueue" roles="user"/> <permission type="createNonDurableQueue" roles="user"/> @@ -67,7 +67,7 @@ under the License. <permission type="consume" roles="news-user"/> </security-setting> - <security-setting match="jms.topic.news.us.#"> + <security-setting match="news.us.#"> <permission type="createDurableQueue" roles="user"/> <permission type="deleteDurableQueue" roles="user"/> <permission type="createNonDurableQueue" roles="user"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/ssl-enabled-dual-authentication/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/ssl-enabled-dual-authentication/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/ssl-enabled-dual-authentication/src/main/resources/activemq/server0/broker.xml index 14fa849..438a751 100644 --- a/examples/features/standard/ssl-enabled-dual-authentication/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/ssl-enabled-dual-authentication/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="consume" roles="consumers"/> <permission type="send" roles="producers"/> </security-setting> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/ssl-enabled/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/ssl-enabled/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/ssl-enabled/src/main/resources/activemq/server0/broker.xml index 4bf6371..1b209d8 100644 --- a/examples/features/standard/ssl-enabled/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/ssl-enabled/src/main/resources/activemq/server0/broker.xml @@ -46,7 +46,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/standard/static-selector/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/static-selector/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/static-selector/src/main/resources/activemq/server0/broker.xml index 59ce149..e9cde42 100644 --- a/examples/features/standard/static-selector/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/static-selector/src/main/resources/activemq/server0/broker.xml @@ -43,8 +43,8 @@ under the License. </acceptors> <queues> - <queue name="jms.queue.exampleQueue"> - <address>jms.queue.exampleQueue</address> + <queue name="exampleQueue"> + <address>exampleQueue</address> <filter string="color='red'"/> </queue> </queues> @@ -53,7 +53,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/standard/temp-queue/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/temp-queue/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/temp-queue/src/main/resources/activemq/server0/broker.xml index 2dd2df9..15fd199 100644 --- a/examples/features/standard/temp-queue/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/temp-queue/src/main/resources/activemq/server0/broker.xml @@ -45,7 +45,7 @@ under the License. <!-- Other config --> <security-settings> <!--security for example queues --> - <security-setting match="jms.queue.#"> + <security-setting match="#"> <permission type="createDurableQueue" roles="guest"/> <permission type="deleteDurableQueue" roles="guest"/> <permission type="createNonDurableQueue" roles="guest"/> @@ -54,7 +54,7 @@ under the License. <permission type="send" roles="guest"/> </security-setting> <!-- security settings for JMS temporary queue --> - <security-setting match="jms.tempqueue.#"> + <security-setting match="#"> <permission type="createNonDurableQueue" roles="guest"/> <permission type="deleteNonDurableQueue" roles="guest"/> <permission type="consume" roles="guest"/> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/features/standard/topic-selector-example1/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/topic-selector-example1/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/topic-selector-example1/src/main/resources/activemq/server0/broker.xml index d45eb5d..030aa73 100644 --- a/examples/features/standard/topic-selector-example1/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/topic-selector-example1/src/main/resources/activemq/server0/broker.xml @@ -46,7 +46,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/07ab2001/examples/features/standard/topic-selector-example2/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/topic-selector-example2/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/topic-selector-example2/src/main/resources/activemq/server0/broker.xml index d45eb5d..030aa73 100644 --- a/examples/features/standard/topic-selector-example2/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/topic-selector-example2/src/main/resources/activemq/server0/broker.xml @@ -46,7 +46,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/07ab2001/examples/features/sub-modules/aerogear/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/sub-modules/aerogear/src/main/resources/activemq/server0/broker.xml b/examples/features/sub-modules/aerogear/src/main/resources/activemq/server0/broker.xml index 1095761..3751be0 100644 --- a/examples/features/sub-modules/aerogear/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/sub-modules/aerogear/src/main/resources/activemq/server0/broker.xml @@ -45,8 +45,8 @@ under the License. <!-- We need to create a core queue for the JMS queue explicitly because the connector 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.exampleQueue"> - <address>jms.queue.exampleQueue</address> + <queue name="exampleQueue"> + <address>exampleQueue</address> </queue> </queues> @@ -54,7 +54,7 @@ under the License. <connector-service name="aerogear-connector"> <factory-class>org.apache.activemq.artemis.integration.aerogear.AeroGearConnectorServiceFactory</factory-class> <param key="endpoint" value="${endpoint}"/> - <param key="queue" value="jms.queue.exampleQueue"/> + <param key="queue" value="exampleQueue"/> <param key="application-id" value="${applicationid}"/> <param key="master-secret" value="${mastersecret}"/> </connector-service> @@ -64,7 +64,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/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java ---------------------------------------------------------------------- diff --git a/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java b/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java index a166dc2..0c389f4 100644 --- a/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java +++ b/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java @@ -30,6 +30,7 @@ import javax.naming.InitialContext; import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient; import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper; +import org.apache.activemq.artemis.api.core.management.ResourceNames; /** * This example demonstrates the use of ActiveMQ Artemis "pre-acknowledge" functionality where @@ -107,7 +108,7 @@ public class ProtonCPPExample { Message m = session.createMessage(); - JMSManagementHelper.putAttribute(m, "exampleQueue", "messageCount"); + JMSManagementHelper.putAttribute(m, ResourceNames.QUEUE + "exampleQueue", "messageCount"); Message response = requestor.request(m); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07ab2001/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/broker.xml b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/broker.xml index 14fa849..438a751 100644 --- a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/broker.xml +++ b/examples/protocols/stomp/stomp-dual-authentication/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="consume" roles="consumers"/> <permission type="send" roles="producers"/> </security-setting>
