You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/11/23 17:43:46 UTC
[45/48] activemq-artemis git commit: Fixing handful of issues
Fixing handful of issues
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/fb679396
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/fb679396
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/fb679396
Branch: refs/heads/ARTEMIS-780
Commit: fb6793967dc425f3c19dde2a7e9ce4b72f41e943
Parents: 40a5559
Author: jbertram <jb...@apache.com>
Authored: Tue Nov 22 15:07:36 2016 -0600
Committer: jbertram <jb...@apache.com>
Committed: Wed Nov 23 09:04:37 2016 -0600
----------------------------------------------------------------------
.../src/test/scripts/validate-instalation.sh | 4 ++--
.../artemis/jms/client/ActiveMQSession.java | 1 -
.../core/server/impl/ActiveMQServerImpl.java | 6 +++---
.../server/impl/AutoCreatedQueueManagerImpl.java | 8 +++-----
artemis-tools/pom.xml | 2 +-
.../integration/amqp/AmqpClientTestSupport.java | 2 +-
.../tests/integration/client/SessionTest.java | 3 ++-
.../crossprotocol/AMQPToOpenwireTest.java | 2 +-
.../crossprotocol/OpenWireToAMQPTest.java | 2 +-
.../jms/cluster/AutoCreateQueueClusterTest.java | 10 ++++------
.../jms/jms2client/NonExistentQueueTest.java | 4 ++--
.../mqtt/imported/MQTTTestSupport.java | 3 ++-
.../integration/openwire/OpenWireTestBase.java | 2 +-
.../integration/openwire/SimpleOpenWireTest.java | 19 ++++++++++++-------
.../activemq/artemis/jms/tests/SessionTest.java | 5 +++--
15 files changed, 38 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/artemis-distribution/src/test/scripts/validate-instalation.sh
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/test/scripts/validate-instalation.sh b/artemis-distribution/src/test/scripts/validate-instalation.sh
index 98449bd..5837739 100755
--- a/artemis-distribution/src/test/scripts/validate-instalation.sh
+++ b/artemis-distribution/src/test/scripts/validate-instalation.sh
@@ -49,7 +49,7 @@ pwd
sleep 5
./artemis producer
-./artemis consumer --receive-timeout 10000
+./artemis consumer --receive-timeout 10000 --break-on-null
./artemis stop
@@ -64,7 +64,7 @@ sleep 5
sleep 5
./artemis producer
-./artemis consumer --receive-timeout 10000
+./artemis consumer --receive-timeout 10000 --break-on-null
./artemis-service stop
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
index 26a941b..7fc0fb2 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
@@ -301,7 +301,6 @@ public class ActiveMQSession implements QueueSession, TopicSession {
if (!response.isExists()) {
if (jbd.isQueue() && response.isAutoCreateJmsQueues()) {
- // TODO create queue here in such a way that it is deleted when consumerCount == 0
// perhaps just relying on the broker to do it is simplest (i.e. deleteOnNoConsumers)
session.createAddress(jbd.getSimpleAddress(), false, true);
session.createQueue(jbd.getSimpleAddress(), jbd.getSimpleAddress(), null, true, true);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/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 a21e5be..b2cd7f8 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
@@ -650,7 +650,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
throw ActiveMQMessageBundle.BUNDLE.queueNameIsNull();
}
- boolean autoCreateJmsQueues = getAddressSettingsRepository().getMatch(name.toString()).isAutoCreateJmsQueues();
+ boolean autoCreateJmsQueues = getAddressSettingsRepository().getMatch(name.toString()).isAutoCreateQueues();
QueueQueryResult response;
@@ -1555,7 +1555,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
public void destroyQueue(final SimpleString queueName,
final SecurityAuth session,
final boolean checkConsumerCount) throws Exception {
- destroyQueue(queueName, session, checkConsumerCount, false, true);
+ destroyQueue(queueName, session, checkConsumerCount, false);
}
@Override
@@ -1607,7 +1607,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
if (autoDeleteAddress && postOffice != null) {
try {
- postOffice.removeAddressInfo(address);
+ removeAddressInfo(address);
} catch (ActiveMQDeleteAddressException e) {
// Could be thrown if the address has bindings or is not deletable.
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java
index 8bea315..0a1d09c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java
@@ -39,17 +39,15 @@ public class AutoCreatedQueueManagerImpl implements AutoCreatedQueueManager {
long consumerCount = queue.getConsumerCount();
long messageCount = queue.getMessageCount();
- // TODO make sure this is the right check
- if (((queue.isAutoCreated() && settings.isAutoDeleteJmsQueues()) || queue.isDeleteOnNoConsumers()) && queue.getMessageCount() == 0) {
+ if (((queue.isAutoCreated() && settings.isAutoDeleteQueues()) || queue.isDeleteOnNoConsumers()) && queue.getMessageCount() == 0) {
if (ActiveMQServerLogger.LOGGER.isDebugEnabled()) {
- ActiveMQServerLogger.LOGGER.debug("deleting auto-created queue \"" + queueName + ".\" consumerCount = " + consumerCount + "; messageCount = " + messageCount + "; isAutoDeleteJmsQueues = " + settings.isAutoDeleteJmsQueues());
+ ActiveMQServerLogger.LOGGER.debug("deleting " + (queue.isAutoCreated() ? "auto-created " : "") + "queue \"" + queueName + ".\" consumerCount = " + consumerCount + "; messageCount = " + messageCount + "; isAutoDeleteQueues = " + settings.isAutoDeleteQueues());
}
- // TODO handle this exception better
try {
server.destroyQueue(queueName, null, true, false);
} catch (Exception e) {
- e.printStackTrace();
+ ActiveMQServerLogger.LOGGER.errorRemovingAutoCreatedQueue(e, queueName);
}
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/artemis-tools/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-tools/pom.xml b/artemis-tools/pom.xml
index 9ce22fd..b28f3e5 100644
--- a/artemis-tools/pom.xml
+++ b/artemis-tools/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-pom</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<name>ActiveMQ Artemis Tools</name>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java
index d961a71..1e12d4c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java
@@ -86,7 +86,7 @@ public class AmqpClientTestSupport extends ActiveMQTestBase {
ActiveMQServer server = createServer(true, true);
serverManager = new JMSServerManagerImpl(server);
Configuration serverConfig = server.getConfiguration();
- serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateJmsQueues(true).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ")));
+ serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateQueues(true).setAutoCreateAddresses(true).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ")));
serverConfig.setSecurityEnabled(false);
serverManager.start();
server.start();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
index 7f97100..b3c7a4c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
@@ -229,7 +229,8 @@ public class SessionTest extends ActiveMQTestBase {
@Test
public void testQueueQueryNoQ() throws Exception {
- server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsQueues(false));
+ server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateQueues(false));
+ server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateAddresses(false));
cf = createSessionFactory(locator);
ClientSession clientSession = cf.createSession(false, true, true);
QueueQuery resp = clientSession.queueQuery(new SimpleString(queueName));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/AMQPToOpenwireTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/AMQPToOpenwireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/AMQPToOpenwireTest.java
index 1a0a997..5aafd91 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/AMQPToOpenwireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/AMQPToOpenwireTest.java
@@ -64,7 +64,7 @@ public class AMQPToOpenwireTest extends ActiveMQTestBase {
server.waitForActivation(10, TimeUnit.SECONDS);
Configuration serverConfig = server.getConfiguration();
- serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateJmsQueues(false).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ")));
+ serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateQueues(false).setAutoCreateAddresses(false).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ")));
serverConfig.setSecurityEnabled(false);
coreQueue = new SimpleString(queueName);
server.createQueue(coreQueue, coreQueue, null, false, false);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/OpenWireToAMQPTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/OpenWireToAMQPTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/OpenWireToAMQPTest.java
index fc98f13..968a3a7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/OpenWireToAMQPTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/OpenWireToAMQPTest.java
@@ -55,7 +55,7 @@ public class OpenWireToAMQPTest extends ActiveMQTestBase {
super.setUp();
server = createServer(true, true);
Configuration serverConfig = server.getConfiguration();
- serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateJmsQueues(false).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ")));
+ serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateQueues(false).setAutoCreateAddresses(false).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ")));
serverConfig.setSecurityEnabled(false);
server.start();
coreQueue = new SimpleString(queueName);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/AutoCreateQueueClusterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/AutoCreateQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/AutoCreateQueueClusterTest.java
index eb3d184..2894c29 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/AutoCreateQueueClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/AutoCreateQueueClusterTest.java
@@ -46,8 +46,8 @@ public class AutoCreateQueueClusterTest extends JMSClusteredTestBase {
@Test
public void testAutoCreate() throws Exception {
- server1.getAddressSettingsRepository().getMatch("#").setAutoCreateJmsQueues(true).setRedistributionDelay(0);
- server2.getAddressSettingsRepository().getMatch("#").setAutoCreateJmsQueues(true).setRedistributionDelay(0);
+ server1.getAddressSettingsRepository().getMatch("#").setAutoCreateQueues(true).setAutoCreateAddresses(true).setRedistributionDelay(0);
+ server2.getAddressSettingsRepository().getMatch("#").setAutoCreateQueues(true).setAutoCreateAddresses(true).setRedistributionDelay(0);
Connection conn1 = cf1.createConnection();
Connection conn2 = cf2.createConnection();
conn1.start();
@@ -58,15 +58,13 @@ public class AutoCreateQueueClusterTest extends JMSClusteredTestBase {
Session session2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
- // TODO the "jms." prefix is required here because the cluster connection only works for queues which start with "jms"
- MessageProducer prod1 = session1.createProducer(ActiveMQJMSClient.createQueue("jms.myQueue"));
+ MessageProducer prod1 = session1.createProducer(ActiveMQJMSClient.createQueue("myQueue"));
prod1.setDeliveryMode(DeliveryMode.PERSISTENT);
prod1.send(session1.createTextMessage("m1"));
- // TODO the "jms." prefix is required here because the cluster connection only works for queues which start with "jms"
- MessageConsumer cons2 = session2.createConsumer(ActiveMQJMSClient.createQueue("jms.myQueue"));
+ MessageConsumer cons2 = session2.createConsumer(ActiveMQJMSClient.createQueue("myQueue"));
TextMessage received = (TextMessage) cons2.receive(5000);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java
index 64d2af3..64edd29 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/jms2client/NonExistentQueueTest.java
@@ -40,8 +40,8 @@ public class NonExistentQueueTest extends JMSTestBase {
@Test
public void sendToNonExistentDestination() throws Exception {
- server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsQueues(false));
- server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsTopics(false));
+ server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateQueues(false));
+ server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateAddresses(false));
Destination destination = ActiveMQJMSClient.createTopic("DoesNotExist");
TransportConfiguration transportConfiguration = new TransportConfiguration(InVMConnectorFactory.class.getName());
ConnectionFactory localConnectionFactory = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, transportConfiguration);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
index 15cb8b6..877d5a7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
@@ -132,7 +132,8 @@ public class MQTTTestSupport extends ActiveMQTestBase {
addMQTTConnector();
AddressSettings addressSettings = new AddressSettings();
addressSettings.setMaxSizeBytes(999999999);
- addressSettings.setAutoCreateJmsQueues(true);
+ addressSettings.setAutoCreateQueues(true);
+ addressSettings.setAutoCreateAddresses(true);
server.getAddressSettingsRepository().addMatch("#", addressSettings);
server.start();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
index 1465afb..ac995c2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
@@ -64,7 +64,7 @@ public class OpenWireTestBase extends ActiveMQTestBase {
Configuration serverConfig = server.getConfiguration();
- serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateJmsQueues(false).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ")));
+ serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateQueues(false).setAutoCreateAddresses(false).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ")));
serverConfig.setSecurityEnabled(enableSecurity);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
index 3842b67..be037ee 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
@@ -402,6 +402,13 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
@Test
public void testSimpleTempQueue() throws Exception {
+ AddressSettings addressSetting = new AddressSettings();
+ addressSetting.setAutoCreateQueues(true);
+ addressSetting.setAutoCreateAddresses(true);
+
+ String address = "#";
+ server.getAddressSettingsRepository().addMatch(address, addressSetting);
+
connection.start();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -438,17 +445,13 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
@Test
public void testInvalidDestinationExceptionWhenNoQueueExistsOnCreateProducer() throws Exception {
- AddressSettings addressSetting = new AddressSettings();
- addressSetting.setAutoCreateJmsQueues(false);
-
- server.getAddressSettingsRepository().addMatch("foo", addressSetting);
-
connection.start();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("foo");
try {
session.createProducer(queue);
+ fail("Should have thrown an exception creating a producer here");
} catch (JMSException expected) {
}
session.close();
@@ -457,7 +460,8 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
@Test
public void testAutoDestinationCreationOnProducerSend() throws JMSException {
AddressSettings addressSetting = new AddressSettings();
- addressSetting.setAutoCreateJmsQueues(true);
+ addressSetting.setAutoCreateQueues(true);
+ addressSetting.setAutoCreateAddresses(true);
String address = "foo";
server.getAddressSettingsRepository().addMatch(address, addressSetting);
@@ -479,7 +483,8 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
@Test
public void testAutoDestinationCreationOnConsumer() throws JMSException {
AddressSettings addressSetting = new AddressSettings();
- addressSetting.setAutoCreateJmsQueues(true);
+ addressSetting.setAutoCreateQueues(true);
+ addressSetting.setAutoCreateAddresses(true);
String address = "foo";
server.getAddressSettingsRepository().addMatch(address, addressSetting);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fb679396/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
index fc3d132..c2e700a 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
@@ -104,7 +104,7 @@ public class SessionTest extends ActiveMQServerTestCase {
@Test
public void testCreateNonExistentQueue() throws Exception {
AddressSettings addressSettings = new AddressSettings();
- addressSettings.setAutoCreateJmsQueues(false);
+ addressSettings.setAutoCreateQueues(false);
getJmsServer().getAddressSettingsRepository().addMatch("#", addressSettings);
Connection conn = getConnectionFactory().createConnection();
@@ -134,7 +134,8 @@ public class SessionTest extends ActiveMQServerTestCase {
@Test
public void testCreateQueueWhileTopicWithSameNameExists() throws Exception {
AddressSettings addressSettings = new AddressSettings();
- addressSettings.setAutoCreateJmsQueues(false);
+ addressSettings.setAutoCreateQueues(false);
+ addressSettings.setAutoCreateAddresses(false);
getJmsServer().getAddressSettingsRepository().addMatch("#", addressSettings);
Connection conn = getConnectionFactory().createConnection();