http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml index 683952b..93e4cfb 100644 --- a/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,27 +18,34 @@ 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/activemq-configuration.xsd"> - - <security-enabled>false</security-enabled> - <persistence-enabled>true</persistence-enabled> - - <!-- Acceptors --> - <acceptors> - <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="tcp-no-delay" value="false"/> - <param key="tcp-send-buffer-size" value="1048576"/> - <param key="tcp-receive-buffer-size" value="1048576"/> - </acceptor> - </acceptors> - - <queues> - <queue name="perfQueue"> - <address>perfAddress</address> - </queue> - </queues> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:activemq" + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + <jms xmlns="urn:activemq:jms"> + <queue name="perfQueue"/> + </jms> + + <core xmlns="urn:activemq:core"> + + <security-enabled>false</security-enabled> + <persistence-enabled>true</persistence-enabled> + + <!-- Acceptors --> + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="tcp-no-delay" value="false"/> + <param key="tcp-send-buffer-size" value="1048576"/> + <param key="tcp-receive-buffer-size" value="1048576"/> + </acceptor> + </acceptors> + + <queues> + <queue name="perfQueue"> + <address>perfAddress</address> + </queue> + </queues> + + </core> </configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/perf/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/perf/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/perf/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 411ad1d..0000000 --- a/examples/jms/perf/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-jms.xsd"> - - <queue name="perfQueue"/> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml index e91019e..4e5a4d3 100644 --- a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,40 +18,48 @@ 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/activemq-configuration.xsd"> - - <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> - - <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> - - <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> - - <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> - - <!-- Acceptors --> - <acceptors> - <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - </acceptor> - </acceptors> - - <!-- Other config --> - - <security-settings> - <security-setting match="jms.#"> - <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"/> - </security-setting> - - <security-setting match="jms.queue.activemq.management"> - <permission type="manage" roles="guest" /> - </security-setting> - </security-settings> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:activemq" + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + <jms xmlns="urn:activemq:jms"> + <!--the queue used by the example--> + <queue name="exampleQueue"/> + </jms> + + <core xmlns="urn:activemq:core"> + + <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> + + <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + + <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + + <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + + <!-- Acceptors --> + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + </acceptor> + </acceptors> + + <!-- Other config --> + + <security-settings> + <security-setting match="jms.#"> + <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"/> + </security-setting> + + <security-setting match="jms.queue.activemq.management"> + <permission type="manage" roles="guest"/> + </security-setting> + </security-settings> + + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6..0000000 --- a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-jms.xsd"> - - <!--the queue used by the example--> - <queue name="exampleQueue"/> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-roles.properties ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.properties ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079d..0000000 --- a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml index 58501e8..bb8c2d1 100644 --- a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,37 +18,45 @@ 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/activemq-configuration.xsd"> - - <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> - - <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> - - <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> - - <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> - - <!-- Acceptors --> - <acceptors> - <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - </acceptor> - </acceptors> - - <!-- Other config --> - - <security-settings> - <!--security for example queue--> - <security-setting match="jms.queue.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"/> - </security-setting> - </security-settings> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:activemq" + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + <jms xmlns="urn:activemq:jms"> + <!--the queue used by the example--> + <queue name="exampleQueue"/> + </jms> + + <core xmlns="urn:activemq:core"> + + <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> + + <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + + <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + + <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + + <!-- Acceptors --> + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + </acceptor> + </acceptors> + + <!-- Other config --> + + <security-settings> + <!--security for example queue--> + <security-setting match="jms.queue.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"/> + </security-setting> + </security-settings> + + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6..0000000 --- a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-jms.xsd"> - - <!--the queue used by the example--> - <queue name="exampleQueue"/> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties ---------------------------------------------------------------------- diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties ---------------------------------------------------------------------- diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079d..0000000 --- a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml index 07fa126..e74ceba 100644 --- a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,38 +18,46 @@ 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/activemq-configuration.xsd"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:activemq" + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> - <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> + <jms xmlns="urn:activemq:jms"> + <!--the queue used by the example--> + <queue name="exampleQueue"/> + </jms> - <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + <core xmlns="urn:activemq:core"> - <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> - <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> - <!-- Acceptors --> - <acceptors> - <acceptor name="proton-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - </acceptor> - </acceptors> + <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> - <!-- Other config --> - <security-settings> - <!--security for example queue--> - <security-setting match="jms.queue.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"/> - </security-setting> - </security-settings> + <!-- Acceptors --> + <acceptors> + <acceptor name="proton-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + </acceptor> + </acceptors> + <!-- Other config --> + + <security-settings> + <!--security for example queue--> + <security-setting match="jms.queue.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"/> + </security-setting> + </security-settings> + + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 755203f..0000000 --- a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-jms.xsd"> - - <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-roles.properties ---------------------------------------------------------------------- diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.properties ---------------------------------------------------------------------- diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079d..0000000 --- a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml index ab9dfad..93e5eb2 100644 --- a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,45 +18,53 @@ 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/activemq-configuration.xsd"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:activemq" + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> - <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> + <jms xmlns="urn:activemq:jms"> + <!--the queue used by the example--> + <queue name="exampleQueue"/> + </jms> - <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + <core xmlns="urn:activemq:core"> - <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> - <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> - <!-- Acceptors --> - <acceptors> - <acceptor name="proton-acceptor"> + <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + + + <!-- Acceptors --> + <acceptors> + <acceptor name="proton-acceptor"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="port" value="5672"/> - </acceptor> - </acceptors> + </acceptor> + </acceptors> - <queues> - <queue name="testQueue"> + <queues> + <queue name="testQueue"> <address>testQueue</address> - </queue> - </queues> - - <!-- Other config --> - - <security-settings> - <!--security for example queue--> - <security-setting match="jms.queue.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"/> - </security-setting> - </security-settings> + </queue> + </queues> + + <!-- Other config --> + + <security-settings> + <!--security for example queue--> + <security-setting match="jms.queue.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"/> + </security-setting> + </security-settings> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index f318c1c..0000000 --- a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-jms.xsd"> - - <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-roles.properties ---------------------------------------------------------------------- diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.properties ---------------------------------------------------------------------- diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079d..0000000 --- a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml index 7c55ee9..5c443a1 100644 --- a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,44 +18,52 @@ 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/activemq-configuration.xsd"> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:activemq" + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> - <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> + <jms xmlns="urn:activemq:jms"> + <!--the queue used by the example--> + <queue name="exampleQueue"/> + </jms> - <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + <core xmlns="urn:activemq:core"> - <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> - <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> - - <!-- Acceptors --> - <acceptors> - <acceptor name="proton-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="protocol" value="AMQP"/> - <param key="port" value="5672"/> - </acceptor> - </acceptors> + <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> - <queues> - <queue name="testQueue"> + <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + + <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + + <!-- Acceptors --> + <acceptors> + <acceptor name="proton-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="protocol" value="AMQP"/> + <param key="port" value="5672"/> + </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"/> - </security-setting> - </security-settings> + </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"/> + </security-setting> + </security-settings> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 11bd1ae..0000000 --- a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-jms.xsd"> - <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-roles.properties ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.properties ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079d..0000000 --- a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml index 133dded..c084fdf 100644 --- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml @@ -18,89 +18,96 @@ 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/activemq-configuration.xsd"> - - - - <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> - - <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> - - <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> - - <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> - - <!-- Connectors --> - <connectors> - <connector name="netty-connector"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="port" value="5445"/> - </connector> - </connectors> - - <!-- Acceptors --> - <acceptors> - <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="port" value="5445"/> - </acceptor> - </acceptors> - - <!-- Clustering configuration --> - <broadcast-groups> - <broadcast-group name="my-broadcast-group"> - <group-address>${udp-address:231.7.7.7}</group-address> - <group-port>9876</group-port> - <broadcast-period>100</broadcast-period> - <connector-ref>netty-connector</connector-ref> - </broadcast-group> - </broadcast-groups> - - <discovery-groups> - <discovery-group name="my-discovery-group"> - <group-address>${udp-address:231.7.7.7}</group-address> - <group-port>9876</group-port> - <refresh-timeout>10000</refresh-timeout> - </discovery-group> - </discovery-groups> - - <cluster-connections> - <cluster-connection name="my-cluster"> - <address>jms</address> - <connector-ref>netty-connector</connector-ref> - <retry-interval>500</retry-interval> - <use-duplicate-detection>true</use-duplicate-detection> - <forward-when-no-consumers>false</forward-when-no-consumers> - <max-hops>1</max-hops> - <discovery-group-ref discovery-group-name="my-discovery-group"/> - </cluster-connection> - </cluster-connections> - - <!-- Other config --> - - <security-settings> - <!--security for example queue--> - <security-setting match="jms.queue.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"/> - </security-setting> - </security-settings> - - <address-settings> - <!-- We set a redistribution delay of zero on all jms queues and topic subscriptions - Default redistribution delay as -1 which means "disable redistribution" - Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed - then another one quickly recreated you might want to set it thus, to avoid unnecessary - redistribution --> - <address-setting match="jms.#"> - <redistribution-delay>0</redistribution-delay> - </address-setting> - </address-settings> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:activemq" + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + <jms xmlns="urn:activemq:jms"> + <!--the queue used by the example--> + <queue name="exampleQueue"/> + </jms> + + <core xmlns="urn:activemq:core"> + + + <bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory> + + <journal-directory>${build.directory}/server0/data/messaging/journal</journal-directory> + + <large-messages-directory>${build.directory}/server0/data/messaging/largemessages</large-messages-directory> + + <paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory> + + <!-- Connectors --> + <connectors> + <connector name="netty-connector"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="port" value="5445"/> + </connector> + </connectors> + + <!-- Acceptors --> + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="port" value="5445"/> + </acceptor> + </acceptors> + + <!-- Clustering configuration --> + <broadcast-groups> + <broadcast-group name="my-broadcast-group"> + <group-address>${udp-address:231.7.7.7}</group-address> + <group-port>9876</group-port> + <broadcast-period>100</broadcast-period> + <connector-ref>netty-connector</connector-ref> + </broadcast-group> + </broadcast-groups> + + <discovery-groups> + <discovery-group name="my-discovery-group"> + <group-address>${udp-address:231.7.7.7}</group-address> + <group-port>9876</group-port> + <refresh-timeout>10000</refresh-timeout> + </discovery-group> + </discovery-groups> + + <cluster-connections> + <cluster-connection name="my-cluster"> + <address>jms</address> + <connector-ref>netty-connector</connector-ref> + <retry-interval>500</retry-interval> + <use-duplicate-detection>true</use-duplicate-detection> + <forward-when-no-consumers>false</forward-when-no-consumers> + <max-hops>1</max-hops> + <discovery-group-ref discovery-group-name="my-discovery-group"/> + </cluster-connection> + </cluster-connections> + + <!-- Other config --> + + <security-settings> + <!--security for example queue--> + <security-setting match="jms.queue.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"/> + </security-setting> + </security-settings> + + <address-settings> + <!-- We set a redistribution delay of zero on all jms queues and topic subscriptions + Default redistribution delay as -1 which means "disable redistribution" + Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed + then another one quickly recreated you might want to set it thus, to avoid unnecessary + redistribution --> + <address-setting match="jms.#"> + <redistribution-delay>0</redistribution-delay> + </address-setting> + </address-settings> + + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml deleted file mode 100644 index 8ca9fd6..0000000 --- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-jms.xsd"> - - <!--the queue used by the example--> - <queue name="exampleQueue"/> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-roles.properties ---------------------------------------------------------------------- diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-roles.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-roles.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.properties ---------------------------------------------------------------------- diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml deleted file mode 100644 index f63079d..0000000 --- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml index 4aefdca..be1c3ca 100644 --- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml @@ -18,90 +18,97 @@ 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/activemq-configuration.xsd"> - - - - <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory> - - <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory> - - <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory> - - <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory> - - <!-- Connectors --> - - <connectors> - <connector name="netty-connector"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="port" value="5446"/> - </connector> - </connectors> - - <!-- Acceptors --> - <acceptors> - <acceptor name="netty-acceptor"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="port" value="5446"/> - </acceptor> - </acceptors> - - <!-- Clustering configuration --> - <broadcast-groups> - <broadcast-group name="my-broadcast-group"> - <group-address>${udp-address:231.7.7.7}</group-address> - <group-port>9876</group-port> - <broadcast-period>100</broadcast-period> - <connector-ref>netty-connector</connector-ref> - </broadcast-group> - </broadcast-groups> - - <discovery-groups> - <discovery-group name="my-discovery-group"> - <group-address>${udp-address:231.7.7.7}</group-address> - <group-port>9876</group-port> - <refresh-timeout>10000</refresh-timeout> - </discovery-group> - </discovery-groups> - - <cluster-connections> - <cluster-connection name="my-cluster"> - <address>jms</address> - <connector-ref>netty-connector</connector-ref> - <retry-interval>500</retry-interval> - <use-duplicate-detection>true</use-duplicate-detection> - <forward-when-no-consumers>false</forward-when-no-consumers> - <max-hops>1</max-hops> - <discovery-group-ref discovery-group-name="my-discovery-group"/> - </cluster-connection> - </cluster-connections> - - <!-- Other config --> - - <security-settings> - <!--security for example queue--> - <security-setting match="jms.queue.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"/> - </security-setting> - </security-settings> - - <address-settings> - <!-- We set a redistribution delay of zero on all jms queues and topic subscriptions - Default redistribution delay as -1 which means "disable redistribution" - Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed - then another one quickly recreated you might want to set it thus, to avoid unnecessary - redistribution --> - <address-setting match="jms.#"> - <redistribution-delay>0</redistribution-delay> - </address-setting> - </address-settings> - +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:activemq" + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + <jms xmlns="urn:activemq:jms"> + <!--the queue used by the example--> + <queue name="exampleQueue"/> + </jms> + + <core xmlns="urn:activemq:core"> + + + <bindings-directory>${build.directory}/server1/data/messaging/bindings</bindings-directory> + + <journal-directory>${build.directory}/server1/data/messaging/journal</journal-directory> + + <large-messages-directory>${build.directory}/server1/data/messaging/largemessages</large-messages-directory> + + <paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory> + + <!-- Connectors --> + + <connectors> + <connector name="netty-connector"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="port" value="5446"/> + </connector> + </connectors> + + <!-- Acceptors --> + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="port" value="5446"/> + </acceptor> + </acceptors> + + <!-- Clustering configuration --> + <broadcast-groups> + <broadcast-group name="my-broadcast-group"> + <group-address>${udp-address:231.7.7.7}</group-address> + <group-port>9876</group-port> + <broadcast-period>100</broadcast-period> + <connector-ref>netty-connector</connector-ref> + </broadcast-group> + </broadcast-groups> + + <discovery-groups> + <discovery-group name="my-discovery-group"> + <group-address>${udp-address:231.7.7.7}</group-address> + <group-port>9876</group-port> + <refresh-timeout>10000</refresh-timeout> + </discovery-group> + </discovery-groups> + + <cluster-connections> + <cluster-connection name="my-cluster"> + <address>jms</address> + <connector-ref>netty-connector</connector-ref> + <retry-interval>500</retry-interval> + <use-duplicate-detection>true</use-duplicate-detection> + <forward-when-no-consumers>false</forward-when-no-consumers> + <max-hops>1</max-hops> + <discovery-group-ref discovery-group-name="my-discovery-group"/> + </cluster-connection> + </cluster-connections> + + <!-- Other config --> + + <security-settings> + <!--security for example queue--> + <security-setting match="jms.queue.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"/> + </security-setting> + </security-settings> + + <address-settings> + <!-- We set a redistribution delay of zero on all jms queues and topic subscriptions + Default redistribution delay as -1 which means "disable redistribution" + Setting it to a value > 0 means how long to wait before redistributing, if a consumer is closed + then another one quickly recreated you might want to set it thus, to avoid unnecessary + redistribution --> + <address-setting match="jms.#"> + <redistribution-delay>0</redistribution-delay> + </address-setting> + </address-settings> + + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml deleted file mode 100644 index 8ca9fd6..0000000 --- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-jms.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-jms.xsd"> - - <!--the queue used by the example--> - <queue name="exampleQueue"/> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-roles.properties ---------------------------------------------------------------------- diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-roles.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-roles.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.properties ---------------------------------------------------------------------- diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.properties b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml ---------------------------------------------------------------------- diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml deleted file mode 100644 index f63079d..0000000 --- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -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/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration>
