http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 1b209d8..11f6c3d 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 @@ -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,14 +40,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/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 99e0d9e..fa99879 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 @@ -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,11 +16,7 @@ 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"> +--><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"> @@ -37,26 +33,30 @@ under the License. <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor> </acceptors> - <queues> - <queue name="exampleQueue"> - <address>exampleQueue</address> - <filter string="color='red'"/> - </queue> - </queues> + <!-- Other config --> <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"> + <multicast> + <queue name="exampleQueue"> + <filter string="color='red'"/> + </queue> + </multicast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 15fd199..bd62a0e 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 @@ -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,20 +39,27 @@ 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="jms.queue.exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/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 030aa73..85c6a0b 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 @@ -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"> @@ -47,14 +40,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/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 030aa73..85c6a0b 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 @@ -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"> @@ -47,14 +40,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/topic/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/standard/topic/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/topic/src/main/resources/activemq/server0/broker.xml index 25d82da..10d3280 100644 --- a/examples/features/standard/topic/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/topic/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"> @@ -46,16 +39,21 @@ 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="createAddress" roles="guest"/> - <permission type="deleteAddress" 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="createAddress"/> + <permission roles="guest" type="deleteAddress"/> + <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/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 3751be0..039e3c9 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 @@ -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"> @@ -44,11 +37,7 @@ 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="exampleQueue"> - <address>exampleQueue</address> - </queue> - </queues> + <connector-services> <connector-service name="aerogear-connector"> @@ -65,13 +54,23 @@ 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"> + <multicast> + <queue name="exampleQueue"/> + </multicast> + <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/sub-modules/vertx/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/features/sub-modules/vertx/src/main/resources/activemq/server0/broker.xml b/examples/features/sub-modules/vertx/src/main/resources/activemq/server0/broker.xml index 9be6726..c550203 100644 --- a/examples/features/sub-modules/vertx/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/sub-modules/vertx/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,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="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd"> - <jms xmlns="urn:activemq:jms"> - <!--the queue used by the example--> - <queue name="exampleQueue"/> - </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"> <bindings-directory>target/server0/data/messaging/bindings</bindings-directory> @@ -49,16 +42,12 @@ under the License. <security-settings> <!--security for example queue--> <security-setting match="queue.vertxQueue"> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> + <permission roles="guest" type="consume"/> + <permission roles="guest" type="send"/> </security-setting> </security-settings> - <queues> - <queue name="queue.vertxQueue"> - <address>queue.vertxQueue</address> - </queue> - </queues> + <connector-services> <connector-service name="my-incoming-vertx"> @@ -76,6 +65,18 @@ under the License. <param key="vertx-address" value="outgoing.vertx.address"/> </connector-service> </connector-services> + <addresses> + <address name="queue.vertxQueue"> + <multicast> + <queue name="queue.vertxQueue"/> + </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/protocols/amqp/proton-ruby/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/protocols/amqp/proton-ruby/src/main/resources/activemq/server0/broker.xml b/examples/protocols/amqp/proton-ruby/src/main/resources/activemq/server0/broker.xml index 81e0b07..50f0a67 100644 --- a/examples/protocols/amqp/proton-ruby/src/main/resources/activemq/server0/broker.xml +++ b/examples/protocols/amqp/proton-ruby/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"> @@ -42,24 +35,32 @@ under the License. <acceptor name="proton-acceptor">tcp://localhost:5672?protocols=AMQP;</acceptor> </acceptors> - <queues> - <queue name="testQueue"> - <address>testQueue</address> - </queue> - </queues> + <!-- Other config --> <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="testQueue"> + <multicast> + <queue name="testQueue"/> + </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/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 438a751..6b84763 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 @@ -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="jms.queue.exampleQueue"/> + </anycast> + </address> + </addresses> </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/23b54d4f/examples/protocols/stomp/stomp-embedded-interceptor/src/main/resources/activemq/server0/broker.xml ---------------------------------------------------------------------- diff --git a/examples/protocols/stomp/stomp-embedded-interceptor/src/main/resources/activemq/server0/broker.xml b/examples/protocols/stomp/stomp-embedded-interceptor/src/main/resources/activemq/server0/broker.xml index c755305..2b83a4a 100644 --- a/examples/protocols/stomp/stomp-embedded-interceptor/src/main/resources/activemq/server0/broker.xml +++ b/examples/protocols/stomp/stomp-embedded-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"> @@ -56,14 +49,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>
