http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/examples/features/standard/client-kickoff/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/client-kickoff/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/client-kickoff/src/main/resources/activemq/server0/broker.xml index 75bcc2b..455eabe 100644 --- a/examples/features/standard/client-kickoff/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/client-kickoff/src/main/resources/activemq/server0/broker.xml @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,14 +16,8 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> - -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - <jms xmlns="urn:activemq:jms"> - - </jms> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> + <core xmlns="urn:activemq:core"> @@ -42,6 +36,7 @@ under the License. <acceptors> <acceptor name="netty">tcp://localhost:61616</acceptor> </acceptors> + <addresses/> </core> </configuration>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 3325561..f3675a7 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,19 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - - <!-- the dead letter queue where dead messages will be sent--> - <queue name="deadLetterQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -50,12 +40,12 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="#"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> @@ -67,5 +57,17 @@ under the License. </address-setting> </address-settings> + <addresses> + <address name="deadLetterQueue"> + <anycast> + <queue name="deadLetterQueue"/> + </anycast> + </address> + <address name="exampleQueue"> + <anycast> + <queue name="exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 7171ad0..d86844b 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,19 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - - <!-- the dead letter queue where dead messages will be sent--> - <queue name="deadLetterQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -50,12 +40,12 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="#"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> @@ -66,5 +56,17 @@ under the License. </address-setting> </address-settings> + <addresses> + <address name="deadLetterQueue"> + <anycast> + <queue name="deadLetterQueue"/> + </anycast> + </address> + <address name="exampleQueue"> + <anycast> + <queue name="exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 ac264c1..567bf77 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,27 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!-- Destinations used by the example --> - - <!-- The order queue --> - <queue name="orders"/> - - <!-- The queue that prices are forwarded to before being bridged to the New York server --> - <queue name="priceForwarding"/> - - <!-- The topic for price updates --> - <topic name="priceUpdates"/> - - <!-- The spy topic for snooping on orders --> - <topic name="spyTopic"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -65,11 +47,7 @@ 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="priceForwarding"> - <address>priceForwarding</address> - </queue> - </queues> + <diverts> <divert name="order-divert"> @@ -108,14 +86,35 @@ under the License. <security-settings> <!--security for example --> <security-setting match="#"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> + <addresses> + <address name="priceForwarding"> + <multicast> + <queue name="priceForwarding"/> + </multicast> + <anycast> + <queue name="jms.queue.priceForwarding"/> + </anycast> + </address> + <address name="orders"> + <anycast> + <queue name="jms.queue.orders"/> + </anycast> + </address> + <address name="spyTopic"> + <multicast/> + </address> + <address name="priceUpdates"> + <multicast/> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 778607e..4b2ee13 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,19 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!-- Destinations used by the example --> - - <!-- The topic for New York price updates --> - - <topic name="newYorkPriceUpdates"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -51,14 +41,19 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="#"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> + <addresses> + <address name="newYorkPriceUpdates"> + <multicast/> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 08c7c40..d3352b1 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the topic used by the example--> - <topic name="exampleTopic"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -48,14 +41,19 @@ under the License. <security-settings> <!--security for example topic--> <security-setting match="exampleTopic"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> + <addresses> + <address name="exampleTopic"> + <multicast/> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 32805f1..fd26edd 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,19 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - - <!--the expiry queue where expired messages will be sent--> - <queue name="expiryQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -50,12 +40,12 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="#"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> @@ -66,5 +56,17 @@ under the License. </address-setting> </address-settings> + <addresses> + <address name="exampleQueue"> + <anycast> + <queue name="exampleQueue"/> + </anycast> + </address> + <address name="expiryQueue"> + <anycast> + <queue name="expiryQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 f91e249..db5d588 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -48,14 +41,21 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> + <addresses> + <address name="exampleQueue"> + <anycast> + <queue name="exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 531829c..11c324d 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -52,14 +45,21 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> + <addresses> + <address name="exampleQueue"> + <anycast> + <queue name="exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/examples/features/standard/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java b/examples/features/standard/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java index 82e8819..5b25a82 100644 --- a/examples/features/standard/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java +++ b/examples/features/standard/jms-bridge/src/main/java/org/apache/activemq/artemis/jms/example/JMSBridgeExample.java @@ -93,7 +93,7 @@ public class JMSBridgeExample { targetConnection.start(); // Step 10. Receive a message from the *target* queue - TextMessage messageReceived = (TextMessage) targetConsumer.receive(5000); + TextMessage messageReceived = (TextMessage) targetConsumer.receive(500000); System.out.format("%nReceived from %s: %s%n", ((Queue) messageReceived.getJMSDestination()).getQueueName(), messageReceived.getText()); // Step 11. Display the received message's ID and this "bridged" message ID http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 3b9df04..ed98e9c 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,15 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <topic name="topic"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -42,12 +36,16 @@ under the License. <security-settings> <security-setting match="#"> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> </security-setting> </security-settings> + <addresses> + <address name="topic"> + <multicast/> + </address> + </addresses> </core> </configuration> - http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 39089f8..6ee55d9 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,15 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <queue name="target"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -42,12 +36,18 @@ under the License. <security-settings> <security-setting match="#"> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> </security-setting> </security-settings> + <addresses> + <address name="target"> + <anycast> + <queue name="target"/> + </anycast> + </address> + </addresses> </core> </configuration> - http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 08c7c40..d3352b1 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the topic used by the example--> - <topic name="exampleTopic"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -48,14 +41,19 @@ under the License. <security-settings> <!--security for example topic--> <security-setting match="exampleTopic"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> + <addresses> + <address name="exampleTopic"> + <multicast/> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 b251d37..7576376 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -51,14 +44,21 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> + <addresses> + <address name="exampleQueue"> + <anycast> + <queue name="exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 18eb207..65de32d 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -47,13 +40,13 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - <permission type="browse" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> + <permission roles="guest" type="browse"/> </security-setting> </security-settings> @@ -63,5 +56,12 @@ under the License. </address-setting> </address-settings> + <addresses> + <address name="exampleQueue"> + <anycast> + <queue name="exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 e74c8bb..a42fc9c 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,19 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq ../../../../src/schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq ../../../../src/schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - - <!--the notifications topic used by the example--> - <topic name="notificationsTopic"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -53,29 +43,39 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> <!--security for notification queue--> <security-setting match="notificationsTopic"> - <permission type="consume" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> </security-setting> <!-- security settings for JMS temporary queue --> <security-setting match="queuetempjms.*"> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> + <addresses> + <address name="notificationsTopic"> + <multicast/> + </address> + <address name="exampleQueue"> + <anycast> + <queue name="jms.queue.exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 218e621..d8f997e 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -49,28 +42,35 @@ under the License. <!--security for example queue--> <security-setting match="exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> <!--security for management queue--> <security-setting match="activemq.management"> - <permission type="manage" roles="guest"/> + <permission roles="guest" type="manage"/> </security-setting> <!-- security settings for JMS temporary queue --> <security-setting match="#"> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> + <addresses> + <address name="exampleQueue"> + <anycast> + <queue name="exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 39bba47..cfb8262 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,19 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq ../../../../src/schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq ../../../../src/schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - - <!--the expiry queue where expired messages will be sent--> - <queue name="expiryQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -56,22 +46,22 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> <!--security for dead letter queue--> <security-setting match="expiryQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> @@ -82,5 +72,17 @@ under the License. </address-setting> </address-settings> + <addresses> + <address name="exampleQueue"> + <anycast> + <queue name="exampleQueue"/> + </anycast> + </address> + <address name="expiryQueue"> + <anycast> + <queue name="expiryQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 1da9ff5..fb260f6 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,18 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the topic used by the example--> - <queue name="exampleQueue"/> - - <queue name="pagingQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -55,21 +46,21 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> <security-setting match="pagingQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> @@ -89,5 +80,17 @@ under the License. </address-setting> </address-settings> + <addresses> + <address name="pagingQueue"> + <anycast> + <queue name="pagingQueue"/> + </anycast> + </address> + <address name="exampleQueue"> + <anycast> + <queue name="exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 c13644b..ee9828f 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -46,18 +39,25 @@ under the License. <security-settings> <security-setting match="#"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> <security-setting match="activemq.management"> - <permission type="manage" roles="guest"/> + <permission roles="guest" type="manage"/> </security-setting> </security-settings> + <addresses> + <address name="exampleQueue"> + <anycast> + <queue name="jms.queue.exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 64a5ba3..73ef48c 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -47,21 +40,28 @@ under the License. <security-settings> <!--security for example queues --> <security-setting match="#"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> <!-- security settings for JMS temporary queue --> <security-setting match="#"> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> + <addresses> + <address name="exampleQueue"> + <anycast> + <queue name="exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 ec41710..72946ba 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -62,20 +55,27 @@ under the License. <!--security for example queue--> <security-setting match="exampleQueue"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> <security-setting match="activemq.management"> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - <permission type="manage" roles="guest"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> + <permission roles="guest" type="manage"/> </security-setting> </security-settings> + <addresses> + <address name="exampleQueue"> + <anycast> + <queue name="exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/examples/features/standard/rest/dup-send/src/main/resources/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/dup-send/src/main/resources/broker.xml b/examples/features/standard/rest/dup-send/src/main/resources/broker.xml index 67b5fe5..7e5527a 100644 --- a/examples/features/standard/rest/dup-send/src/main/resources/broker.xml +++ b/examples/features/standard/rest/dup-send/src/main/resources/broker.xml @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="orders"/> - </jms> + <core xmlns="urn:activemq:core"> <persistence-enabled>false</persistence-enabled> @@ -34,5 +27,12 @@ under the License. <acceptors> <acceptor name="in-vm">vm://0</acceptor> </acceptors> + <addresses> + <address name="orders"> + <anycast> + <queue name="jms.queue.orders"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/examples/features/standard/rest/javascript-chat/src/main/resources/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/javascript-chat/src/main/resources/broker.xml b/examples/features/standard/rest/javascript-chat/src/main/resources/broker.xml index c24bf62..d41cd6d 100644 --- a/examples/features/standard/rest/javascript-chat/src/main/resources/broker.xml +++ b/examples/features/standard/rest/javascript-chat/src/main/resources/broker.xml @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <topic name="chat"/> - </jms> + <core xmlns="urn:activemq:core"> <persistence-enabled>false</persistence-enabled> @@ -34,5 +27,10 @@ under the License. <acceptors> <acceptor name="in-vm">vm://0</acceptor> </acceptors> + <addresses> + <address name="chat"> + <multicast/> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/examples/features/standard/rest/jms-to-rest/src/main/resources/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/jms-to-rest/src/main/resources/broker.xml b/examples/features/standard/rest/jms-to-rest/src/main/resources/broker.xml index f8de5c4..d481507 100644 --- a/examples/features/standard/rest/jms-to-rest/src/main/resources/broker.xml +++ b/examples/features/standard/rest/jms-to-rest/src/main/resources/broker.xml @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="orders"/> - </jms> + <core xmlns="urn:activemq:core"> <persistence-enabled>false</persistence-enabled> @@ -35,5 +28,12 @@ under the License. <acceptor name="in-vm">vm://0</acceptor> <acceptor name="netty">tcp://localhost:61616</acceptor> </acceptors> + <addresses> + <address name="orders"> + <anycast> + <queue name="jms.queue.orders"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/examples/features/standard/rest/push/src/main/resources/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/push/src/main/resources/broker.xml b/examples/features/standard/rest/push/src/main/resources/broker.xml index c2b8515..9e91b5a 100644 --- a/examples/features/standard/rest/push/src/main/resources/broker.xml +++ b/examples/features/standard/rest/push/src/main/resources/broker.xml @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,17 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queues used by the example--> - <queue name="orders"/> - <queue name="shipping"/> - </jms> + <core xmlns="urn:activemq:core"> <persistence-enabled>false</persistence-enabled> @@ -36,5 +28,17 @@ under the License. <acceptor name="in-vm">vm://0</acceptor> <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor> </acceptors> + <addresses> + <address name="shipping"> + <anycast> + <queue name="jms.queue.shipping"/> + </anycast> + </address> + <address name="orders"> + <anycast> + <queue name="jms.queue.orders"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 bb96922..6f230a9 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,19 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <topic name="genericTopic"/> - - <topic name="news.europe.europeTopic"/> - - <topic name="news.us.usTopic"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -53,32 +43,43 @@ under the License. <security-settings> <!-- any user can have full control of generic topics --> <security-setting match="#"> - <permission type="createDurableQueue" roles="user"/> - <permission type="deleteDurableQueue" roles="user"/> - <permission type="createNonDurableQueue" roles="user"/> - <permission type="deleteNonDurableQueue" roles="user"/> - <permission type="send" roles="user"/> - <permission type="consume" roles="user"/> + <permission roles="user" type="createDurableQueue"/> + <permission roles="user" type="deleteDurableQueue"/> + <permission roles="user" type="createNonDurableQueue"/> + <permission roles="user" type="deleteNonDurableQueue"/> + <permission roles="user" type="send"/> + <permission roles="user" type="consume"/> </security-setting> <security-setting match="news.europe.#"> - <permission type="createDurableQueue" roles="user"/> - <permission type="deleteDurableQueue" roles="user"/> - <permission type="createNonDurableQueue" roles="user"/> - <permission type="deleteNonDurableQueue" roles="user"/> - <permission type="send" roles="europe-user"/> - <permission type="consume" roles="news-user"/> + <permission roles="user" type="createDurableQueue"/> + <permission roles="user" type="deleteDurableQueue"/> + <permission roles="user" type="createNonDurableQueue"/> + <permission roles="user" type="deleteNonDurableQueue"/> + <permission roles="europe-user" type="send"/> + <permission roles="news-user" type="consume"/> </security-setting> <security-setting match="news.us.#"> - <permission type="createDurableQueue" roles="user"/> - <permission type="deleteDurableQueue" roles="user"/> - <permission type="createNonDurableQueue" roles="user"/> - <permission type="deleteNonDurableQueue" roles="user"/> - <permission type="send" roles="us-user"/> - <permission type="consume" roles="news-user"/> + <permission roles="user" type="createDurableQueue"/> + <permission roles="user" type="deleteDurableQueue"/> + <permission roles="user" type="createNonDurableQueue"/> + <permission roles="user" type="deleteNonDurableQueue"/> + <permission roles="us-user" type="send"/> + <permission roles="news-user" type="consume"/> </security-setting> </security-settings> + <addresses> + <address name="genericTopic"> + <multicast/> + </address> + <address name="news.europe.europeTopic"> + <multicast/> + </address> + <address name="news.us.usTopic"> + <multicast/> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 28612c4..bfb0528 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,19 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <topic name="genericTopic"/> - - <topic name="news.europe.europeTopic"/> - - <topic name="news.us.usTopic"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -50,32 +40,43 @@ under the License. <security-settings> <!-- any user can have full control of generic topics --> <security-setting match="#"> - <permission type="createDurableQueue" roles="user"/> - <permission type="deleteDurableQueue" roles="user"/> - <permission type="createNonDurableQueue" roles="user"/> - <permission type="deleteNonDurableQueue" roles="user"/> - <permission type="send" roles="user"/> - <permission type="consume" roles="user"/> + <permission roles="user" type="createDurableQueue"/> + <permission roles="user" type="deleteDurableQueue"/> + <permission roles="user" type="createNonDurableQueue"/> + <permission roles="user" type="deleteNonDurableQueue"/> + <permission roles="user" type="send"/> + <permission roles="user" type="consume"/> </security-setting> <security-setting match="news.europe.#"> - <permission type="createDurableQueue" roles="user"/> - <permission type="deleteDurableQueue" roles="user"/> - <permission type="createNonDurableQueue" roles="user"/> - <permission type="deleteNonDurableQueue" roles="user"/> - <permission type="send" roles="europe-user"/> - <permission type="consume" roles="news-user"/> + <permission roles="user" type="createDurableQueue"/> + <permission roles="user" type="deleteDurableQueue"/> + <permission roles="user" type="createNonDurableQueue"/> + <permission roles="user" type="deleteNonDurableQueue"/> + <permission roles="europe-user" type="send"/> + <permission roles="news-user" type="consume"/> </security-setting> <security-setting match="news.us.#"> - <permission type="createDurableQueue" roles="user"/> - <permission type="deleteDurableQueue" roles="user"/> - <permission type="createNonDurableQueue" roles="user"/> - <permission type="deleteNonDurableQueue" roles="user"/> - <permission type="send" roles="us-user"/> - <permission type="consume" roles="news-user"/> + <permission roles="user" type="createDurableQueue"/> + <permission roles="user" type="deleteDurableQueue"/> + <permission roles="user" type="createNonDurableQueue"/> + <permission roles="user" type="deleteNonDurableQueue"/> + <permission roles="us-user" type="send"/> + <permission roles="news-user" type="consume"/> </security-setting> </security-settings> + <addresses> + <address name="genericTopic"> + <multicast/> + </address> + <address name="news.europe.europeTopic"> + <multicast/> + </address> + <address name="news.us.usTopic"> + <multicast/> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/examples/features/standard/spring-integration/src/main/resources/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/spring-integration/src/main/resources/broker.xml b/examples/features/standard/spring-integration/src/main/resources/broker.xml index 2970329..8ad3a41 100644 --- a/examples/features/standard/spring-integration/src/main/resources/broker.xml +++ b/examples/features/standard/spring-integration/src/main/resources/broker.xml @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -40,14 +33,21 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="#"> - <permission type="createDurableQueue" roles="guest"/> - <permission type="deleteDurableQueue" roles="guest"/> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="createDurableQueue"/> + <permission roles="guest" type="deleteDurableQueue"/> + <permission roles="guest" type="createNonDurableQueue"/> + <permission roles="guest" type="deleteNonDurableQueue"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> + <addresses> + <address name="exampleQueue"> + <anycast> + <queue name="jms.queue.exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 438a751..420fa74 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 @@ -1,4 +1,4 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -16,16 +16,9 @@ software distributed under the License is distributed on an KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---> +--><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="urn:activemq" - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - </jms> + <core xmlns="urn:activemq:core"> @@ -48,10 +41,17 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="exampleQueue"> - <permission type="consume" roles="consumers"/> - <permission type="send" roles="producers"/> + <permission roles="consumers" type="consume"/> + <permission roles="producers" type="send"/> </security-setting> </security-settings> + <addresses> + <address name="exampleQueue"> + <anycast> + <queue name="exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration>
