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 2018/08/30 19:08:26 UTC
[1/2] activemq-artemis git commit: ARTEMIS-2066
LegacyJMSConfiguration parser may deploy non-jms queues
Repository: activemq-artemis
Updated Branches:
refs/heads/master f80e87768 -> 611cedf89
ARTEMIS-2066 LegacyJMSConfiguration parser may deploy non-jms queues
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e7e5112d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e7e5112d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e7e5112d
Branch: refs/heads/master
Commit: e7e5112d51c0b25f9fbfd194ed2ddbf3062a127a
Parents: f80e877
Author: Justin Bertram <jb...@apache.org>
Authored: Wed Aug 29 21:20:13 2018 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 30 15:08:10 2018 -0400
----------------------------------------------------------------------
.../artemis/core/config/impl/LegacyJMSConfiguration.java | 11 +++++------
.../artemis/tests/integration/jms/RedeployTest.java | 3 +++
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e7e5112d/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/LegacyJMSConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/LegacyJMSConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/LegacyJMSConfiguration.java
index bc4a741..a79402c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/LegacyJMSConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/LegacyJMSConfiguration.java
@@ -17,9 +17,6 @@
package org.apache.activemq.artemis.core.config.impl;
import javax.management.MBeanServer;
-import javax.xml.XMLConstants;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
@@ -110,9 +107,11 @@ public class LegacyJMSConfiguration implements Deployable {
String xml = XMLUtil.readerToString(reader);
xml = XMLUtil.replaceSystemProps(xml);
Element e = XMLUtil.stringToElement(xml);
- SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
- Schema schema = schemaFactory.newSchema(XMLUtil.findResource(CONFIGURATION_SCHEMA_URL));
- parseConfiguration(e);
+ // only parse elements from <jms>
+ NodeList children = e.getElementsByTagName(CONFIGURATION_SCHEMA_ROOT_ELEMENT);
+ if (children.getLength() > 0) {
+ parseConfiguration(children.item(0));
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e7e5112d/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 bb30606..e685568 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
@@ -260,6 +260,9 @@ public class RedeployTest extends ActiveMQTestBase {
Assert.assertTrue(listQueuesNamesForAddress(embeddedActiveMQ, "config_test_queue_change").contains("config_test_queue_change_queue"));
Assert.assertEquals(1, getQueue(embeddedActiveMQ, "config_test_queue_change_queue").getMaxConsumers());
Assert.assertEquals(true, getQueue(embeddedActiveMQ, "config_test_queue_change_queue").isPurgeOnNoConsumers());
+
+ Assert.assertNull(getAddressInfo(embeddedActiveMQ, "config_test_queue_change_queue"));
+ Assert.assertNull(getAddressInfo(embeddedActiveMQ, "config_test_queue_removal_queue_1"));
} finally {
embeddedActiveMQ.stop();
}
[2/2] activemq-artemis git commit: This closes #2283
Posted by cl...@apache.org.
This closes #2283
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/611cedf8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/611cedf8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/611cedf8
Branch: refs/heads/master
Commit: 611cedf89343fcfb85d0d27a6d32d01718696a0f
Parents: f80e877 e7e5112
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Aug 30 15:08:11 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 30 15:08:11 2018 -0400
----------------------------------------------------------------------
.../artemis/core/config/impl/LegacyJMSConfiguration.java | 11 +++++------
.../artemis/tests/integration/jms/RedeployTest.java | 3 +++
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------