activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [10/13] activemq-artemis git commit: Remove JMS prefixes
Date Fri, 04 Nov 2016 13:29:13 GMT
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StompInternalStateTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StompInternalStateTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StompInternalStateTest.java
index c798b57..a4dd033 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StompInternalStateTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/StompInternalStateTest.java
@@ -42,7 +42,7 @@ import org.junit.runner.RunWith;
 @RunWith(BMUnitRunner.class)
 public class StompInternalStateTest extends ActiveMQTestBase {
 
-   private static final String STOMP_QUEUE_NAME = "jms.queue.StompTestQueue";
+   private static final String STOMP_QUEUE_NAME = "StompTestQueue";
 
    private String resultTestStompProtocolManagerLeak = null;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/TimeoutXATest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/TimeoutXATest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/TimeoutXATest.java
index ce36a0e..8c2cac0 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/TimeoutXATest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/TimeoutXATest.java
@@ -55,7 +55,7 @@ public class TimeoutXATest extends ActiveMQTestBase {
       server.getConfiguration().setTransactionTimeoutScanPeriod(1100);
       server.getConfiguration().setJournalSyncNonTransactional(false);
       server.start();
-      server.createQueue(SimpleString.toSimpleString("jms.queue.Queue1"), SimpleString.toSimpleString("jms.queue.Queue1"), null, true, false);
+      server.createQueue(SimpleString.toSimpleString("Queue1"), SimpleString.toSimpleString("Queue1"), null, true, false);
 
       removingTXEntered0 = new CountDownLatch(1);
       removingTXAwait0 = new CountDownLatch(1);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
index e52963e..a89edb8 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
@@ -38,7 +38,6 @@ import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
 import com.arjuna.ats.arjuna.coordinator.TxControl;
 import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
 import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.api.core.management.ResourceNames;
 import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
 import org.apache.activemq.artemis.api.jms.JMSFactoryType;
 import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
@@ -486,7 +485,7 @@ public abstract class BridgeTestBase extends ActiveMQTestBase {
       if (index == 1) {
          managementService = server1.getManagementService();
       }
-      JMSQueueControl queueControl = (JMSQueueControl) managementService.getResource(ResourceNames.JMS_QUEUE + queue.getQueueName());
+      JMSQueueControl queueControl = (JMSQueueControl) managementService.getResource(queue.getQueueName());
 
       //server may be closed
       if (queueControl != null) {
@@ -505,7 +504,7 @@ public abstract class BridgeTestBase extends ActiveMQTestBase {
       if (index == 1) {
          managementService = server1.getManagementService();
       }
-      TopicControl topicControl = (TopicControl) managementService.getResource(ResourceNames.JMS_TOPIC + topic.getTopicName());
+      TopicControl topicControl = (TopicControl) managementService.getResource(topic.getTopicName());
       Assert.assertEquals(0, topicControl.getSubscriptionCount());
 
    }
@@ -515,7 +514,7 @@ public abstract class BridgeTestBase extends ActiveMQTestBase {
       if (index == 1) {
          managementService = server1.getManagementService();
       }
-      JMSQueueControl queueControl = (JMSQueueControl) managementService.getResource(ResourceNames.JMS_QUEUE + queueName);
+      JMSQueueControl queueControl = (JMSQueueControl) managementService.getResource(queueName);
       queueControl.removeMessages(null);
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
index fa66cf2..4e7245d 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/ClusteredBridgeTestBase.java
@@ -212,7 +212,7 @@ public abstract class ClusteredBridgeTestBase extends ActiveMQTestBase {
 
       public void sendMessages(String queueName, int num) throws ActiveMQException {
          ClientSession session = sessionFactory.createSession();
-         ClientProducer producer = session.createProducer("jms.queue." + queueName);
+         ClientProducer producer = session.createProducer(queueName);
          for (int i = 0; i < num; i++) {
             ClientMessage m = session.createMessage(true);
             m.putStringProperty("bridge-message", "hello " + index);
@@ -225,7 +225,7 @@ public abstract class ClusteredBridgeTestBase extends ActiveMQTestBase {
       public void receiveMessages(String queueName, int num, boolean checkDup) throws ActiveMQException {
          ClientSession session = sessionFactory.createSession();
          session.start();
-         ClientConsumer consumer = session.createConsumer("jms.queue." + queueName);
+         ClientConsumer consumer = session.createConsumer(queueName);
          for (int i = 0; i < num; i++) {
             ClientMessage m = consumer.receive(30000);
             assertNotNull("i=" + i, m);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java
index bc613f6..2b6868f 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java
@@ -258,7 +258,7 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase
       ClientSession session = factory.createSession(false, false);
       session.start();
 
-      ClientConsumer consumer = session.createConsumer("jms.queue.outQueue");
+      ClientConsumer consumer = session.createConsumer("outQueue");
 
       for (int i = 0; i < NUMBER_OF_MESSAGES; i++) {
          ClientMessage message = consumer.receive(60000);
@@ -423,7 +423,7 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase
             factory = nettyLocator.createSessionFactory();
             //            buggingList.add(factory);
             endpointSession = factory.createSession(true, false, false);
-            producer = endpointSession.createProducer("jms.queue.outQueue");
+            producer = endpointSession.createProducer("outQueue");
          } catch (Throwable e) {
             throw new RuntimeException(e);
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
index c2004e7..b6e4de7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
@@ -309,7 +309,7 @@ public class AddressingTest extends ActiveMQTestBase {
       // For each address, create 2 Queues with the same address, assert both queues receive message
       boolean deleteOnNoConsumers = false;
       AddressInfo addressInfo = new AddressInfo(address);
-      addressInfo.setDefaultMaxConsumers(0);
+      addressInfo.setDefaultMaxQueueConsumers(0);
       Queue q1 = server.createQueue(address, queueName, null, true, false, null, deleteOnNoConsumers);
 
       ClientSession session = sessionFactory.createSession();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/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 14f9b61..d961a71 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("jms.queue.#", new AddressSettings().setAutoCreateJmsQueues(true).setDeadLetterAddress(new SimpleString("jms.queue.ActiveMQ.DLQ")));
+      serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateJmsQueues(true).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ")));
       serverConfig.setSecurityEnabled(false);
       serverManager.start();
       server.start();
@@ -98,7 +98,7 @@ public class AmqpClientTestSupport extends ActiveMQTestBase {
    }
 
    public String getTestName() {
-      return "jms.queue." + getName();
+      return getName();
    }
 
    public AmqpClientTestSupport() {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java
index 86a35a2..abc422b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java
@@ -371,6 +371,6 @@ public class AmqpDurableReceiverTest extends AmqpClientTestSupport {
    }
 
    public String getTopicName() {
-      return "jms.topic.myTopic";
+      return "topic://myTopic";
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTempDestinationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTempDestinationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTempDestinationTest.java
index 4dbe21e..c599f38 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTempDestinationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTempDestinationTest.java
@@ -111,6 +111,8 @@ public class AmqpTempDestinationTest extends AmqpClientTestSupport {
 
       sender.close();
 
+      Thread.sleep(200);
+
       queueView = getProxyToQueue(remoteTarget.getAddress());
       assertNull(queueView);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ProtonMaxFrameSizeTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ProtonMaxFrameSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ProtonMaxFrameSizeTest.java
index 2997327..851ee2f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ProtonMaxFrameSizeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ProtonMaxFrameSizeTest.java
@@ -53,7 +53,7 @@ public class ProtonMaxFrameSizeTest extends ProtonTestBase {
          amqpConnection.connect();
 
          AmqpSession session = amqpConnection.createSession();
-         AmqpSender sender = session.createSender("jms.queue." + testQueueName);
+         AmqpSender sender = session.createSender(testQueueName);
 
          final int payload = FRAME_SIZE * 16;
 
@@ -62,10 +62,10 @@ public class ProtonMaxFrameSizeTest extends ProtonTestBase {
             sender.send(message);
          }
 
-         int count = getMessageCount(server.getPostOffice(), "jms.queue." + testQueueName);
+         int count = getMessageCount(server.getPostOffice(), testQueueName);
          assertEquals(nMsgs, count);
 
-         AmqpReceiver receiver = session.createReceiver("jms.queue." + testQueueName);
+         AmqpReceiver receiver = session.createReceiver(testQueueName);
          receiver.flow(nMsgs);
 
          for (int i = 0; i < nMsgs; ++i) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ProtonTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ProtonTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ProtonTest.java
index 53ced4e..c0ca74a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ProtonTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ProtonTest.java
@@ -130,7 +130,7 @@ public class ProtonTest extends ProtonTestBase {
    private final int protocol;
 
    public ProtonTest(String name, int protocol) {
-      this.coreAddress = "jms.queue.exampleQueue";
+      this.coreAddress = "exampleQueue";
       this.protocol = protocol;
       if (protocol == 0 || protocol == 3) {
          this.address = coreAddress;
@@ -491,6 +491,7 @@ public class ProtonTest extends ProtonTestBase {
          Assert.assertEquals("Message:" + i, message.getText());
       }
       session.commit();
+      session.close();
       Queue q = (Queue) server.getPostOffice().getBinding(new SimpleString(coreAddress)).getBindable();
       Assert.assertEquals(q.getMessageCount(), 0);
    }
@@ -635,7 +636,7 @@ public class ProtonTest extends ProtonTestBase {
 
          AmqpMessage m;
          for (int i = 0; i < messagesSent - 1; i++) {
-            m = receiver.receive();
+            m = receiver.receive(5000, TimeUnit.MILLISECONDS);
             m.accept();
          }
 
@@ -842,10 +843,10 @@ public class ProtonTest extends ProtonTestBase {
          Source source = new Source();
          source.setDurable(TerminusDurability.UNSETTLED_STATE);
          source.setCapabilities(Symbol.getSymbol("topic"));
-         source.setAddress("jms.topic.mytopic");
+         source.setAddress("mytopic");
          AmqpReceiver receiver = session.createReceiver(source, "testSub");
 
-         SimpleString fo = new SimpleString("testClient.testSub:jms.topic.mytopic");
+         SimpleString fo = new SimpleString("testClient.testSub:mytopic");
          assertNotNull(server.locateQueue(fo));
 
       } catch (Exception e) {
@@ -874,7 +875,7 @@ public class ProtonTest extends ProtonTestBase {
       message.setText("TestPayload");
       sender.send(message);
 
-      AmqpMessage receivedMessage = receiver.receive();
+      AmqpMessage receivedMessage = receiver.receive(5000, TimeUnit.MILLISECONDS);
       assertNotNull(receivedMessage);
    }
 
@@ -886,7 +887,7 @@ public class ProtonTest extends ProtonTestBase {
       try {
          String destinationAddress = address + 1;
          AmqpSession session = amqpConnection.createSession();
-         AmqpSender sender = session.createSender("jms.queue.activemq.management");
+         AmqpSender sender = session.createSender("activemq.management");
          AmqpReceiver receiver = session.createReceiver(destinationAddress);
          receiver.flow(10);
 
@@ -928,6 +929,7 @@ public class ProtonTest extends ProtonTestBase {
       connection.start();
 
       message = (TextMessage) cons.receive(5000);
+      assertNotNull(message);
       Destination jmsReplyTo = message.getJMSReplyTo();
       Assert.assertNotNull(jmsReplyTo);
       Assert.assertNotNull(message);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/SendingAndReceivingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/SendingAndReceivingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/SendingAndReceivingTest.java
index 882efd5..f19b0a4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/SendingAndReceivingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/SendingAndReceivingTest.java
@@ -64,7 +64,7 @@ public class SendingAndReceivingTest extends ActiveMQTestBase {
       try {
          connection = connectionFactory.createConnection();
          Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         Queue queue = session.createQueue("jms.queue.exampleQueue");
+         Queue queue = session.createQueue("exampleQueue");
          MessageProducer sender = session.createProducer(queue);
 
          String body = createMessage(10240);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/DestinationCommandTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/DestinationCommandTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/DestinationCommandTest.java
index 74cbd28..a9266ef 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/DestinationCommandTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/DestinationCommandTest.java
@@ -202,9 +202,9 @@ public class DestinationCommandTest extends JMSTestBase {
       String bindingKey = command.getName();
       if (isJms(command)) {
          if (isTopic(command)) {
-            bindingKey = "jms.topic." + bindingKey;
+//            bindingKey = bindingKey;
          } else {
-            bindingKey = "jms.queue." + bindingKey;
+//            bindingKey = bindingKey;
          }
       }
       Map<SimpleString, Binding> bindings = server.getPostOffice().getAllBindings();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java
index 46e9db7..ad90f0a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsDestinationTest.java
@@ -39,14 +39,19 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.activemq.artemis.api.core.management.ResourceNames.CORE_ADDRESS;
+import static org.apache.activemq.artemis.api.core.management.ResourceNames.CORE_QUEUE;
+
 public class AutoCreateJmsDestinationTest extends JMSTestBase {
 
+   public static final String QUEUE_NAME = "test";
+
    @Test
    public void testAutoCreateOnSendToQueue() throws Exception {
       Connection connection = cf.createConnection();
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-      javax.jms.Queue queue = ActiveMQJMSClient.createQueue("test");
+      javax.jms.Queue queue = ActiveMQJMSClient.createQueue(QUEUE_NAME);
 
       MessageProducer producer = session.createProducer(queue);
 
@@ -67,8 +72,9 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase {
          Assert.assertNotNull(m);
       }
 
-      // make sure the JMX control was created for the JMS queue
-      assertNotNull(server.getManagementService().getResource("jms.queue.test"));
+      // make sure the JMX control was created for the address and queue
+      assertNotNull(server.getManagementService().getResource(CORE_ADDRESS + QUEUE_NAME));
+      assertNotNull(server.getManagementService().getResource(CORE_QUEUE + QUEUE_NAME));
 
       connection.close();
    }
@@ -78,7 +84,7 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase {
       Connection connection = cf.createConnection();
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-      javax.jms.Queue queue = ActiveMQJMSClient.createQueue("test");
+      javax.jms.Queue queue = ActiveMQJMSClient.createQueue(QUEUE_NAME);
 
       MessageProducer producer = session.createProducer(null);
 
@@ -107,19 +113,17 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase {
       ((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().addUser("guest", "guest");
       ((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().setDefaultUser("guest");
       ((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().addRole("guest", "rejectAll");
-      Role role = new Role("rejectAll", false, false, false, false, false, false, false, false);
+      Role role = new Role("rejectAll", false, false, false, false, false, false, false, false, false);
       Set<Role> roles = new HashSet<>();
       roles.add(role);
       server.getSecurityRepository().addMatch("#", roles);
       Connection connection = cf.createConnection();
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-      javax.jms.Queue queue = ActiveMQJMSClient.createQueue("test");
-      MessageProducer producer = session.createProducer(queue);
-      TextMessage mess = session.createTextMessage("msg");
+      javax.jms.Queue queue = ActiveMQJMSClient.createQueue(QUEUE_NAME);
 
       try {
-         producer.send(mess);
+         session.createProducer(queue);
          Assert.fail("Sending a message here should throw a JMSSecurityException");
       } catch (Exception e) {
          Assert.assertTrue(e instanceof JMSSecurityException);
@@ -133,14 +137,14 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase {
       Connection connection = cf.createConnection();
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-      javax.jms.Topic topic = ActiveMQJMSClient.createTopic("test");
+      javax.jms.Topic topic = ActiveMQJMSClient.createTopic(QUEUE_NAME);
 
       MessageProducer producer = session.createProducer(topic);
       producer.send(session.createTextMessage("msg"));
 
       connection.close();
 
-      assertNotNull(server.getManagementService().getResource("jms.topic.test"));
+      assertNotNull(server.getManagementService().getResource("core.address.test"));
    }
 
    @Test
@@ -149,7 +153,7 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase {
       connection = cf.createConnection();
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-      javax.jms.Queue queue = ActiveMQJMSClient.createQueue("test");
+      javax.jms.Queue queue = ActiveMQJMSClient.createQueue(QUEUE_NAME);
 
       MessageConsumer messageConsumer = session.createConsumer(queue);
       connection.start();
@@ -157,7 +161,7 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase {
       Message m = messageConsumer.receive(500);
       Assert.assertNull(m);
 
-      Queue q = (Queue) server.getPostOffice().getBinding(new SimpleString("jms.queue.test")).getBindable();
+      Queue q = (Queue) server.getPostOffice().getBinding(new SimpleString(QUEUE_NAME)).getBindable();
       Assert.assertEquals(0, q.getMessageCount());
       Assert.assertEquals(0, q.getMessagesAdded());
       connection.close();
@@ -177,11 +181,11 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase {
       connection.start();
       assertNotNull(consumer.receive(500));
 
-      assertNotNull(server.getManagementService().getResource("jms.topic." + topicName));
+      assertNotNull(server.getManagementService().getResource("core.address." + topicName));
 
       connection.close();
 
-      assertNull(server.getManagementService().getResource("jms.topic." + topicName));
+      assertNull(server.getManagementService().getResource("core.address." + topicName));
    }
 
    @Test
@@ -190,7 +194,7 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase {
       connection.setClientID("myClientID");
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-      javax.jms.Topic topic = ActiveMQJMSClient.createTopic("test");
+      javax.jms.Topic topic = ActiveMQJMSClient.createTopic(QUEUE_NAME);
 
       MessageConsumer consumer = session.createDurableConsumer(topic, "myDurableSub");
       MessageProducer producer = session.createProducer(topic);
@@ -200,7 +204,7 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase {
 
       connection.close();
 
-      assertNotNull(server.getManagementService().getResource("jms.topic.test"));
+      assertNotNull(server.getManagementService().getResource("core.address.test"));
 
       assertNotNull(server.locateQueue(SimpleString.toSimpleString("myClientID.myDurableSub")));
    }
@@ -210,7 +214,7 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase {
       Connection connection = cf.createConnection();
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-      //      javax.jms.Topic topic = ActiveMQJMSClient.createTopic("test");
+      //      javax.jms.Topic topic = ActiveMQJMSClient.createTopic(QUEUE_NAME);
 
       ActiveMQTemporaryTopic topic = (ActiveMQTemporaryTopic) session.createTemporaryTopic();
 
@@ -244,7 +248,7 @@ public class AutoCreateJmsDestinationTest extends JMSTestBase {
       ((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().addUser("guest", "guest");
       ((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().setDefaultUser("guest");
       ((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().addRole("guest", "allowAll");
-      Role role = new Role("allowAll", true, true, true, true, true, true, true, true);
+      Role role = new Role("allowAll", true, true, true, true, true, true, true, true, true);
       Set<Role> roles = new HashSet<>();
       roles.add(role);
       server.getSecurityRepository().addMatch("#", roles);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteJmsDestinationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteJmsDestinationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteJmsDestinationTest.java
index 9d23445..0e9b2e9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteJmsDestinationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteJmsDestinationTest.java
@@ -62,7 +62,7 @@ public class AutoDeleteJmsDestinationTest extends JMSTestBase {
       session.close();
 
       // ensure the queue is still there
-      Queue q = (Queue) server.getPostOffice().getBinding(new SimpleString("jms.queue.test")).getBindable();
+      Queue q = (Queue) server.getPostOffice().getBinding(new SimpleString("test")).getBindable();
       Assert.assertEquals(1, q.getMessageCount());
       Assert.assertEquals(numMessages, q.getMessagesAdded());
 
@@ -74,10 +74,10 @@ public class AutoDeleteJmsDestinationTest extends JMSTestBase {
       connection.close();
 
       // ensure the queue was removed
-      Assert.assertNull(server.getPostOffice().getBinding(new SimpleString("jms.queue.test")));
+      Assert.assertNull(server.getPostOffice().getBinding(new SimpleString("test")));
 
       // make sure the JMX control was removed for the JMS queue
-      assertNull(server.getManagementService().getResource("jms.queue.test"));
+      assertNull(server.getManagementService().getResource("test"));
    }
 
    @Test
@@ -110,7 +110,7 @@ public class AutoDeleteJmsDestinationTest extends JMSTestBase {
       session.close();
 
       // ensure the queue is still there
-      Queue q = (Queue) server.getPostOffice().getBinding(new SimpleString("jms.queue.test")).getBindable();
+      Queue q = (Queue) server.getPostOffice().getBinding(new SimpleString("test")).getBindable();
       Assert.assertEquals(1, q.getMessageCount());
       Assert.assertEquals(numMessages, q.getMessagesAdded());
 
@@ -122,7 +122,7 @@ public class AutoDeleteJmsDestinationTest extends JMSTestBase {
       connection.close();
 
       // ensure the queue was not removed
-      Assert.assertNotNull(server.getPostOffice().getBinding(new SimpleString("jms.queue.test")));
+      Assert.assertNotNull(server.getPostOffice().getBinding(new SimpleString("test")));
    }
 
    @Test
@@ -153,10 +153,10 @@ public class AutoDeleteJmsDestinationTest extends JMSTestBase {
       connection.close();
 
       // ensure the topic was removed
-      Assert.assertNull(server.locateQueue(new SimpleString("jms.topic.test")));
+      Assert.assertNull(server.locateQueue(new SimpleString("test")));
 
       // make sure the JMX control was removed for the JMS topic
-      assertNull(server.getManagementService().getResource("jms.topic.test"));
+      assertNull(server.getManagementService().getResource("jtest"));
    }
 
    @Test
@@ -191,9 +191,9 @@ public class AutoDeleteJmsDestinationTest extends JMSTestBase {
       connection.close();
 
       // ensure the topic was removed
-      Assert.assertNull(server.locateQueue(new SimpleString("jms.topic.test")));
+      Assert.assertNull(server.locateQueue(new SimpleString("test")));
 
       // make sure the JMX control was removed for the JMS topic
-      assertNull(server.getManagementService().getResource("jms.topic.test"));
+      assertNull(server.getManagementService().getResource("test"));
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
index 124ece3..159a285 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
@@ -425,8 +425,8 @@ public class HangConsumerTest extends ActiveMQTestBase {
    public void testDuplicateDestinationsOnTopic() throws Exception {
       try {
          for (int i = 0; i < 5; i++) {
-            if (server.locateQueue(SimpleString.toSimpleString("jms.topic.tt")) == null) {
-               server.createQueue(SimpleString.toSimpleString("jms.topic.tt"), SimpleString.toSimpleString("jms.topic.tt"), SimpleString.toSimpleString(ActiveMQServerImpl.GENERIC_IGNORED_FILTER), true, false);
+            if (server.locateQueue(SimpleString.toSimpleString("tt")) == null) {
+               server.createQueue(SimpleString.toSimpleString("tt"), SimpleString.toSimpleString("tt"), SimpleString.toSimpleString(ActiveMQServerImpl.GENERIC_IGNORED_FILTER), true, false);
             }
 
             server.stop();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
index d78c0fb..c4bf13f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
@@ -214,7 +214,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase {
 
       server.start();
 
-      SimpleString jmsAddress = new SimpleString("jms.queue.Test");
+      SimpleString jmsAddress = new SimpleString("Test");
 
       server.createQueue(jmsAddress, jmsAddress, null, true, false);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSMessageCounterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSMessageCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSMessageCounterTest.java
index c1cf4ec..b3dd022 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSMessageCounterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSMessageCounterTest.java
@@ -23,7 +23,6 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.artemis.api.core.management.ResourceNames;
 import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
 import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Test;
@@ -54,7 +53,7 @@ public class JMSMessageCounterTest extends JMSTestBase {
 
       conn.close();
 
-      JMSQueueControl control = (JMSQueueControl) server.getManagementService().getResource(ResourceNames.JMS_QUEUE + queue.getQueueName());
+      JMSQueueControl control = (JMSQueueControl) server.getManagementService().getResource(queue.getQueueName());
       assertNotNull(control);
 
       System.out.println(control.listMessageCounterAsHTML());
@@ -63,7 +62,7 @@ public class JMSMessageCounterTest extends JMSTestBase {
 
       restartServer();
 
-      control = (JMSQueueControl) server.getManagementService().getResource(ResourceNames.JMS_QUEUE + queue.getQueueName());
+      control = (JMSQueueControl) server.getManagementService().getResource(queue.getQueueName());
       assertNotNull(control);
 
       System.out.println(control.listMessageCounterAsHTML());

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java
index 86c0539..a51387d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java
@@ -107,7 +107,7 @@ public class JMSPagingFileDeleteTest extends JMSTestBase {
             }
             System.out.println("Sent " + JMSPagingFileDeleteTest.MESSAGE_NUM + " messages.");
 
-            pagingStore = server.getPagingManager().getPageStore(new SimpleString("jms.topic.topic1"));
+            pagingStore = server.getPagingManager().getPageStore(new SimpleString("topic1"));
             printPageStoreInfo(pagingStore);
 
             assertTrue(pagingStore.isPaging());
@@ -159,7 +159,7 @@ public class JMSPagingFileDeleteTest extends JMSTestBase {
          }
          System.out.println("Sent " + JMSPagingFileDeleteTest.MESSAGE_NUM + " messages.");
 
-         pagingStore = server.getPagingManager().getPageStore(new SimpleString("jms.topic.topic1"));
+         pagingStore = server.getPagingManager().getPageStore(new SimpleString("topic1"));
          printPageStoreInfo(pagingStore);
 
          assertTrue(pagingStore.isPaging());
@@ -178,7 +178,7 @@ public class JMSPagingFileDeleteTest extends JMSTestBase {
             assertNotNull(message2);
          }
 
-         pagingStore = server.getPagingManager().getPageStore(new SimpleString("jms.topic.topic1"));
+         pagingStore = server.getPagingManager().getPageStore(new SimpleString("topic1"));
          long timeout = System.currentTimeMillis() + 5000;
          while (timeout > System.currentTimeMillis() && pagingStore.isPaging()) {
             Thread.sleep(100);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java
index e394e94..a721aca 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java
@@ -128,8 +128,8 @@ public class JmsNettyNioStressTest extends ActiveMQTestBase {
       // create the 2 queues used in the test
       ClientSessionFactory sf = locator.createSessionFactory(transpConf);
       ClientSession session = sf.createTransactedSession();
-      session.createQueue("jms.queue.queue", "jms.queue.queue");
-      session.createQueue("jms.queue.queue2", "jms.queue.queue2");
+      session.createQueue("queue", "queue");
+      session.createQueue("queue2", "queue2");
       session.commit();
       sf.close();
       session.close();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
index a750312..a77c4d1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleProducersTest.java
@@ -25,7 +25,6 @@ import javax.jms.Queue;
 import javax.jms.Session;
 
 import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.api.core.management.ResourceNames;
 import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
 import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
 import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
@@ -43,11 +42,11 @@ public class MultipleProducersTest extends JMSTestBase {
    public Queue queueTwo = null;
    public Session session = null;
 
-   public SimpleString dlq = new SimpleString("jms.queue.DLQ");
-   public SimpleString expiryQueue = new SimpleString("jms.queue.ExpiryQueue");
+   public SimpleString dlq = new SimpleString("DLQ");
+   public SimpleString expiryQueue = new SimpleString("ExpiryQueue");
 
-   public SimpleString queueOneName = new SimpleString("jms.queue.queueOne");
-   public SimpleString queueTwoName = new SimpleString("jms.queue.queueTwo");
+   public SimpleString queueOneName = new SimpleString("queueOne");
+   public SimpleString queueTwoName = new SimpleString("queueTwo");
    public JMSQueueControl control = null;
    public long queueOneMsgCount = 0;
    public long queueTwoMsgCount = 0;
@@ -127,7 +126,7 @@ public class MultipleProducersTest extends JMSTestBase {
       // after draining queueOne send 5 message to queueOne
       queueTwoMsgCount = server.locateQueue(queueTwoName).getMessageCount();
 
-      control = (JMSQueueControl) server.getManagementService().getResource(ResourceNames.JMS_QUEUE + queueOne.getQueueName());
+      control = (JMSQueueControl) server.getManagementService().getResource(queueOne.getQueueName());
 
       control.removeMessages(null);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java
index f907945..e550bef 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/PendingDeliveriesTest.java
@@ -39,7 +39,7 @@ public class PendingDeliveriesTest extends ClientTestBase {
 
    @Before
    public void createQueue() throws Exception {
-      server.createQueue(SimpleString.toSimpleString("jms.queue.queue1"), SimpleString.toSimpleString("jms.queue.queue1"), null, true, false);
+      server.createQueue(SimpleString.toSimpleString("queue1"), SimpleString.toSimpleString("queue1"), null, true, false);
    }
 
    @After
@@ -110,7 +110,7 @@ public class PendingDeliveriesTest extends ClientTestBase {
    @Test
    public void testWithoutReconnect() throws Exception {
 
-      internalNoReconnect(AMQP_URI, "jms.queue.queue1");
+      internalNoReconnect(AMQP_URI, "queue1");
       internalNoReconnect(CORE_URI_NO_RECONNECT, "queue1");
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
index e976664..7b1f77e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
@@ -703,7 +703,7 @@ public class BridgeTest extends ActiveMQTestBase {
 
       final String testAddress = "testAddress";
       final String queueName0 = "queue0";
-      final String forwardAddress = "jms.queue.forwardAddress";
+      final String forwardAddress = "forwardAddress";
       final String queueName1 = "forwardAddress";
 
       Map<String, TransportConfiguration> connectors = new HashMap<>();
@@ -810,8 +810,8 @@ public class BridgeTest extends ActiveMQTestBase {
 
       final String testAddress = "testAddress";
       final String queueName0 = "queue0";
-      final String forwardAddress = "jms.queue.forwardAddress";
-      final String queueName1 = "forwardAddress";
+      final String forwardAddress = "forwardAddress";
+      final String queueName1 = "forwardQueue";
 
       Map<String, TransportConfiguration> connectors = new HashMap<>();
       TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
index 2623e9c..541eaca 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
@@ -523,10 +523,10 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
                                     final String address,
                                     final AddressInfo.RoutingType routingType,
                                     final int defaulMaxConsumers,
-                                    boolean defaultDeleteOnNoConsumers) {
+                                    boolean defaultDeleteOnNoConsumers) throws Exception {
       AddressInfo addressInfo = new AddressInfo(new SimpleString(address));
       addressInfo.setRoutingType(routingType);
-      addressInfo.setDefaultMaxConsumers(defaulMaxConsumers);
+      addressInfo.setDefaultMaxQueueConsumers(defaulMaxConsumers);
       addressInfo.setDefaultDeleteOnNoConsumers(defaultDeleteOnNoConsumers);
 
       servers[node].createOrUpdateAddressInfo(addressInfo);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
index e110cde..ca4554f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
@@ -1727,7 +1727,7 @@ public class SymmetricClusterTest extends ClusterTestBase {
     * on appropriate nodes in the cluster.  It also verifies that addresses not matching the simple string filter do not
     * result in bindings being created.
     */ public void testClusterAddressCreatesBindingsForSimpleStringAddressFilters() throws Exception {
-      setupCluster("jms", "jms", "jms", "jms", "jms");
+      setupCluster("test", "test", "test", "test", "test");
       startServers();
 
       setupSessionFactory(0, isNetty());
@@ -1736,11 +1736,11 @@ public class SymmetricClusterTest extends ClusterTestBase {
       setupSessionFactory(3, isNetty());
       setupSessionFactory(4, isNetty());
 
-      createQueue(0, "jms.queues.test.1", "queue0", null, false);
-      createQueue(1, "jms.queues.test.1", "queue0", null, false);
-      createQueue(2, "jms.queues.test.1", "queue0", null, false);
-      createQueue(3, "jms.queues.test.1", "queue0", null, false);
-      createQueue(4, "jms.queues.test.1", "queue0", null, false);
+      createQueue(0, "test.1", "queue0", null, false);
+      createQueue(1, "test.1", "queue0", null, false);
+      createQueue(2, "test.1", "queue0", null, false);
+      createQueue(3, "test.1", "queue0", null, false);
+      createQueue(4, "test.1", "queue0", null, false);
 
       createQueue(0, "foo.queues.test.1", "queue1", null, false);
       createQueue(1, "foo.queues.test.1", "queue1", null, false);
@@ -1748,11 +1748,11 @@ public class SymmetricClusterTest extends ClusterTestBase {
       createQueue(3, "foo.queues.test.1", "queue1", null, false);
       createQueue(4, "foo.queues.test.1", "queue1", null, false);
 
-      waitForBindings(0, "jms.queues.test.1", 4, 0, false);
-      waitForBindings(1, "jms.queues.test.1", 4, 0, false);
-      waitForBindings(2, "jms.queues.test.1", 4, 0, false);
-      waitForBindings(3, "jms.queues.test.1", 4, 0, false);
-      waitForBindings(4, "jms.queues.test.1", 4, 0, false);
+      waitForBindings(0, "test.1", 4, 0, false);
+      waitForBindings(1, "test.1", 4, 0, false);
+      waitForBindings(2, "test.1", 4, 0, false);
+      waitForBindings(3, "test.1", 4, 0, false);
+      waitForBindings(4, "test.1", 4, 0, false);
 
       waitForBindings(0, "foo.queues.test.1", 0, 0, false);
       waitForBindings(1, "foo.queues.test.1", 0, 0, false);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
index 15c4257..0f792b5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
@@ -281,7 +281,7 @@ public class AutomaticColocatedQuorumVoteTest extends ActiveMQTestBase {
                                           TransportConfiguration liveConnector,
                                           TransportConfiguration liveAcceptor,
                                           TransportConfiguration... otherLiveNodes) throws Exception {
-      Configuration configuration = createDefaultInVMConfig().clearAcceptorConfigurations().addAcceptorConfiguration(liveAcceptor).addConnectorConfiguration(liveConnector.getName(), liveConnector).setJournalDirectory(getJournalDir() + identity).setBindingsDirectory(getBindingsDir() + identity).setLargeMessagesDirectory(getLargeMessagesDir() + identity).setPagingDirectory(getPageDir() + identity).addQueueConfiguration(new CoreQueueConfiguration().setAddress("jms.queue.testQueue").setName("jms.queue.testQueue"));
+      Configuration configuration = createDefaultInVMConfig().clearAcceptorConfigurations().addAcceptorConfiguration(liveAcceptor).addConnectorConfiguration(liveConnector.getName(), liveConnector).setJournalDirectory(getJournalDir() + identity).setBindingsDirectory(getBindingsDir() + identity).setLargeMessagesDirectory(getLargeMessagesDir() + identity).setPagingDirectory(getPageDir() + identity).addQueueConfiguration(new CoreQueueConfiguration().setAddress("testQueue").setName("testQueue"));
 
       List<String> transportConfigurationList = new ArrayList<>();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
index cc1ebf6..bfbe5d5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
@@ -44,7 +44,9 @@ import org.junit.Before;
 public abstract class MultipleServerFailoverTestBase extends ActiveMQTestBase {
    // Constants -----------------------------------------------------
 
-   protected static final SimpleString ADDRESS = new SimpleString("jms.queues.FailoverTestAddress");
+   // TODO: find a better solution for this
+   // this is necessary because the cluster connection is using "jms" as its match; see org.apache.activemq.artemis.tests.util.ActiveMQTestBase.basicClusterConnectionConfig()
+   protected static final SimpleString ADDRESS = new SimpleString("jms.FailoverTestAddress");
 
    // Attributes ----------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SecurityFailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SecurityFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SecurityFailoverTest.java
index f6a8e5b..abfc093 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SecurityFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/SecurityFailoverTest.java
@@ -103,7 +103,7 @@ public class SecurityFailoverTest extends FailoverTest {
    protected ActiveMQJAASSecurityManager installSecurity(TestableServer server) {
       ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getServer().getSecurityManager();
       securityManager.getConfiguration().addUser("a", "b");
-      Role role = new Role("arole", true, true, true, true, true, true, true, true);
+      Role role = new Role("arole", true, true, true, true, true, true, true, true, true);
       Set<Role> roles = new HashSet<>();
       roles.add(role);
       server.getServer().getSecurityRepository().addMatch("#", roles);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/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 7af172e..0374aef 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
@@ -62,10 +62,10 @@ public class AMQPToOpenwireTest extends ActiveMQTestBase {
       server = createServer(true, true);
       serverManager = new JMSServerManagerImpl(server);
       Configuration serverConfig = server.getConfiguration();
-      serverConfig.getAddressesSettings().put("jms.queue.#", new AddressSettings().setAutoCreateJmsQueues(false).setDeadLetterAddress(new SimpleString("jms.queue.ActiveMQ.DLQ")));
+      serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateJmsQueues(false).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ")));
       serverConfig.setSecurityEnabled(false);
       serverManager.start();
-      coreQueue = new SimpleString("jms.queue." + queueName);
+      coreQueue = new SimpleString(queueName);
       this.server.createQueue(coreQueue, coreQueue, null, false, false);
       qpidfactory = new JmsConnectionFactory("amqp://localhost:61616");
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/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 b1ae9c9..fc98f13 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,10 +55,10 @@ public class OpenWireToAMQPTest extends ActiveMQTestBase {
       super.setUp();
       server = createServer(true, true);
       Configuration serverConfig = server.getConfiguration();
-      serverConfig.getAddressesSettings().put("jms.queue.#", new AddressSettings().setAutoCreateJmsQueues(false).setDeadLetterAddress(new SimpleString("jms.queue.ActiveMQ.DLQ")));
+      serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateJmsQueues(false).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ")));
       serverConfig.setSecurityEnabled(false);
       server.start();
-      coreQueue = new SimpleString("jms.queue." + queueName);
+      coreQueue = new SimpleString(queueName);
       this.server.createQueue(coreQueue, coreQueue, null, false, false);
       qpidfactory = new JmsConnectionFactory("amqp://localhost:61616");
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/ReplicationWithDivertTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/ReplicationWithDivertTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/ReplicationWithDivertTest.java
index a78e041..4037208 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/ReplicationWithDivertTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/ReplicationWithDivertTest.java
@@ -46,9 +46,9 @@ import org.junit.Test;
 public class ReplicationWithDivertTest extends ActiveMQTestBase {
 
    public static final String JMS_SOURCE_QUEUE = "Queue";
-   public static final String SOURCE_QUEUE = "jms.queue." + JMS_SOURCE_QUEUE;
+   public static final String SOURCE_QUEUE = JMS_SOURCE_QUEUE;
    public static final String JMS_TARGET_QUEUE = "DestQueue";
-   public static final String TARGET_QUEUE = "jms.queue." + JMS_TARGET_QUEUE;
+   public static final String TARGET_QUEUE = JMS_TARGET_QUEUE;
    public static int messageChunkCount = 0;
 
    private static ActiveMQServer backupServer;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java
index 5cc97f2..362c8a1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java
@@ -51,7 +51,6 @@ import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSen
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.server.ServerMessage;
 import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
@@ -65,7 +64,7 @@ public class InterceptorTest extends ActiveMQTestBase {
 
    private final SimpleString QUEUE = new SimpleString("InterceptorTestQueue");
 
-   private final SimpleString JMS_QUEUE = SimpleString.toSimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + QUEUE.toString());
+   private final SimpleString JMS_QUEUE = SimpleString.toSimpleString(QUEUE.toString());
 
    private ServerLocator locator;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
index 9b8edb8..37e55c0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ActiveMQConnectionFactoryTest.java
@@ -242,7 +242,7 @@ public class ActiveMQConnectionFactoryTest extends ActiveMQTestBase {
 
    private void testDeserializationOptions(boolean useJndi, boolean useBrowser) throws Exception {
       String qname = "SerialTestQueue";
-      SimpleString qaddr = new SimpleString("jms.queue." + qname);
+      SimpleString qaddr = new SimpleString(qname);
       liveService.createQueue(qaddr, qaddr, null, true, false);
 
       //default ok
@@ -315,7 +315,7 @@ public class ActiveMQConnectionFactoryTest extends ActiveMQTestBase {
       System.setProperty(ObjectInputStreamWithClassLoader.WHITELIST_PROPERTY, "some.other.package");
 
       String qname = "SerialTestQueue";
-      SimpleString qaddr = new SimpleString("jms.queue." + qname);
+      SimpleString qaddr = new SimpleString(qname);
       liveService.createQueue(qaddr, qaddr, null, true, false);
 
       try {
@@ -378,9 +378,8 @@ public class ActiveMQConnectionFactoryTest extends ActiveMQTestBase {
       } else {
          factory = new ActiveMQConnectionFactory("vm://0" + query);
       }
-      Connection connection = null;
-      try {
-         connection = factory.createConnection();
+
+      try (Connection connection = factory.createConnection()) {
          connection.start();
          Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
          Queue queue = session.createQueue(qname);
@@ -401,14 +400,6 @@ public class ActiveMQConnectionFactoryTest extends ActiveMQTestBase {
          return result;
       } catch (Exception e) {
          return e;
-      } finally {
-         if (connection != null) {
-            try {
-               connection.close();
-            } catch (JMSException e) {
-               return e;
-            }
-         }
       }
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
index 5b8376e..245ac89 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/JmsProducerTest.java
@@ -92,7 +92,6 @@ public class JmsProducerTest extends JMSTestBase {
 
    @Test
    public void multipleSendsUsingSetters() throws Exception {
-      jmsServer.createQueue(true, "q1", null, true, "/queues/q1");
       server.createQueue(SimpleString.toSimpleString("q1"), SimpleString.toSimpleString("q1"), null, true, false);
 
       Queue q1 = context.createQueue("q1");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/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 81cb3bf..590a997 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
@@ -62,8 +62,8 @@ public class RedeployTest extends ActiveMQTestBase {
 
       try {
          latch.await(10, TimeUnit.SECONDS);
-         Assert.assertEquals("jms.queue.DLQ", embeddedJMS.getActiveMQServer().getAddressSettingsRepository().getMatch("jms").getDeadLetterAddress().toString());
-         Assert.assertEquals("jms.queue.ExpiryQueue", embeddedJMS.getActiveMQServer().getAddressSettingsRepository().getMatch("jms").getExpiryAddress().toString());
+         Assert.assertEquals("DLQ", embeddedJMS.getActiveMQServer().getAddressSettingsRepository().getMatch("jms").getDeadLetterAddress().toString());
+         Assert.assertEquals("ExpiryQueue", embeddedJMS.getActiveMQServer().getAddressSettingsRepository().getMatch("jms").getExpiryAddress().toString());
          Assert.assertFalse(tryConsume());
          Files.copy(url2.openStream(), brokerXML, StandardCopyOption.REPLACE_EXISTING);
          brokerXML.toFile().setLastModified(System.currentTimeMillis() + 1000);
@@ -73,8 +73,8 @@ public class RedeployTest extends ActiveMQTestBase {
 
          Assert.assertTrue(tryConsume());
 
-         Assert.assertEquals("jms.queue.NewQueue", embeddedJMS.getActiveMQServer().getAddressSettingsRepository().getMatch("jms").getDeadLetterAddress().toString());
-         Assert.assertEquals("jms.queue.NewQueue", embeddedJMS.getActiveMQServer().getAddressSettingsRepository().getMatch("jms").getExpiryAddress().toString());
+         Assert.assertEquals("NewQueue", embeddedJMS.getActiveMQServer().getAddressSettingsRepository().getMatch("jms").getDeadLetterAddress().toString());
+         Assert.assertEquals("NewQueue", embeddedJMS.getActiveMQServer().getAddressSettingsRepository().getMatch("jms").getExpiryAddress().toString());
 
          ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory();
          try (Connection connection = factory.createConnection()) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java
index 6fadd51..9977d44 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java
@@ -22,7 +22,6 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.Topic;
 
-import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 import org.apache.activemq.artemis.tests.util.JMSTestBase;
 import org.junit.Test;
@@ -50,7 +49,7 @@ public class CreateQueueTest extends JMSTestBase {
 
       String tempQueueName = tempQueue.getQueueName();
 
-      assertFalse(tempQueueName.startsWith(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX));
+//      assertFalse(tempQueueName.startsWith(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX));
 
       Queue replyQueue = session.createQueue(tempQueueName);
 
@@ -76,7 +75,7 @@ public class CreateQueueTest extends JMSTestBase {
 
       log.info("queue name is " + queueName);
 
-      assertFalse(queueName.startsWith(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX));
+//      assertFalse(queueName.startsWith(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX));
 
       Queue replyQueue = session.createQueue(queueName);
 
@@ -101,7 +100,7 @@ public class CreateQueueTest extends JMSTestBase {
 
       String topicName = topic.getTopicName();
 
-      assertFalse(topicName.startsWith(ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX));
+//      assertFalse(topicName.startsWith(ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX));
 
       Topic replyTopic = session.createTopic(topicName);
 
@@ -125,7 +124,7 @@ public class CreateQueueTest extends JMSTestBase {
 
       String tempTopicName = tempTopic.getTopicName();
 
-      assertFalse(tempTopicName.startsWith(ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX));
+//      assertFalse(tempTopicName.startsWith(ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX));
 
       Topic replyTopic = session.createTopic(tempTopicName);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java
index ec279ee..bbbe6ed 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java
@@ -81,7 +81,7 @@ public class TopicCleanupTest extends JMSTestBase {
          for (int i = 0; i < 100; i++) {
             long txid = storage.generateID();
 
-            final Queue queue = new QueueImpl(storage.generateID(), SimpleString.toSimpleString("jms.topic.topic"), SimpleString.toSimpleString("jms.topic.topic"), FilterImpl.createFilter(ActiveMQServerImpl.GENERIC_IGNORED_FILTER), null, true, false, false, server.getScheduledPool(), server.getPostOffice(), storage, server.getAddressSettingsRepository(), server.getExecutorFactory().getExecutor());
+            final Queue queue = new QueueImpl(storage.generateID(), SimpleString.toSimpleString("topic"), SimpleString.toSimpleString("topic"), FilterImpl.createFilter(ActiveMQServerImpl.GENERIC_IGNORED_FILTER), null, true, false, false, server.getScheduledPool(), server.getPostOffice(), storage, server.getAddressSettingsRepository(), server.getExecutorFactory().getExecutor());
 
             LocalQueueBinding binding = new LocalQueueBinding(server.getAddressInfo(queue.getAddress()), queue, server.getNodeID());
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java
index 927d347..982c7d3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/BindingsClusterTest.java
@@ -48,6 +48,10 @@ import org.junit.runners.Parameterized;
 @RunWith(value = Parameterized.class)
 public class BindingsClusterTest extends JMSClusteredTestBase {
 
+   // TODO: find a solution to this
+   // the "jms." prefix is needed because the cluster connection is matching on this
+   public static final String TOPIC = "jms.t1";
+
    private final boolean crash;
 
    public BindingsClusterTest(boolean crash) {
@@ -89,9 +93,9 @@ public class BindingsClusterTest extends JMSClusteredTestBase {
 
       try {
 
-         Topic topic1 = createTopic("t1", true);
+         Topic topic1 = createTopic(TOPIC, true);
 
-         Topic topic2 = (Topic) context1.lookup("topic/t1");
+         Topic topic2 = (Topic) context1.lookup("topic/" + TOPIC);
 
          Session session1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -113,12 +117,12 @@ public class BindingsClusterTest extends JMSClusteredTestBase {
 
          prod1.send(session1.createTextMessage("m1"));
 
-         printBindings(jmsServer1.getActiveMQServer(), "jms.topic.t1");
-         printBindings(jmsServer2.getActiveMQServer(), "jms.topic.t1");
+         printBindings(jmsServer1.getActiveMQServer(), TOPIC);
+         printBindings(jmsServer2.getActiveMQServer(), TOPIC);
 
          crash();
 
-         printBindings(jmsServer1.getActiveMQServer(), "jms.topic.t1");
+         printBindings(jmsServer1.getActiveMQServer(), TOPIC);
 
          prod1.send(session1.createTextMessage("m2"));
 
@@ -126,8 +130,8 @@ public class BindingsClusterTest extends JMSClusteredTestBase {
 
          Thread.sleep(2000);
 
-         printBindings(jmsServer1.getActiveMQServer(), "jms.topic.t1");
-         printBindings(jmsServer2.getActiveMQServer(), "jms.topic.t1");
+         printBindings(jmsServer1.getActiveMQServer(), TOPIC);
+         printBindings(jmsServer2.getActiveMQServer(), TOPIC);
 
          prod1.send(session1.createTextMessage("m3"));
 
@@ -167,8 +171,8 @@ public class BindingsClusterTest extends JMSClusteredTestBase {
          conn2.close();
       }
 
-      jmsServer1.destroyTopic("t1");
-      jmsServer2.destroyTopic("t1");
+      jmsServer1.destroyTopic(TOPIC);
+      jmsServer2.destroyTopic(TOPIC);
    }
 
    @Test
@@ -187,9 +191,9 @@ public class BindingsClusterTest extends JMSClusteredTestBase {
 
       try {
 
-         Topic topic1 = createTopic("t1", true);
+         Topic topic1 = createTopic(TOPIC, true);
 
-         Topic topic2 = (Topic) context1.lookup("topic/t1");
+         Topic topic2 = (Topic) context1.lookup("topic/" + TOPIC);
 
          Session session1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -213,12 +217,12 @@ public class BindingsClusterTest extends JMSClusteredTestBase {
 
          prod1.send(session1.createTextMessage("m1"));
 
-         printBindings(jmsServer1.getActiveMQServer(), "jms.topic.t1");
-         printBindings(jmsServer2.getActiveMQServer(), "jms.topic.t1");
+         printBindings(jmsServer1.getActiveMQServer(), TOPIC);
+         printBindings(jmsServer2.getActiveMQServer(), TOPIC);
 
          crash();
 
-         printBindings(jmsServer1.getActiveMQServer(), "jms.topic.t1");
+         printBindings(jmsServer1.getActiveMQServer(), TOPIC);
 
          //send a few messages while the binding is disconnected
          prod1.send(session1.createTextMessage("m2"));
@@ -229,8 +233,8 @@ public class BindingsClusterTest extends JMSClusteredTestBase {
 
          Thread.sleep(2000);
 
-         printBindings(jmsServer1.getActiveMQServer(), "jms.topic.t1");
-         printBindings(jmsServer2.getActiveMQServer(), "jms.topic.t1");
+         printBindings(jmsServer1.getActiveMQServer(), TOPIC);
+         printBindings(jmsServer2.getActiveMQServer(), TOPIC);
 
          prod1.send(session1.createTextMessage("m5"));
          prod1.send(session1.createTextMessage("m6"));
@@ -287,8 +291,8 @@ public class BindingsClusterTest extends JMSClusteredTestBase {
          conn2.close();
       }
 
-      jmsServer1.destroyTopic("t1");
-      jmsServer2.destroyTopic("t1");
+      jmsServer1.destroyTopic(TOPIC);
+      jmsServer2.destroyTopic(TOPIC);
    }
 
    @Test
@@ -307,9 +311,9 @@ public class BindingsClusterTest extends JMSClusteredTestBase {
 
       try {
 
-         Topic topic1 = createTopic("t1", true);
+         Topic topic1 = createTopic(TOPIC, true);
 
-         Topic topic2 = (Topic) context1.lookup("topic/t1");
+         Topic topic2 = (Topic) context1.lookup("topic/" + TOPIC);
 
          Session session1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -328,15 +332,15 @@ public class BindingsClusterTest extends JMSClusteredTestBase {
          prod1.send(session1.createTextMessage("m1"));
          prod1.send(session1.createTextMessage("m2"));
 
-         printBindings(jmsServer1.getActiveMQServer(), "jms.topic.t1");
-         printBindings(jmsServer2.getActiveMQServer(), "jms.topic.t1");
+         printBindings(jmsServer1.getActiveMQServer(), TOPIC);
+         printBindings(jmsServer2.getActiveMQServer(), TOPIC);
 
          crash();
 
          //this may or may not be closed, if the server was crashed then it would have been closed on failure.
          cons2.close();
 
-         printBindings(jmsServer1.getActiveMQServer(), "jms.topic.t1");
+         printBindings(jmsServer1.getActiveMQServer(), TOPIC);
 
          //send a few messages while the binding is disconnected
          prod1.send(session1.createTextMessage("m3"));
@@ -347,8 +351,8 @@ public class BindingsClusterTest extends JMSClusteredTestBase {
 
          Thread.sleep(2000);
 
-         printBindings(jmsServer1.getActiveMQServer(), "jms.topic.t1");
-         printBindings(jmsServer2.getActiveMQServer(), "jms.topic.t1");
+         printBindings(jmsServer1.getActiveMQServer(), TOPIC);
+         printBindings(jmsServer2.getActiveMQServer(), TOPIC);
 
          prod1.send(session1.createTextMessage("m6"));
          prod1.send(session1.createTextMessage("m7"));
@@ -395,8 +399,8 @@ public class BindingsClusterTest extends JMSClusteredTestBase {
          conn2.close();
       }
 
-      jmsServer1.destroyTopic("t1");
-      jmsServer2.destroyTopic("t1");
+      jmsServer1.destroyTopic(TOPIC);
+      jmsServer2.destroyTopic(TOPIC);
    }
 
    private void crash() throws Exception {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java
index 5f90a6e..538260e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java
@@ -46,7 +46,6 @@ import org.apache.activemq.artemis.core.server.NodeManager;
 import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
 import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
 import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 import org.apache.activemq.artemis.jms.client.ActiveMQSession;
 import org.apache.activemq.artemis.jms.server.JMSServerManager;
 import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
@@ -132,7 +131,7 @@ public class JMSFailoverListenerTest extends ActiveMQTestBase {
 
       ClientSession coreSession = ((ActiveMQSession) sess).getCoreSession();
 
-      SimpleString jmsQueueName = new SimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + "myqueue");
+      SimpleString jmsQueueName = new SimpleString("myqueue");
 
       coreSession.createQueue(jmsQueueName, jmsQueueName, null, true);
 
@@ -205,7 +204,7 @@ public class JMSFailoverListenerTest extends ActiveMQTestBase {
 
       ClientSession coreSessionLive = ((ActiveMQSession) sessLive).getCoreSession();
 
-      SimpleString jmsQueueName = new SimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + "myqueue");
+      SimpleString jmsQueueName = new SimpleString("myqueue");
 
       coreSessionLive.createQueue(jmsQueueName, jmsQueueName, null, true);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
index 802d84b..6e960f2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
@@ -53,7 +53,6 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.server.NodeManager;
 import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
 import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 import org.apache.activemq.artemis.jms.client.ActiveMQSession;
 import org.apache.activemq.artemis.jms.server.JMSServerManager;
 import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
@@ -197,7 +196,7 @@ public class JMSFailoverTest extends ActiveMQTestBase {
 
       ClientSession coreSession = ((ActiveMQSession) sess).getCoreSession();
 
-      SimpleString jmsQueueName = new SimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + "myqueue");
+      SimpleString jmsQueueName = new SimpleString("myqueue");
 
       coreSession.createQueue(jmsQueueName, jmsQueueName, null, true);
 
@@ -270,7 +269,7 @@ public class JMSFailoverTest extends ActiveMQTestBase {
 
       RemotingConnection coreConnLive = ((ClientSessionInternal) coreSessionLive).getConnection();
 
-      SimpleString jmsQueueName = new SimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + "myqueue");
+      SimpleString jmsQueueName = new SimpleString("myqueue");
 
       coreSessionLive.createQueue(jmsQueueName, jmsQueueName, null, true);
 
@@ -319,7 +318,7 @@ public class JMSFailoverTest extends ActiveMQTestBase {
 
    @Test
    public void testSendReceiveLargeMessages() throws Exception {
-      SimpleString QUEUE = new SimpleString("jms.queue.somequeue");
+      SimpleString QUEUE = new SimpleString("somequeue");
 
       ActiveMQConnectionFactory jbcf = ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, livetc, backuptc);
       jbcf.setReconnectAttempts(-1);


Mime
View raw message