You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2021/08/03 17:40:40 UTC
[activemq-artemis] branch main updated (a096d52 -> 043d7ea)
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git.
from a096d52 This closes #3670
new 6bd30e8 ARTEMIS-3385 management changes can be reverted by XML update
new b6d7807 NO-JIRA using latch::countdown on RedeployTest instead of new Runnable
new 043d7ea This closes #3653
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../core/server/impl/ActiveMQServerImpl.java | 32 ++-
.../tests/integration/jms/RedeployTest.java | 239 ++++++++++++++++++---
...ted.xml => reload-address-settings-updated.xml} | 39 ++--
...ype-updated.xml => reload-address-settings.xml} | 39 ++--
...type-updated.xml => reload-diverts-updated.xml} | 40 +++-
...-routingtype-updated.xml => reload-diverts.xml} | 40 +++-
...ed.xml => reload-security-settings-updated.xml} | 42 ++--
...pe-updated.xml => reload-security-settings.xml} | 42 ++--
8 files changed, 405 insertions(+), 108 deletions(-)
copy tests/integration-tests/src/test/resources/{reload-queue-routingtype-updated.xml => reload-address-settings-updated.xml} (66%)
copy tests/integration-tests/src/test/resources/{reload-queue-routingtype-updated.xml => reload-address-settings.xml} (66%)
copy tests/integration-tests/src/test/resources/{reload-queue-routingtype-updated.xml => reload-diverts-updated.xml} (65%)
copy tests/integration-tests/src/test/resources/{reload-queue-routingtype-updated.xml => reload-diverts.xml} (65%)
copy tests/integration-tests/src/test/resources/{reload-queue-routingtype-updated.xml => reload-security-settings-updated.xml} (56%)
copy tests/integration-tests/src/test/resources/{reload-queue-routingtype-updated.xml => reload-security-settings.xml} (56%)
[activemq-artemis] 02/03: NO-JIRA using latch::countdown on
RedeployTest instead of new Runnable
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit b6d78076d46a8a2a64047d8b9eae8f8c2faf2c56
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Tue Aug 3 12:34:18 2021 -0400
NO-JIRA using latch::countdown on RedeployTest instead of new Runnable
I have done this just because I thought it was prettier
---
.../tests/integration/jms/RedeployTest.java | 56 ++++------------------
1 file changed, 8 insertions(+), 48 deletions(-)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
index 2541e1b..88ef2a9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
@@ -106,12 +106,7 @@ public class RedeployTest extends ActiveMQTestBase {
final ReusableLatch latch = new ReusableLatch(1);
- Runnable tick = new Runnable() {
- @Override
- public void run() {
- latch.countDown();
- }
- };
+ Runnable tick = latch::countDown;
embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
@@ -156,12 +151,7 @@ public class RedeployTest extends ActiveMQTestBase {
final ReusableLatch latch = new ReusableLatch(1);
- Runnable tick = new Runnable() {
- @Override
- public void run() {
- latch.countDown();
- }
- };
+ Runnable tick = latch::countDown;
embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
@@ -210,12 +200,7 @@ public class RedeployTest extends ActiveMQTestBase {
final ReusableLatch latch = new ReusableLatch(1);
- Runnable tick = new Runnable() {
- @Override
- public void run() {
- latch.countDown();
- }
- };
+ Runnable tick = latch::countDown;
embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
@@ -266,12 +251,7 @@ public class RedeployTest extends ActiveMQTestBase {
final ReusableLatch latch = new ReusableLatch(1);
- Runnable tick = new Runnable() {
- @Override
- public void run() {
- latch.countDown();
- }
- };
+ Runnable tick = latch::countDown;
embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
@@ -342,12 +322,7 @@ public class RedeployTest extends ActiveMQTestBase {
final ReusableLatch latch = new ReusableLatch(1);
- Runnable tick = new Runnable() {
- @Override
- public void run() {
- latch.countDown();
- }
- };
+ Runnable tick = latch::countDown;
embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
@@ -391,12 +366,7 @@ public class RedeployTest extends ActiveMQTestBase {
final ReusableLatch latch = new ReusableLatch(1);
- Runnable tick = new Runnable() {
- @Override
- public void run() {
- latch.countDown();
- }
- };
+ Runnable tick = latch::countDown;
embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
@@ -441,12 +411,7 @@ public class RedeployTest extends ActiveMQTestBase {
final ReusableLatch latch = new ReusableLatch(1);
- Runnable tick = new Runnable() {
- @Override
- public void run() {
- latch.countDown();
- }
- };
+ Runnable tick = latch::countDown;
embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
@@ -901,12 +866,7 @@ public class RedeployTest extends ActiveMQTestBase {
final ReusableLatch latch = new ReusableLatch(1);
- Runnable tick = new Runnable() {
- @Override
- public void run() {
- latch.countDown();
- }
- };
+ Runnable tick = latch::countDown;
embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
[activemq-artemis] 03/03: This closes #3653
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 043d7eabd749872a46bf39f17b532e8b55f35cac
Merge: a096d52 b6d7807
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Tue Aug 3 13:40:23 2021 -0400
This closes #3653
.../core/server/impl/ActiveMQServerImpl.java | 32 ++-
.../tests/integration/jms/RedeployTest.java | 239 ++++++++++++++++++---
.../resources/reload-address-settings-updated.xml | 59 +++++
.../src/test/resources/reload-address-settings.xml | 59 +++++
.../src/test/resources/reload-diverts-updated.xml | 64 ++++++
.../src/test/resources/reload-diverts.xml | 64 ++++++
.../resources/reload-security-settings-updated.xml | 62 ++++++
.../test/resources/reload-security-settings.xml | 62 ++++++
8 files changed, 607 insertions(+), 34 deletions(-)
[activemq-artemis] 01/03: ARTEMIS-3385 management changes can be
reverted by XML update
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 6bd30e8fe34066fa02ff253e4f71781cc12c2278
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Wed Jul 14 14:26:19 2021 -0500
ARTEMIS-3385 management changes can be reverted by XML update
Durable changes made via the management API (e.g. adding
security-settings, adding address-settings, adding diverts) can be
reverted when reloading the XML at runtime.
---
.../core/server/impl/ActiveMQServerImpl.java | 32 ++-
.../tests/integration/jms/RedeployTest.java | 231 +++++++++++++++++++++
.../resources/reload-address-settings-updated.xml | 59 ++++++
.../src/test/resources/reload-address-settings.xml | 59 ++++++
.../src/test/resources/reload-diverts-updated.xml | 64 ++++++
.../src/test/resources/reload-diverts.xml | 64 ++++++
.../resources/reload-security-settings-updated.xml | 62 ++++++
.../test/resources/reload-security-settings.xml | 62 ++++++
8 files changed, 623 insertions(+), 10 deletions(-)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 0dbd005..740c3f7 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -3590,20 +3590,25 @@ public class ActiveMQServerImpl implements ActiveMQServer {
* @throws Exception
*/
private void recoverStoredConfigs() throws Exception {
- List<PersistedAddressSetting> adsettings = storageManager.recoverAddressSettings();
- for (PersistedAddressSetting set : adsettings) {
- addressSettingsRepository.addMatch(set.getAddressMatch().toString(), set.getSetting());
- }
+ recoverStoredAddressSettings();
+ recoverStoredSecuritySettings();
+ }
+ private void recoverStoredSecuritySettings() throws Exception {
List<PersistedSecuritySetting> roles = storageManager.recoverSecuritySettings();
-
for (PersistedSecuritySetting roleItem : roles) {
Set<Role> setRoles = SecurityFormatter.createSecurity(roleItem.getSendRoles(), roleItem.getConsumeRoles(), roleItem.getCreateDurableQueueRoles(), roleItem.getDeleteDurableQueueRoles(), roleItem.getCreateNonDurableQueueRoles(), roleItem.getDeleteNonDurableQueueRoles(), roleItem.getManageRoles(), roleItem.getBrowseRoles(), roleItem.getCreateAddressRoles(), roleItem.getDeleteAddressRoles());
-
securityRepository.addMatch(roleItem.getAddressMatch().toString(), setRoles);
}
}
+ private void recoverStoredAddressSettings() throws Exception {
+ List<PersistedAddressSetting> adsettings = storageManager.recoverAddressSettings();
+ for (PersistedAddressSetting set : adsettings) {
+ addressSettingsRepository.addMatch(set.getAddressMatch().toString(), set.getSetting());
+ }
+ }
+
@Override
public boolean updateAddressInfo(SimpleString address, EnumSet<RoutingType> routingTypes) throws Exception {
if (getAddressInfo(address) == null) {
@@ -4064,6 +4069,14 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
private void deployDiverts() throws Exception {
+ recoverStoredDiverts();
+ //deploy the configured diverts
+ for (DivertConfiguration config : configuration.getDivertConfigurations()) {
+ deployDivert(config);
+ }
+ }
+
+ private void recoverStoredDiverts() throws Exception {
if (storageManager.recoverDivertConfigurations() != null) {
for (PersistedDivertConfiguration persistedDivertConfiguration : storageManager.recoverDivertConfigurations()) {
@@ -4079,10 +4092,6 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
}
}
- //deploy the configured diverts
- for (DivertConfiguration config : configuration.getDivertConfigurations()) {
- deployDivert(config);
- }
}
private void deployGroupingHandlerConfiguration(final GroupingHandlerConfiguration config) throws Exception {
@@ -4316,9 +4325,11 @@ public class ActiveMQServerImpl implements ActiveMQServer {
if (configurationReloadDeployed.compareAndSet(false, true)) {
ActiveMQServerLogger.LOGGER.reloadingConfiguration("security");
securityRepository.swap(configuration.getSecurityRoles().entrySet());
+ recoverStoredSecuritySettings();
ActiveMQServerLogger.LOGGER.reloadingConfiguration("address settings");
addressSettingsRepository.swap(configuration.getAddressesSettings().entrySet());
+ recoverStoredAddressSettings();
ActiveMQServerLogger.LOGGER.reloadingConfiguration("diverts");
final Set<SimpleString> divertsToRemove = postOffice.getAllBindings()
@@ -4338,6 +4349,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
logger.warn("Divert " + divertName + " could not be removed", e);
}
}
+ recoverStoredDiverts();
ActiveMQServerLogger.LOGGER.reloadingConfiguration("addresses");
undeployAddressesAndQueueNotInConfiguration(configuration);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
index c868c8a..2541e1b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
@@ -198,6 +198,237 @@ public class RedeployTest extends ActiveMQTestBase {
}
@Test
+ public void testRedeploySecuritySettings() throws Exception {
+ Path brokerXML = getTestDirfile().toPath().resolve("broker.xml");
+ URL url1 = RedeployTest.class.getClassLoader().getResource("reload-security-settings.xml");
+ URL url2 = RedeployTest.class.getClassLoader().getResource("reload-security-settings-updated.xml");
+ Files.copy(url1.openStream(), brokerXML);
+
+ EmbeddedActiveMQ embeddedActiveMQ = new EmbeddedActiveMQ();
+ embeddedActiveMQ.setConfigResourcePath(brokerXML.toUri().toString());
+ embeddedActiveMQ.start();
+
+ final ReusableLatch latch = new ReusableLatch(1);
+
+ Runnable tick = new Runnable() {
+ @Override
+ public void run() {
+ latch.countDown();
+ }
+ };
+
+ embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
+
+ try {
+ latch.await(10, TimeUnit.SECONDS);
+
+ Set<Role> roles = embeddedActiveMQ.getActiveMQServer().getSecurityRepository().getMatch("foo");
+ boolean found = false;
+ for (Role role : roles) {
+ if (role.getName().equals("a")) {
+ found = true;
+ }
+ }
+
+ assertTrue(found);
+
+ Files.copy(url2.openStream(), brokerXML, StandardCopyOption.REPLACE_EXISTING);
+ brokerXML.toFile().setLastModified(System.currentTimeMillis() + 1000);
+ latch.setCount(1);
+ embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
+ latch.await(10, TimeUnit.SECONDS);
+
+ roles = embeddedActiveMQ.getActiveMQServer().getSecurityRepository().getMatch("foo");
+ found = false;
+ for (Role role : roles) {
+ if (role.getName().equals("b")) {
+ found = true;
+ }
+ }
+
+ assertTrue(found);
+
+ } finally {
+ embeddedActiveMQ.stop();
+ }
+ }
+
+ @Test
+ public void testRedeploySecuritySettingsWithManagementChange() throws Exception {
+ Path brokerXML = getTestDirfile().toPath().resolve("broker.xml");
+ URL url1 = RedeployTest.class.getClassLoader().getResource("reload-security-settings.xml");
+ URL url2 = RedeployTest.class.getClassLoader().getResource("reload-security-settings-updated.xml");
+ Files.copy(url1.openStream(), brokerXML);
+
+ EmbeddedActiveMQ embeddedActiveMQ = new EmbeddedActiveMQ();
+ embeddedActiveMQ.setConfigResourcePath(brokerXML.toUri().toString());
+ embeddedActiveMQ.start();
+
+ final ReusableLatch latch = new ReusableLatch(1);
+
+ Runnable tick = new Runnable() {
+ @Override
+ public void run() {
+ latch.countDown();
+ }
+ };
+
+ embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
+
+ try {
+ latch.await(10, TimeUnit.SECONDS);
+
+ Set<Role> roles = embeddedActiveMQ.getActiveMQServer().getSecurityRepository().getMatch("foo");
+ boolean found = false;
+ for (Role role : roles) {
+ if (role.getName().equals("a")) {
+ found = true;
+ }
+ }
+
+ assertTrue(found);
+
+ embeddedActiveMQ.getActiveMQServer().getActiveMQServerControl().addSecuritySettings("bar", "c", "c", "c", "c", "c", "c", "c", "c", "c", "c");
+ roles = embeddedActiveMQ.getActiveMQServer().getSecurityRepository().getMatch("bar");
+ for (Role role : roles) {
+ if (role.getName().equals("c")) {
+ found = true;
+ }
+ }
+
+ assertTrue(found);
+
+ Files.copy(url2.openStream(), brokerXML, StandardCopyOption.REPLACE_EXISTING);
+ brokerXML.toFile().setLastModified(System.currentTimeMillis() + 1000);
+ latch.setCount(1);
+ embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
+ latch.await(10, TimeUnit.SECONDS);
+
+ roles = embeddedActiveMQ.getActiveMQServer().getSecurityRepository().getMatch("foo");
+ found = false;
+ for (Role role : roles) {
+ if (role.getName().equals("b")) {
+ found = true;
+ }
+ }
+
+ assertTrue(found);
+
+ roles = embeddedActiveMQ.getActiveMQServer().getSecurityRepository().getMatch("bar");
+ found = false;
+ for (Role role : roles) {
+ if (role.getName().equals("c")) {
+ found = true;
+ }
+ }
+
+ assertTrue(found);
+
+ } finally {
+ embeddedActiveMQ.stop();
+ }
+ }
+
+ @Test
+ public void testRedeployAddressSettingsWithManagementChange() throws Exception {
+ Path brokerXML = getTestDirfile().toPath().resolve("broker.xml");
+ URL url1 = RedeployTest.class.getClassLoader().getResource("reload-address-settings.xml");
+ URL url2 = RedeployTest.class.getClassLoader().getResource("reload-address-settings-updated.xml");
+ Files.copy(url1.openStream(), brokerXML);
+
+ EmbeddedActiveMQ embeddedActiveMQ = new EmbeddedActiveMQ();
+ embeddedActiveMQ.setConfigResourcePath(brokerXML.toUri().toString());
+ embeddedActiveMQ.start();
+
+ final ReusableLatch latch = new ReusableLatch(1);
+
+ Runnable tick = new Runnable() {
+ @Override
+ public void run() {
+ latch.countDown();
+ }
+ };
+
+ embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
+
+ try {
+ latch.await(10, TimeUnit.SECONDS);
+
+ AddressSettings addressSettings = embeddedActiveMQ.getActiveMQServer().getAddressSettingsRepository().getMatch("foo");
+ assertEquals("a", addressSettings.getDeadLetterAddress().toString());
+
+ embeddedActiveMQ.getActiveMQServer().getActiveMQServerControl().addAddressSettings("bar", "c", null, 0, false, 0, 0, 0, 0, 0, 0, 0, 0, false, null, 0, 0, null, false, false, false, false);
+ addressSettings = embeddedActiveMQ.getActiveMQServer().getAddressSettingsRepository().getMatch("bar");
+ assertEquals("c", addressSettings.getDeadLetterAddress().toString());
+
+ Files.copy(url2.openStream(), brokerXML, StandardCopyOption.REPLACE_EXISTING);
+ brokerXML.toFile().setLastModified(System.currentTimeMillis() + 1000);
+ latch.setCount(1);
+ embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
+ latch.await(10, TimeUnit.SECONDS);
+
+ addressSettings = embeddedActiveMQ.getActiveMQServer().getAddressSettingsRepository().getMatch("foo");
+ assertEquals("b", addressSettings.getDeadLetterAddress().toString());
+
+ addressSettings = embeddedActiveMQ.getActiveMQServer().getAddressSettingsRepository().getMatch("bar");
+ assertEquals("c", addressSettings.getDeadLetterAddress().toString());
+
+ } finally {
+ embeddedActiveMQ.stop();
+ }
+ }
+
+ @Test
+ public void testRedeployDivertsWithManagementChange() throws Exception {
+ Path brokerXML = getTestDirfile().toPath().resolve("broker.xml");
+ URL url1 = RedeployTest.class.getClassLoader().getResource("reload-diverts.xml");
+ URL url2 = RedeployTest.class.getClassLoader().getResource("reload-diverts-updated.xml");
+ Files.copy(url1.openStream(), brokerXML);
+
+ EmbeddedActiveMQ embeddedActiveMQ = new EmbeddedActiveMQ();
+ embeddedActiveMQ.setConfigResourcePath(brokerXML.toUri().toString());
+ embeddedActiveMQ.start();
+
+ final ReusableLatch latch = new ReusableLatch(1);
+
+ Runnable tick = new Runnable() {
+ @Override
+ public void run() {
+ latch.countDown();
+ }
+ };
+
+ embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
+
+ try {
+ latch.await(10, TimeUnit.SECONDS);
+
+ DivertBinding divertBinding = (DivertBinding) embeddedActiveMQ.getActiveMQServer().getPostOffice().getBinding(new SimpleString("a"));
+ assertNotNull(divertBinding);
+ assertEquals("a", divertBinding.getDivert().getAddress().toString());
+
+ embeddedActiveMQ.getActiveMQServer().getActiveMQServerControl().createDivert("c", "c", "c", "target", false, null, null);
+
+ Files.copy(url2.openStream(), brokerXML, StandardCopyOption.REPLACE_EXISTING);
+ brokerXML.toFile().setLastModified(System.currentTimeMillis() + 1000);
+ latch.setCount(1);
+ embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick);
+ latch.await(10, TimeUnit.SECONDS);
+
+ divertBinding = (DivertBinding) embeddedActiveMQ.getActiveMQServer().getPostOffice().getBinding(new SimpleString("b"));
+ assertNotNull(divertBinding);
+ assertEquals("b", divertBinding.getDivert().getAddress().toString());
+
+ divertBinding = (DivertBinding) embeddedActiveMQ.getActiveMQServer().getPostOffice().getBinding(new SimpleString("c"));
+ assertNotNull(divertBinding);
+ assertEquals("c", divertBinding.getDivert().getAddress().toString());
+
+ } finally {
+ embeddedActiveMQ.stop();
+ }
+ }
+
+ @Test
public void testRedeployFilter() throws Exception {
Path brokerXML = getTestDirfile().toPath().resolve("broker.xml");
URL url1 = RedeployTest.class.getClassLoader().getResource("reload-queue-filter.xml");
diff --git a/tests/integration-tests/src/test/resources/reload-address-settings-updated.xml b/tests/integration-tests/src/test/resources/reload-address-settings-updated.xml
new file mode 100644
index 0000000..de99e51
--- /dev/null
+++ b/tests/integration-tests/src/test/resources/reload-address-settings-updated.xml
@@ -0,0 +1,59 @@
+<?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/artemis-configuration.xsd">
+
+ <core xmlns="urn:activemq:core">
+
+ <name>0.0.0.0</name>
+
+ <configuration-file-refresh-period>100</configuration-file-refresh-period>
+
+ <persistence-enabled>true</persistence-enabled>
+
+ <security-enabled>false</security-enabled>
+
+ <!-- this could be ASYNCIO or NIO
+ -->
+ <journal-type>NIO</journal-type>
+
+ <paging-directory>./target/data/paging</paging-directory>
+
+ <bindings-directory>./target/data/bindings</bindings-directory>
+
+ <journal-directory>./target/data/journal</journal-directory>
+
+ <large-messages-directory>./target/data/large-messages</large-messages-directory>
+
+
+ <acceptors>
+ <acceptor name="artemis">tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
+ </acceptors>
+
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="foo">
+ <dead-letter-address>b</dead-letter-address>
+ </address-setting>
+ </address-settings>
+ </core>
+</configuration>
diff --git a/tests/integration-tests/src/test/resources/reload-address-settings.xml b/tests/integration-tests/src/test/resources/reload-address-settings.xml
new file mode 100644
index 0000000..57c0be7
--- /dev/null
+++ b/tests/integration-tests/src/test/resources/reload-address-settings.xml
@@ -0,0 +1,59 @@
+<?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/artemis-configuration.xsd">
+
+ <core xmlns="urn:activemq:core">
+
+ <name>0.0.0.0</name>
+
+ <configuration-file-refresh-period>100</configuration-file-refresh-period>
+
+ <persistence-enabled>true</persistence-enabled>
+
+ <security-enabled>false</security-enabled>
+
+ <!-- this could be ASYNCIO or NIO
+ -->
+ <journal-type>NIO</journal-type>
+
+ <paging-directory>./target/data/paging</paging-directory>
+
+ <bindings-directory>./target/data/bindings</bindings-directory>
+
+ <journal-directory>./target/data/journal</journal-directory>
+
+ <large-messages-directory>./target/data/large-messages</large-messages-directory>
+
+
+ <acceptors>
+ <acceptor name="artemis">tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
+ </acceptors>
+
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="foo">
+ <dead-letter-address>a</dead-letter-address>
+ </address-setting>
+ </address-settings>
+ </core>
+</configuration>
diff --git a/tests/integration-tests/src/test/resources/reload-diverts-updated.xml b/tests/integration-tests/src/test/resources/reload-diverts-updated.xml
new file mode 100644
index 0000000..4afc44f
--- /dev/null
+++ b/tests/integration-tests/src/test/resources/reload-diverts-updated.xml
@@ -0,0 +1,64 @@
+<?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/artemis-configuration.xsd">
+
+ <core xmlns="urn:activemq:core">
+
+ <name>0.0.0.0</name>
+
+ <configuration-file-refresh-period>100</configuration-file-refresh-period>
+
+ <persistence-enabled>true</persistence-enabled>
+
+ <security-enabled>false</security-enabled>
+
+ <journal-type>NIO</journal-type>
+
+ <paging-directory>./target/data/paging</paging-directory>
+
+ <bindings-directory>./target/data/bindings</bindings-directory>
+
+ <journal-directory>./target/data/journal</journal-directory>
+
+ <large-messages-directory>./target/data/large-messages</large-messages-directory>
+
+
+ <acceptors>
+ <acceptor name="artemis">tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
+ </acceptors>
+
+ <addresses>
+ <address name="a"/>
+ <address name="b"/>
+ <address name="c"/>
+ <address name="target"/>
+ </addresses>
+
+ <diverts>
+ <divert name="b">
+ <address>b</address>
+ <forwarding-address>target</forwarding-address>
+ </divert>
+ </diverts>
+ </core>
+</configuration>
diff --git a/tests/integration-tests/src/test/resources/reload-diverts.xml b/tests/integration-tests/src/test/resources/reload-diverts.xml
new file mode 100644
index 0000000..6b18f62
--- /dev/null
+++ b/tests/integration-tests/src/test/resources/reload-diverts.xml
@@ -0,0 +1,64 @@
+<?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/artemis-configuration.xsd">
+
+ <core xmlns="urn:activemq:core">
+
+ <name>0.0.0.0</name>
+
+ <configuration-file-refresh-period>100</configuration-file-refresh-period>
+
+ <persistence-enabled>true</persistence-enabled>
+
+ <security-enabled>false</security-enabled>
+
+ <journal-type>NIO</journal-type>
+
+ <paging-directory>./target/data/paging</paging-directory>
+
+ <bindings-directory>./target/data/bindings</bindings-directory>
+
+ <journal-directory>./target/data/journal</journal-directory>
+
+ <large-messages-directory>./target/data/large-messages</large-messages-directory>
+
+
+ <acceptors>
+ <acceptor name="artemis">tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
+ </acceptors>
+
+ <addresses>
+ <address name="a"/>
+ <address name="b"/>
+ <address name="c"/>
+ <address name="target"/>
+ </addresses>
+
+ <diverts>
+ <divert name="a">
+ <address>a</address>
+ <forwarding-address>target</forwarding-address>
+ </divert>
+ </diverts>
+ </core>
+</configuration>
diff --git a/tests/integration-tests/src/test/resources/reload-security-settings-updated.xml b/tests/integration-tests/src/test/resources/reload-security-settings-updated.xml
new file mode 100644
index 0000000..47d94b1
--- /dev/null
+++ b/tests/integration-tests/src/test/resources/reload-security-settings-updated.xml
@@ -0,0 +1,62 @@
+<?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/artemis-configuration.xsd">
+
+ <core xmlns="urn:activemq:core">
+
+ <name>0.0.0.0</name>
+
+ <configuration-file-refresh-period>100</configuration-file-refresh-period>
+
+ <persistence-enabled>true</persistence-enabled>
+
+ <security-enabled>false</security-enabled>
+
+ <journal-type>NIO</journal-type>
+
+ <paging-directory>./target/data/paging</paging-directory>
+
+ <bindings-directory>./target/data/bindings</bindings-directory>
+
+ <journal-directory>./target/data/journal</journal-directory>
+
+ <large-messages-directory>./target/data/large-messages</large-messages-directory>
+
+ <acceptors>
+ <acceptor name="artemis">tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="foo">
+ <permission type="createNonDurableQueue" roles="b"/>
+ <permission type="deleteNonDurableQueue" roles="b"/>
+ <permission type="createDurableQueue" roles="b"/>
+ <permission type="deleteDurableQueue" roles="b"/>
+ <permission type="browse" roles="b"/>
+ <permission type="send" roles="b"/>
+ <!-- we need this otherwise ./artemis data imp wouldn't work -->
+ <permission type="manage" roles="b"/>
+ </security-setting>
+ </security-settings>
+ </core>
+</configuration>
diff --git a/tests/integration-tests/src/test/resources/reload-security-settings.xml b/tests/integration-tests/src/test/resources/reload-security-settings.xml
new file mode 100644
index 0000000..095b475
--- /dev/null
+++ b/tests/integration-tests/src/test/resources/reload-security-settings.xml
@@ -0,0 +1,62 @@
+<?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/artemis-configuration.xsd">
+
+ <core xmlns="urn:activemq:core">
+
+ <name>0.0.0.0</name>
+
+ <configuration-file-refresh-period>100</configuration-file-refresh-period>
+
+ <persistence-enabled>true</persistence-enabled>
+
+ <security-enabled>false</security-enabled>
+
+ <journal-type>NIO</journal-type>
+
+ <paging-directory>./target/data/paging</paging-directory>
+
+ <bindings-directory>./target/data/bindings</bindings-directory>
+
+ <journal-directory>./target/data/journal</journal-directory>
+
+ <large-messages-directory>./target/data/large-messages</large-messages-directory>
+
+ <acceptors>
+ <acceptor name="artemis">tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="foo">
+ <permission type="createNonDurableQueue" roles="a"/>
+ <permission type="deleteNonDurableQueue" roles="a"/>
+ <permission type="createDurableQueue" roles="a"/>
+ <permission type="deleteDurableQueue" roles="a"/>
+ <permission type="browse" roles="a"/>
+ <permission type="send" roles="a"/>
+ <!-- we need this otherwise ./artemis data imp wouldn't work -->
+ <permission type="manage" roles="a"/>
+ </security-setting>
+ </security-settings>
+ </core>
+</configuration>