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 2016/09/21 21:09:48 UTC
[1/3] activemq-artemis git commit: ARTEMIS-740 Auto-reload diverts
from broker.xml
Repository: activemq-artemis
Updated Branches:
refs/heads/master df0d5d71e -> 5ea53c48e
ARTEMIS-740 Auto-reload diverts from broker.xml
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/589adbcc
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/589adbcc
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/589adbcc
Branch: refs/heads/master
Commit: 589adbccacb34aa0ff9c933ff5b240bb71dc5463
Parents: df0d5d7
Author: Ville Skytt� <vi...@iki.fi>
Authored: Wed Sep 21 12:13:31 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Sep 21 17:00:21 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/589adbcc/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
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 7f67abc..38005ed 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
@@ -2451,6 +2451,12 @@ public class ActiveMQServerImpl implements ActiveMQServer {
securityRepository.swap(config.getSecurityRoles().entrySet());
ActiveMQServerLogger.LOGGER.reloadingConfiguration("address settings");
addressSettingsRepository.swap(config.getAddressesSettings().entrySet());
+ ActiveMQServerLogger.LOGGER.reloadingConfiguration("diverts");
+ for (DivertConfiguration divertConfig : config.getDivertConfigurations()) {
+ if (postOffice.getBinding(new SimpleString(divertConfig.getName())) == null) {
+ deployDivert(divertConfig);
+ }
+ }
}
}
}
[3/3] activemq-artemis git commit: This closes #784
Posted by cl...@apache.org.
This closes #784
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5ea53c48
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5ea53c48
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5ea53c48
Branch: refs/heads/master
Commit: 5ea53c48e843282e94211a309dd9515c2a63cf7a
Parents: df0d5d7 911ec30
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Sep 21 17:09:38 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Sep 21 17:09:38 2016 -0400
----------------------------------------------------------------------
.../artemis/core/server/impl/ActiveMQServerImpl.java | 6 ++++++
.../artemis/tests/integration/jms/RedeployTest.java | 13 +++++++++++++
.../src/test/resources/reload-test-updated-jms.xml | 8 ++++++++
3 files changed, 27 insertions(+)
----------------------------------------------------------------------
[2/3] activemq-artemis git commit: ARTEMIS-740 Test on redeployment
divert
Posted by cl...@apache.org.
ARTEMIS-740 Test on redeployment divert
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/911ec30b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/911ec30b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/911ec30b
Branch: refs/heads/master
Commit: 911ec30be1a4ef5512e24f986df3117beb75405c
Parents: 589adbc
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Sep 21 17:07:02 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Sep 21 17:07:02 2016 -0400
----------------------------------------------------------------------
.../artemis/tests/integration/jms/RedeployTest.java | 13 +++++++++++++
.../src/test/resources/reload-test-updated-jms.xml | 8 ++++++++
2 files changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/911ec30b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
----------------------------------------------------------------------
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 c106897..7c49053 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
@@ -20,6 +20,7 @@ package org.apache.activemq.artemis.tests.integration.jms;
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
import java.net.URL;
@@ -75,6 +76,18 @@ public class RedeployTest extends ActiveMQTestBase {
Assert.assertEquals("jms.queue.NewQueue", embeddedJMS.getActiveMQServer().getAddressSettingsRepository().getMatch("jms").getDeadLetterAddress().toString());
Assert.assertEquals("jms.queue.NewQueue", embeddedJMS.getActiveMQServer().getAddressSettingsRepository().getMatch("jms").getExpiryAddress().toString());
+
+ ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory();
+ try (Connection connection = factory.createConnection()) {
+ Session session = connection.createSession();
+ Queue queue = session.createQueue("DivertQueue");
+ MessageProducer producer = session.createProducer(queue);
+ producer.send(session.createTextMessage("text"));
+ connection.start();
+ MessageConsumer consumer = session.createConsumer(session.createQueue("NewQueue"));
+ Assert.assertNotNull("Divert wasn't redeployed accordingly", consumer.receive(5000));
+ }
+
}
finally {
embeddedJMS.stop();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/911ec30b/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml b/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml
index 3e6e329..a9d1016 100644
--- a/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml
+++ b/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml
@@ -26,6 +26,7 @@ under the License.
<queue name="DLQ"/>
<queue name="ExpiryQueue"/>
<queue name="NewQueue"/>
+ <queue name="DivertQueue"/>
</jms>
@@ -83,6 +84,13 @@ under the License.
</acceptors>
+ <diverts>
+ <divert name="myDivert">
+ <address>jms.queue.DivertQueue</address>
+ <forwarding-address>jms.queue.NewQueue</forwarding-address>
+ </divert>
+ </diverts>
+
<security-settings>
<security-setting match="#">