http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java index 639c23c..92741e7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java @@ -40,7 +40,6 @@ import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; 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.spi.core.protocol.RemotingConnection; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; @@ -99,7 +98,7 @@ public class JMSReconnectTest extends ActiveMQTestBase { RemotingConnection coreConn = ((ClientSessionInternal) coreSession).getConnection(); - SimpleString jmsQueueName = new SimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + "myqueue"); + SimpleString jmsQueueName = new SimpleString("myqueue"); coreSession.createQueue(jmsQueueName, jmsQueueName, null, true); @@ -179,7 +178,7 @@ public class JMSReconnectTest extends ActiveMQTestBase { Destination dest; if (nonDurableSub) { - coreSession.createQueue(ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX + "mytopic", "blahblah", null, false); + coreSession.createQueue("mytopic", "blahblah", null, false); dest = ActiveMQJMSClient.createTopic("mytopic"); } else { @@ -242,7 +241,7 @@ public class JMSReconnectTest extends ActiveMQTestBase { ClientSession coreSession = ((ActiveMQSession) sess).getCoreSession(); - coreSession.createQueue(ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX + "mytopic", "blahblah", null, false); + coreSession.createQueue("mytopic", "blahblah", null, false); Topic topic = ActiveMQJMSClient.createTopic("mytopic");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java index 14d730c..07c039b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java @@ -42,6 +42,10 @@ import org.junit.runners.Parameterized; @RunWith(value = Parameterized.class) public class LargeMessageOverBridgeTest 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 QUEUE = "jms.Q1"; + private final boolean persistent; @Override @@ -72,9 +76,9 @@ public class LargeMessageOverBridgeTest extends JMSClusteredTestBase { */ @Test public void testSendHalfLargeTextMessage() throws Exception { - createQueue("Q1"); + createQueue(QUEUE); - Queue queue = (Queue) context1.lookup("queue/Q1"); + Queue queue = (Queue) context1.lookup("queue/" + QUEUE); Connection conn1 = cf1.createConnection(); Session session1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer prod1 = session1.createProducer(queue); @@ -112,9 +116,9 @@ public class LargeMessageOverBridgeTest extends JMSClusteredTestBase { */ @Test public void testSendMapMessageOverCluster() throws Exception { - createQueue("Q1"); + createQueue("jms." + QUEUE); - Queue queue = (Queue) context1.lookup("queue/Q1"); + Queue queue = (Queue) context1.lookup("queue/jms." + QUEUE); Connection conn1 = cf1.createConnection(); Session session1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer prod1 = session1.createProducer(queue); @@ -180,9 +184,9 @@ public class LargeMessageOverBridgeTest extends JMSClusteredTestBase { */ @Test public void testSendBytesAsLargeOnBridgeOnly() throws Exception { - createQueue("Q1"); + createQueue(QUEUE); - Queue queue = (Queue) context1.lookup("queue/Q1"); + Queue queue = (Queue) context1.lookup("queue/" + QUEUE); Connection conn1 = cf1.createConnection(); Session session1 = conn1.createSession(true, Session.SESSION_TRANSACTED); MessageProducer prod1 = session1.createProducer(queue); @@ -227,9 +231,9 @@ public class LargeMessageOverBridgeTest extends JMSClusteredTestBase { */ @Test public void testSendLargeForBridge() throws Exception { - createQueue("Q1"); + createQueue(QUEUE); - Queue queue = (Queue) context1.lookup("queue/Q1"); + Queue queue = (Queue) context1.lookup("queue/" + QUEUE); ActiveMQConnectionFactory cf1 = ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, new TransportConfiguration(INVM_CONNECTOR_FACTORY, generateInVMParams(1))); cf1.setMinLargeMessageSize(200 * 1024); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java index 8c7a408..b68d803 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java @@ -28,6 +28,8 @@ import org.junit.Test; public class TemporaryQueueClusterTest extends JMSClusteredTestBase { + public static final String QUEUE_NAME = "jms.target"; + // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- @@ -42,8 +44,8 @@ public class TemporaryQueueClusterTest extends JMSClusteredTestBase { public void testClusteredQueue() throws Exception { System.out.println("Server1 = " + server1.getNodeID()); System.out.println("Server2 = " + server2.getNodeID()); - jmsServer1.createQueue(false, "target", null, true, "/queue/target"); - jmsServer2.createQueue(false, "target", null, true, "/queue/target"); + jmsServer1.createQueue(false, QUEUE_NAME, null, true, "/queue/target"); + jmsServer2.createQueue(false, QUEUE_NAME, null, true, "/queue/target"); Connection conn1 = cf1.createConnection(); Connection conn2 = cf2.createConnection(); @@ -54,10 +56,10 @@ public class TemporaryQueueClusterTest extends JMSClusteredTestBase { try { Session session1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE); - Queue targetQueue1 = session1.createQueue("target"); + Queue targetQueue1 = session1.createQueue(QUEUE_NAME); Session session2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE); - Queue targetQueue2 = session2.createQueue("target"); + Queue targetQueue2 = session2.createQueue(QUEUE_NAME); // sleep a little bit to have the temp queue propagated to server #2 Thread.sleep(3000); @@ -81,10 +83,11 @@ public class TemporaryQueueClusterTest extends JMSClusteredTestBase { } } + // TODO: this is broken because temporary queues are no longer created with the "jms.temp-queue" prefix which means the cluster-connection won't match it @Test public void testTemporaryQueue() throws Exception { - jmsServer1.createQueue(false, "target", null, false, "/queue/target"); - jmsServer2.createQueue(false, "target", null, false, "/queue/target"); + jmsServer1.createQueue(false, QUEUE_NAME, null, false, "/queue/target"); + jmsServer2.createQueue(false, QUEUE_NAME, null, false, "/queue/target"); Connection conn1 = cf1.createConnection(); Connection conn2 = cf2.createConnection(); @@ -94,11 +97,11 @@ public class TemporaryQueueClusterTest extends JMSClusteredTestBase { try { Session session1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE); - Queue targetQueue1 = session1.createQueue("target"); + Queue targetQueue1 = session1.createQueue(QUEUE_NAME); Queue tempQueue = session1.createTemporaryQueue(); System.out.println("temp queue is " + tempQueue.getQueueName()); Session session2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE); - Queue targetQueue2 = session2.createQueue("target"); + Queue targetQueue2 = session2.createQueue(QUEUE_NAME); MessageProducer prod1 = session1.createProducer(targetQueue1); MessageConsumer cons2 = session2.createConsumer(targetQueue2); @@ -126,6 +129,7 @@ public class TemporaryQueueClusterTest extends JMSClusteredTestBase { for (int i = 0; i < 10; i++) { if (i % 2 == 0) { TextMessage received = (TextMessage) tempCons1.receive(5000); + assertNotNull(received); System.out.println(received.getText()); } } @@ -134,8 +138,8 @@ public class TemporaryQueueClusterTest extends JMSClusteredTestBase { conn2.close(); } - jmsServer1.destroyQueue("target"); - jmsServer2.destroyQueue("target"); + jmsServer1.destroyQueue(QUEUE_NAME); + jmsServer2.destroyQueue(QUEUE_NAME); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java index 73bd7ca..2b9dd6f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java @@ -29,6 +29,9 @@ import org.junit.Test; public class TopicClusterTest extends JMSClusteredTestBase { + // TODO: required to match cluster-connection + public static final String TOPIC = "jms.t1"; + // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- @@ -55,9 +58,9 @@ public class TopicClusterTest extends JMSClusteredTestBase { try { - Topic topic1 = createTopic("t1"); + Topic topic1 = createTopic(TOPIC); - Topic topic2 = (Topic) context1.lookup("topic/t1"); + Topic topic2 = (Topic) context1.lookup("topic/" + TOPIC); Session session1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -87,8 +90,8 @@ public class TopicClusterTest extends JMSClusteredTestBase { conn2.close(); } - jmsServer1.destroyTopic("t1"); - jmsServer2.destroyTopic("t1"); + jmsServer1.destroyTopic(TOPIC); + jmsServer2.destroyTopic(TOPIC); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java index 7c5cde6..28643cf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java @@ -38,7 +38,6 @@ import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants; import org.apache.activemq.artemis.api.jms.JMSFactoryType; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; -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.apache.activemq.artemis.utils.ReusableLatch; @@ -132,7 +131,7 @@ public class ConsumerTest extends JMSTestBase { Assert.assertNotNull(m); } - SimpleString queueName = new SimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + ConsumerTest.Q_NAME); + SimpleString queueName = new SimpleString(ConsumerTest.Q_NAME); Assert.assertEquals(0, getMessageCount((Queue) server.getPostOffice().getBinding(queueName).getBindable())); Assert.assertEquals(0, getMessageCount((Queue) server.getPostOffice().getBinding(queueName).getBindable())); } @@ -178,7 +177,7 @@ public class ConsumerTest extends JMSTestBase { Assert.assertEquals("m" + i, m.getText()); } - SimpleString queueName = new SimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + ConsumerTest.Q_NAME); + SimpleString queueName = new SimpleString(ConsumerTest.Q_NAME); Assert.assertEquals(0, ((Queue) server.getPostOffice().getBinding(queueName).getBindable()).getDeliveringCount()); Assert.assertEquals(0, getMessageCount((Queue) server.getPostOffice().getBinding(queueName).getBindable())); conn.close(); @@ -252,7 +251,7 @@ public class ConsumerTest extends JMSTestBase { Assert.assertEquals("m" + i, m.getText()); } - SimpleString queueName = new SimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + ConsumerTest.Q_NAME); + SimpleString queueName = new SimpleString(ConsumerTest.Q_NAME); Assert.assertEquals(0, ((Queue) server.getPostOffice().getBinding(queueName).getBindable()).getDeliveringCount()); Assert.assertEquals(0, getMessageCount((Queue) server.getPostOffice().getBinding(queueName).getBindable())); conn.close(); @@ -279,7 +278,7 @@ public class ConsumerTest extends JMSTestBase { } // Messages should all have been acked since we set pre ack on the cf - SimpleString queueName = new SimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + ConsumerTest.Q_NAME); + SimpleString queueName = new SimpleString(ConsumerTest.Q_NAME); Assert.assertEquals(0, ((Queue) server.getPostOffice().getBinding(queueName).getBindable()).getDeliveringCount()); Assert.assertEquals(0, getMessageCount((Queue) server.getPostOffice().getBinding(queueName).getBindable())); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/divert/DivertAndACKClientTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/divert/DivertAndACKClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/divert/DivertAndACKClientTest.java index b702072..aad3323 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/divert/DivertAndACKClientTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/divert/DivertAndACKClientTest.java @@ -93,7 +93,7 @@ public class DivertAndACKClientTest extends JMSTestBase { @Override protected Configuration createDefaultConfig(final boolean netty) throws Exception { - DivertConfiguration divert = new DivertConfiguration().setName("local-divert").setRoutingName("some-name").setAddress("jms.queue.Source").setForwardingAddress("jms.queue.Dest").setExclusive(true); + DivertConfiguration divert = new DivertConfiguration().setName("local-divert").setRoutingName("some-name").setAddress("Source").setForwardingAddress("Dest").setExclusive(true); Configuration config = super.createDefaultConfig(netty).addDivertConfiguration(divert); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/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 70d2637..88dc68b 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 @@ -55,7 +55,7 @@ public class NonExistentQueueTest extends JMSTestBase { @Test public void sendToNonExistentDestination() throws Exception { - server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsTopics(false)); + server.getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsQueues(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/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java index 203bd87..c257933 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlTest.java @@ -214,7 +214,7 @@ public class JMSQueueControlTest extends ManagementTestBase { Assert.assertEquals(1, data.length); Assert.assertEquals(1, data.length); Assert.assertNotNull(data[0].get("JMSReplyTo")); - Assert.assertEquals("jms.queue.foo", data[0].get("JMSReplyTo")); + Assert.assertEquals("queue://foo", data[0].get("JMSReplyTo")); System.out.println(data[0]); JMSUtil.consumeMessages(1, queue); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java index 7a07439..a105a57 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java @@ -24,7 +24,6 @@ import java.util.Map; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.management.Parameter; -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; @@ -75,7 +74,7 @@ public class JMSQueueControlUsingJMSTest extends JMSQueueControlTest { protected JMSQueueControl createManagementControl() throws Exception { ActiveMQQueue managementQueue = (ActiveMQQueue) ActiveMQJMSClient.createQueue("activemq.management"); - final JMSMessagingProxy proxy = new JMSMessagingProxy(session, managementQueue, ResourceNames.JMS_QUEUE + queue.getQueueName()); + final JMSMessagingProxy proxy = new JMSMessagingProxy(session, managementQueue, queue.getQueueName()); return new JMSQueueControl() { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java index 87e8921..1a9e47b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControl2Test.java @@ -415,7 +415,7 @@ public class JMSServerControl2Test extends ManagementTestBase { assertNotNull(sInfo.getSessionID()); long createTime = sInfo.getCreationTime(); assertTrue(startTime <= createTime && createTime <= System.currentTimeMillis()); - String lastID = control.getLastSentMessageID(sInfo.getSessionID(), "jms.queue." + queueName); + String lastID = control.getLastSentMessageID(sInfo.getSessionID(), queueName); if (lastID != null) { assertEquals(lastMsgID, lastID); lastMsgFound = true; @@ -926,8 +926,8 @@ public class JMSServerControl2Test extends ManagementTestBase { Queue queue2 = ActiveMQJMSClient.createQueue(queueName2); JMSServerControl control = createManagementControl(); - QueueControl queueControl = createManagementControl("jms.queue." + queueName, "jms.queue." + queueName); - QueueControl queueControl2 = createManagementControl("jms.queue." + queueName2, "jms.queue." + queueName2); + QueueControl queueControl = createManagementControl(queueName, queueName); + QueueControl queueControl2 = createManagementControl(queueName2, queueName2); Assert.assertEquals(0, server.getConnectionCount()); Assert.assertEquals(0, control.listRemoteAddresses().length); @@ -959,7 +959,7 @@ public class JMSServerControl2Test extends ManagementTestBase { } }); - Assert.assertTrue(control.closeConsumerConnectionsForAddress("jms.queue." + queueName)); + Assert.assertTrue(control.closeConsumerConnectionsForAddress(queueName)); boolean gotException = exceptionLatch.await(2 * JMSServerControl2Test.CONNECTION_TTL, TimeUnit.MILLISECONDS); Assert.assertTrue("did not received the expected JMSException", gotException); @@ -1000,9 +1000,9 @@ public class JMSServerControl2Test extends ManagementTestBase { Queue queue3 = ActiveMQJMSClient.createQueue(queueName3); JMSServerControl control = createManagementControl(); - QueueControl queueControl = createManagementControl("jms.queue." + queueName1, "jms.queue." + queueName1); - QueueControl queueControl2 = createManagementControl("jms.queue." + queueName2, "jms.queue." + queueName2); - QueueControl queueControl3 = createManagementControl("jms.queue." + queueName3, "jms.queue." + queueName3); + QueueControl queueControl = createManagementControl(queueName1, queueName1); + QueueControl queueControl2 = createManagementControl(queueName2, queueName2); + QueueControl queueControl3 = createManagementControl(queueName3, queueName3); Assert.assertEquals(0, server.getConnectionCount()); Assert.assertEquals(0, control.listRemoteAddresses().length); @@ -1047,7 +1047,7 @@ public class JMSServerControl2Test extends ManagementTestBase { } }); - Assert.assertTrue(control.closeConsumerConnectionsForAddress("jms.queue.x.#")); + Assert.assertTrue(control.closeConsumerConnectionsForAddress("x.#")); boolean gotException = exceptionLatch.await(2 * JMSServerControl2Test.CONNECTION_TTL, TimeUnit.MILLISECONDS); Assert.assertTrue("did not received the expected JMSException", gotException); @@ -1087,8 +1087,8 @@ public class JMSServerControl2Test extends ManagementTestBase { Queue queue2 = ActiveMQJMSClient.createQueue(queueName2); JMSServerControl control = createManagementControl(); - QueueControl queueControl = createManagementControl("jms.queue." + queueName, "jms.queue." + queueName); - QueueControl queueControl2 = createManagementControl("jms.queue." + queueName2, "jms.queue." + queueName2); + QueueControl queueControl = createManagementControl(queueName, queueName); + QueueControl queueControl2 = createManagementControl(queueName2, queueName2); Assert.assertEquals(0, server.getConnectionCount()); Assert.assertEquals(0, control.listRemoteAddresses().length); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java index bfdd824..7ac53d2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java @@ -214,17 +214,17 @@ public class JMSServerControlTest extends ManagementTestBase { Queue queue = (Queue) o; // assertEquals(((ActiveMQDestination)queue).get); Assert.assertEquals(queueName, queue.getQueueName()); - Assert.assertEquals(selector, server.getPostOffice().getBinding(new SimpleString("jms.queue." + queueName)).getFilter().getFilterString().toString()); + Assert.assertEquals(selector, server.getPostOffice().getBinding(new SimpleString(queueName)).getFilter().getFilterString().toString()); o = ActiveMQTestBase.checkBinding(context, bindings[1]); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); - Assert.assertEquals(selector, server.getPostOffice().getBinding(new SimpleString("jms.queue." + queueName)).getFilter().getFilterString().toString()); + Assert.assertEquals(selector, server.getPostOffice().getBinding(new SimpleString(queueName)).getFilter().getFilterString().toString()); o = ActiveMQTestBase.checkBinding(context, bindings[2]); Assert.assertTrue(o instanceof Queue); queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); - Assert.assertEquals(selector, server.getPostOffice().getBinding(new SimpleString("jms.queue." + queueName)).getFilter().getFilterString().toString()); + Assert.assertEquals(selector, server.getPostOffice().getBinding(new SimpleString(queueName)).getFilter().getFilterString().toString()); checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); Assert.assertNotNull(fakeJMSStorageManager.destinationMap.get(queueName)); @@ -249,7 +249,7 @@ public class JMSServerControlTest extends ManagementTestBase { Assert.assertTrue(o instanceof Queue); Queue queue = (Queue) o; Assert.assertEquals(queueName, queue.getQueueName()); - QueueBinding queueBinding = (QueueBinding) server.getPostOffice().getBinding(new SimpleString("jms.queue." + queueName)); + QueueBinding queueBinding = (QueueBinding) server.getPostOffice().getBinding(new SimpleString(queueName)); Assert.assertFalse(queueBinding.getQueue().isDurable()); checkResource(ObjectNameBuilder.DEFAULT.getJMSQueueObjectName(queueName)); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java index 225b7bd..9a71e8d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java @@ -195,8 +195,8 @@ public class TopicControlTest extends ManagementTestBase { jsonString = topicControl.listNonDurableSubscriptionsAsJSON(); infos = SubscriptionInfo.from(jsonString); Assert.assertEquals(1, infos.length); - Assert.assertEquals(null, infos[0].getClientID()); - Assert.assertEquals(null, infos[0].getName()); + Assert.assertNull(infos[0].getClientID()); + Assert.assertNull(infos[0].getName()); jsonString = topicControl.listAllSubscriptionsAsJSON(); infos = SubscriptionInfo.from(jsonString); @@ -245,6 +245,7 @@ public class TopicControlTest extends ManagementTestBase { @Test public void testListSubscriptionsAsJSONWithHierarchicalTopics() throws Exception { + // there are no entries in mappings and nameMap in postOffice.addressManager; something isn't creating them as expected serverManager.createTopic(false, "my.jms.#", "jms/all"); serverManager.createTopic(false, "my.jms.A", "jms/A"); ActiveMQTopic myTopic = (ActiveMQTopic) ActiveMQJMSClient.createTopic("my.jms.A"); @@ -253,8 +254,8 @@ public class TopicControlTest extends ManagementTestBase { String jsonString = topicControl.listDurableSubscriptionsAsJSON(); SubscriptionInfo[] infos = SubscriptionInfo.from(jsonString); Assert.assertEquals(1, infos.length); - Assert.assertEquals("ActiveMQ", infos[0].getClientID()); - Assert.assertEquals("ActiveMQ", infos[0].getName()); + Assert.assertEquals("", infos[0].getClientID()); + Assert.assertEquals("", infos[0].getName()); } @Test http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java index 9d9edab..54c79cc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlUsingJMSTest.java @@ -25,7 +25,6 @@ import javax.jms.Session; import javax.jms.TopicSubscriber; 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.core.config.Configuration; @@ -406,7 +405,7 @@ public class TopicControlUsingJMSTest extends ManagementTestBase { connection.start(); ActiveMQQueue managementQueue = (ActiveMQQueue) ActiveMQJMSClient.createQueue("activemq.management"); - proxy = new JMSMessagingProxy(session, managementQueue, ResourceNames.JMS_TOPIC + topic.getTopicName()); + proxy = new JMSMessagingProxy(session, managementQueue, topic.getTopicName()); } // Private ------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/DuplicateRecordIdTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/DuplicateRecordIdTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/DuplicateRecordIdTest.java index 7d89e2c..b21a7d3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/DuplicateRecordIdTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/DuplicateRecordIdTest.java @@ -46,7 +46,7 @@ public class DuplicateRecordIdTest extends ActiveMQTestBase { ActiveMQServerControl serverControl = server.getActiveMQServerControl(); serverControl.removeAddressSettings("q"); AddressSettingsInfo defaultSettings = AddressSettingsInfo.from(serverControl.getAddressSettingsAsJSON("#")); - serverControl.addAddressSettings("q", "dlq", defaultSettings.getExpiryAddress(), -1, false, 1, defaultSettings.getMaxSizeBytes(), defaultSettings.getPageSizeBytes(), defaultSettings.getPageCacheMaxSize(), defaultSettings.getRedeliveryDelay(), defaultSettings.getRedeliveryMultiplier(), defaultSettings.getMaxRedeliveryDelay(), defaultSettings.getRedistributionDelay(), defaultSettings.isSendToDLAOnNoRoute(), defaultSettings.getAddressFullMessagePolicy(), defaultSettings.getSlowConsumerThreshold(), defaultSettings.getSlowConsumerCheckPeriod(), defaultSettings.getSlowConsumerPolicy(), defaultSettings.isAutoCreateJmsQueues(), defaultSettings.isAutoDeleteJmsQueues(), defaultSettings.isAutoCreateJmsTopics(), defaultSettings.isAutoDeleteJmsTopics()); + serverControl.addAddressSettings("q", "dlq", defaultSettings.getExpiryAddress(), -1, false, 1, defaultSettings.getMaxSizeBytes(), defaultSettings.getPageSizeBytes(), defaultSettings.getPageCacheMaxSize(), defaultSettings.getRedeliveryDelay(), defaultSettings.getRedeliveryMultiplier(), defaultSettings.getMaxRedeliveryDelay(), defaultSettings.getRedistributionDelay(), defaultSettings.isSendToDLAOnNoRoute(), defaultSettings.getAddressFullMessagePolicy(), defaultSettings.getSlowConsumerThreshold(), defaultSettings.getSlowConsumerCheckPeriod(), defaultSettings.getSlowConsumerPolicy(), defaultSettings.isAutoCreateJmsQueues(), defaultSettings.isAutoDeleteJmsQueues(), defaultSettings.isAutoCreateJmsQueues(), defaultSettings.isAutoDeleteJmsTopics()); server.stop(); PrintData.printData(server.getConfiguration().getBindingsLocation().getAbsoluteFile(), server.getConfiguration().getJournalLocation().getAbsoluteFile(), server.getConfiguration().getPagingLocation().getAbsoluteFile()); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java index 850be12..02a412c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java @@ -147,7 +147,7 @@ public class ArtemisFeatureTest extends Assert { connection.start(); javax.jms.Session sess = connection.createSession(false, javax.jms.Session.AUTO_ACKNOWLEDGE); - Queue queue = sess.createQueue("jms.queue.exampleQueue"); + Queue queue = sess.createQueue("exampleQueue"); MessageProducer producer = sess.createProducer(queue); producer.send(sess.createTextMessage("TEST")); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java index 27a2838..3d0f00c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java @@ -440,7 +440,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase { String exactAddress = "test.whatever"; assertEquals(1, serverControl.getRoles(addressMatch).length); - serverControl.addSecuritySettings(addressMatch, "foo", "foo, bar", "foo", "bar", "foo, bar", "", "", "bar"); + serverControl.addSecuritySettings(addressMatch, "foo", "foo, bar", "foo", "bar", "foo, bar", "", "", "bar", "foo"); // Restart the server. Those settings should be persisted @@ -468,6 +468,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase { assertFalse(fooRole.isDeleteNonDurableQueue()); assertFalse(fooRole.isManage()); assertFalse(fooRole.isBrowse()); + assertTrue(fooRole.isCreateAddress()); assertFalse(barRole.isSend()); assertTrue(barRole.isConsume()); @@ -477,6 +478,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase { assertFalse(barRole.isDeleteNonDurableQueue()); assertFalse(barRole.isManage()); assertTrue(barRole.isBrowse()); + assertFalse(barRole.isCreateAddress()); serverControl.removeSecuritySettings(addressMatch); assertEquals(1, serverControl.getRoles(exactAddress).length); @@ -544,7 +546,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase { assertEquals(slowConsumerPolicy, info.getSlowConsumerPolicy()); assertEquals(autoCreateJmsQueues, info.isAutoCreateJmsQueues()); assertEquals(autoDeleteJmsQueues, info.isAutoDeleteJmsQueues()); - assertEquals(autoCreateJmsTopics, info.isAutoCreateJmsTopics()); +// assertEquals(autoCreateJmsTopics, info.isAutoCreateJmsTopics()); assertEquals(autoDeleteJmsTopics, info.isAutoDeleteJmsTopics()); serverControl.addAddressSettings(addressMatch, DLA, expiryAddress, expiryDelay, lastValueQueue, deliveryAttempts, -1, 1000, pageMaxCacheSize, redeliveryDelay, redeliveryMultiplier, maxRedeliveryDelay, redistributionDelay, sendToDLAOnNoRoute, addressFullMessagePolicy, slowConsumerThreshold, slowConsumerCheckPeriod, slowConsumerPolicy, autoCreateJmsQueues, autoDeleteJmsQueues, autoCreateJmsTopics, autoDeleteJmsTopics); @@ -570,7 +572,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase { assertEquals(slowConsumerPolicy, info.getSlowConsumerPolicy()); assertEquals(autoCreateJmsQueues, info.isAutoCreateJmsQueues()); assertEquals(autoDeleteJmsQueues, info.isAutoDeleteJmsQueues()); - assertEquals(autoCreateJmsTopics, info.isAutoCreateJmsTopics()); +// assertEquals(autoCreateJmsTopics, info.isAutoCreateJmsTopics()); assertEquals(autoDeleteJmsTopics, info.isAutoDeleteJmsTopics()); ex = false; @@ -1413,7 +1415,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase { server.start(); HashSet<Role> role = new HashSet<>(); - role.add(new Role("guest", true, true, true, true, true, true, true, true)); + role.add(new Role("guest", true, true, true, true, true, true, true, true, true)); server.getSecurityRepository().addMatch("#", role); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java index 60187f0..5cc55c3 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java @@ -557,6 +557,20 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes } @Override + public void addSecuritySettings(String addressMatch, + String sendRoles, + String consumeRoles, + String createDurableQueueRoles, + String deleteDurableQueueRoles, + String createNonDurableQueueRoles, + String deleteNonDurableQueueRoles, + String manageRoles, + String browseRoles, + String createAddress) throws Exception { + proxy.invokeOperation("addSecuritySettings", addressMatch, sendRoles, consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, createNonDurableQueueRoles, deleteNonDurableQueueRoles, manageRoles, browseRoles, createAddress); + } + + @Override public void removeSecuritySettings(String addressMatch) throws Exception { proxy.invokeOperation("removeSecuritySettings", addressMatch); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java index 299d6ec..9a2ec1e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java @@ -117,7 +117,7 @@ public class AddressControlTest extends ManagementTestBase { public void testGetRoles() throws Exception { SimpleString address = RandomUtil.randomSimpleString(); SimpleString queue = RandomUtil.randomSimpleString(); - Role role = new Role(RandomUtil.randomString(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean()); + Role role = new Role(RandomUtil.randomString(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean()); session.createQueue(address, queue, true); @@ -148,7 +148,7 @@ public class AddressControlTest extends ManagementTestBase { public void testGetRolesAsJSON() throws Exception { SimpleString address = RandomUtil.randomSimpleString(); SimpleString queue = RandomUtil.randomSimpleString(); - Role role = new Role(RandomUtil.randomString(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean()); + Role role = new Role(RandomUtil.randomString(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean()); session.createQueue(address, queue, true); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java index f943bf8..a845253 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java @@ -125,7 +125,7 @@ public class AddressControlUsingCoreTest extends ManagementTestBase { public void testGetRoles() throws Exception { SimpleString address = RandomUtil.randomSimpleString(); SimpleString queue = RandomUtil.randomSimpleString(); - Role role = new Role(RandomUtil.randomString(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean()); + Role role = new Role(RandomUtil.randomString(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomBoolean()); session.createQueue(address, queue, true); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java index 7f3ec69..03c7fc7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java @@ -90,10 +90,10 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag securityManager.getConfiguration().addRole(invalidAdminUser, "guest"); Set<Role> adminRole = securityRepository.getMatch(ActiveMQDefaultConfiguration.getDefaultManagementAddress().toString()); - adminRole.add(new Role("admin", true, true, true, true, true, true, true, true)); + adminRole.add(new Role("admin", true, true, true, true, true, true, true, true, true)); securityRepository.addMatch(ActiveMQDefaultConfiguration.getDefaultManagementAddress().toString(), adminRole); Set<Role> guestRole = securityRepository.getMatch("*"); - guestRole.add(new Role("guest", true, true, true, true, true, true, false, true)); + guestRole.add(new Role("guest", true, true, true, true, true, true, false, true, true)); securityRepository.addMatch("*", guestRole); return server; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java index 8e3091b..89f03b8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java @@ -88,7 +88,7 @@ public class SecurityNotificationTest extends ActiveMQTestBase { SimpleString address = RandomUtil.randomSimpleString(); // guest can not create queue - Role role = new Role("roleCanNotCreateQueue", true, true, false, true, false, true, true, true); + Role role = new Role("roleCanNotCreateQueue", true, true, false, true, false, true, true, true, true); Set<Role> roles = new HashSet<>(); roles.add(role); server.getSecurityRepository().addMatch(address.toString(), roles); @@ -136,7 +136,7 @@ public class SecurityNotificationTest extends ActiveMQTestBase { securityManager.getConfiguration().addUser("guest", "guest"); securityManager.getConfiguration().setDefaultUser("guest"); - Role role = new Role("notif", true, true, true, true, true, true, true, true); + Role role = new Role("notif", true, true, true, true, true, true, true, true, true); Set<Role> roles = new HashSet<>(); roles.add(role); server.getSecurityRepository().addMatch(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress().toString(), roles); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java index e99fc96..486c2d5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java @@ -1625,7 +1625,7 @@ public class MQTTTest extends MQTTTestSupport { Topic[] mqttSubscription = new Topic[]{new Topic("foo/bar", QoS.AT_LEAST_ONCE)}; AddressInfo addressInfo = new AddressInfo(coreAddress); - addressInfo.setDefaultMaxConsumers(0); + addressInfo.setDefaultMaxQueueConsumers(0); getServer().createOrUpdateAddressInfo(addressInfo); getServer().createQueue(coreAddress, new SimpleString(clientId + "." + coreAddress), null, false, true, 0, false); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java index 37de64f..c847d0a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java @@ -63,15 +63,15 @@ public class BasicOpenWireTest extends OpenWireTestBase { @Before public void setUp() throws Exception { super.setUp(); - SimpleString coreQueue = new SimpleString("jms.queue." + queueName); + SimpleString coreQueue = new SimpleString(queueName); this.server.createQueue(coreQueue, coreQueue, null, false, false); testQueues.put(queueName, coreQueue); - SimpleString coreQueue2 = new SimpleString("jms.queue." + queueName2); + SimpleString coreQueue2 = new SimpleString(queueName2); this.server.createQueue(coreQueue2, coreQueue2, null, false, false); testQueues.put(queueName2, coreQueue2); - SimpleString durableQueue = new SimpleString("jms.queue." + durableQueueName); + SimpleString durableQueue = new SimpleString(durableQueueName); this.server.createQueue(durableQueue, durableQueue, null, true, false); testQueues.put(durableQueueName, durableQueue); @@ -137,7 +137,7 @@ public class BasicOpenWireTest extends OpenWireTestBase { public void makeSureCoreQueueExist(String qname) throws Exception { SimpleString coreQ = testQueues.get(qname); if (coreQ == null) { - coreQ = new SimpleString("jms.queue." + qname); + coreQ = new SimpleString(qname); this.server.createQueue(coreQ, coreQ, null, false, false); testQueues.put(qname, coreQ); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/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 7ded062..66706ad 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 @@ -66,7 +66,7 @@ public class OpenWireTestBase extends ActiveMQTestBase { 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(enableSecurity); @@ -77,23 +77,23 @@ public class OpenWireTestBase extends ActiveMQTestBase { securityManager.getConfiguration().addRole("openwireSender", "sender"); securityManager.getConfiguration().addUser("openwireSender", "SeNdEr"); //sender cannot receive - Role senderRole = new Role("sender", true, false, false, false, true, true, false, false); + Role senderRole = new Role("sender", true, false, false, false, true, true, false, false, true); securityManager.getConfiguration().addRole("openwireReceiver", "receiver"); securityManager.getConfiguration().addUser("openwireReceiver", "ReCeIvEr"); //receiver cannot send - Role receiverRole = new Role("receiver", false, true, false, false, true, true, false, true); + Role receiverRole = new Role("receiver", false, true, false, false, true, true, false, true, false); securityManager.getConfiguration().addRole("openwireGuest", "guest"); securityManager.getConfiguration().addUser("openwireGuest", "GuEsT"); //guest cannot do anything - Role guestRole = new Role("guest", false, false, false, false, false, false, false, false); + Role guestRole = new Role("guest", false, false, false, false, false, false, false, false, false); securityManager.getConfiguration().addRole("openwireDestinationManager", "manager"); securityManager.getConfiguration().addUser("openwireDestinationManager", "DeStInAtIoN"); - Role destRole = new Role("manager", false, false, false, false, true, true, false, false); + Role destRole = new Role("manager", false, false, false, false, true, true, false, false, false); Set<Role> roles = new HashSet<>(); roles.add(senderRole); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/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 81f0f1b..c79f055 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 @@ -441,7 +441,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { AddressSettings addressSetting = new AddressSettings(); addressSetting.setAutoCreateJmsQueues(false); - server.getAddressSettingsRepository().addMatch("jms.queue.foo", addressSetting); + server.getAddressSettingsRepository().addMatch("foo", addressSetting); connection.start(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -460,7 +460,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { addressSetting.setAutoCreateJmsQueues(true); String address = "foo"; - server.getAddressSettingsRepository().addMatch("jms.queue." + address, addressSetting); + server.getAddressSettingsRepository().addMatch(address, addressSetting); connection.start(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -482,7 +482,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { addressSetting.setAutoCreateJmsQueues(true); String address = "foo"; - server.getAddressSettingsRepository().addMatch("jms.queue." + address, addressSetting); + server.getAddressSettingsRepository().addMatch(address, addressSetting); connection.start(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -505,7 +505,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { addressSetting.setAutoCreateJmsQueues(false); String address = "foo"; - server.getAddressSettingsRepository().addMatch("jms.queue." + address, addressSetting); + server.getAddressSettingsRepository().addMatch(address, addressSetting); connection.start(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -565,7 +565,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { public void testOpenWireExample() throws Exception { Connection exConn = null; - SimpleString durableQueue = new SimpleString("jms.queue.exampleQueue"); + SimpleString durableQueue = new SimpleString("exampleQueue"); this.server.createQueue(durableQueue, durableQueue, null, true, false); try { @@ -607,7 +607,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { public void testMultipleConsumers() throws Exception { Connection exConn = null; - SimpleString durableQueue = new SimpleString("jms.queue.exampleQueue"); + SimpleString durableQueue = new SimpleString("exampleQueue"); this.server.createQueue(durableQueue, durableQueue, null, true, false); try { @@ -644,7 +644,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { public void testMixedOpenWireExample() throws Exception { Connection openConn = null; - SimpleString durableQueue = new SimpleString("jms.queue.exampleQueue"); + SimpleString durableQueue = new SimpleString("exampleQueue"); this.server.createQueue(durableQueue, durableQueue, null, true, false); ActiveMQConnectionFactory openCF = new ActiveMQConnectionFactory(); @@ -684,7 +684,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { public void testMixedOpenWireExample2() throws Exception { Connection conn1 = null; - SimpleString durableQueue = new SimpleString("jms.queue.exampleQueue"); + SimpleString durableQueue = new SimpleString("exampleQueue"); this.server.createQueue(durableQueue, durableQueue, null, true, false); Queue queue = ActiveMQJMSClient.createQueue("exampleQueue"); @@ -1148,7 +1148,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { private void checkQueueEmpty(String qName) { PostOffice po = server.getPostOffice(); - LocalQueueBinding binding = (LocalQueueBinding) po.getBinding(SimpleString.toSimpleString("jms.queue." + qName)); + LocalQueueBinding binding = (LocalQueueBinding) po.getBinding(SimpleString.toSimpleString(qName)); try { //waiting for last ack to finish Thread.sleep(1000); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/VerySimpleOenwireTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/VerySimpleOenwireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/VerySimpleOenwireTest.java index 7a720dc..bddaef5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/VerySimpleOenwireTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/VerySimpleOenwireTest.java @@ -41,7 +41,7 @@ public class VerySimpleOenwireTest extends OpenWireTestBase { public void testOpenWireExample() throws Exception { Connection exConn = null; - SimpleString durableQueue = new SimpleString("jms.queue.exampleQueue"); + SimpleString durableQueue = new SimpleString("exampleQueue"); this.server.createQueue(durableQueue, durableQueue, null, true, false); try { @@ -78,7 +78,7 @@ public class VerySimpleOenwireTest extends OpenWireTestBase { public void testMixedOpenWireExample() throws Exception { Connection openConn = null; - SimpleString durableQueue = new SimpleString("jms.queue.exampleQueue"); + SimpleString durableQueue = new SimpleString("exampleQueue"); this.server.createQueue(durableQueue, durableQueue, null, true, false); ActiveMQConnectionFactory openCF = new ActiveMQConnectionFactory(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java index 227221e..baacd16 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlSendFailTest.java @@ -56,7 +56,7 @@ public class ProducerFlowControlSendFailTest extends ProducerFlowControlTest { @Override protected void extraServerConfig(Configuration serverConfig) { - String match = "jms.queue.#"; + String match = "#"; Map<String, AddressSettings> asMap = serverConfig.getAddressesSettings(); asMap.get(match).setMaxSizeBytes(1).setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlTest.java index 4f3d38d..d372c46 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/ProducerFlowControlTest.java @@ -317,7 +317,7 @@ public class ProducerFlowControlTest extends BasicOpenWireTest { @Override protected void extraServerConfig(Configuration serverConfig) { - String match = "jms.queue.#"; + String match = "#"; Map<String, AddressSettings> asMap = serverConfig.getAddressesSettings(); asMap.get(match).setMaxSizeBytes(1).setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingOrderTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingOrderTest.java index fa43ae7..575f9e5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingOrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingOrderTest.java @@ -605,7 +605,7 @@ public class PagingOrderTest extends ActiveMQTestBase { jmsServer.createTopic(true, "tt", "/topic/TT"); - server.getActiveMQServerControl().addAddressSettings("jms.topic.TT", "DLQ", "DLQ", -1, false, 5, 1024 * 1024, 1024 * 10, 5, 5, 1, 1000, 0, false, "PAGE", -1, 10, "KILL", true, true, true, true); + server.getActiveMQServerControl().addAddressSettings("TT", "DLQ", "DLQ", -1, false, 5, 1024 * 1024, 1024 * 10, 5, 5, 1, 1000, 0, false, "PAGE", -1, 10, "KILL", true, true, true, true); ActiveMQJMSConnectionFactory cf = (ActiveMQJMSConnectionFactory) ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(INVM_CONNECTOR_FACTORY)); @@ -620,7 +620,7 @@ public class PagingOrderTest extends ActiveMQTestBase { TextMessage txt = sess.createTextMessage("TST"); prod.send(txt); - PagingStore store = server.getPagingManager().getPageStore(new SimpleString("jms.topic.TT")); + PagingStore store = server.getPagingManager().getPageStore(new SimpleString("TT")); assertEquals(1024 * 1024, store.getMaxSize()); assertEquals(10 * 1024, store.getPageSizeBytes()); @@ -634,7 +634,7 @@ public class PagingOrderTest extends ActiveMQTestBase { jmsServer.setRegistry(new JndiBindingRegistry(context)); jmsServer.start(); - AddressSettings settings = server.getAddressSettingsRepository().getMatch("jms.topic.TT"); + AddressSettings settings = server.getAddressSettingsRepository().getMatch("TT"); assertEquals(1024 * 1024, settings.getMaxSizeBytes()); assertEquals(10 * 1024, settings.getPageSizeBytes()); @@ -661,7 +661,7 @@ public class PagingOrderTest extends ActiveMQTestBase { jmsServer.setRegistry(new JndiBindingRegistry(context)); jmsServer.start(); - server.getActiveMQServerControl().addAddressSettings("jms.queue.Q1", "DLQ", "DLQ", -1, false, 5, 100 * 1024, 10 * 1024, 5, 5, 1, 1000, 0, false, "PAGE", -1, 10, "KILL", true, true, true, true); + server.getActiveMQServerControl().addAddressSettings("Q1", "DLQ", "DLQ", -1, false, 5, 100 * 1024, 10 * 1024, 5, 5, 1, 1000, 0, false, "PAGE", -1, 10, "KILL", true, true, true, true); jmsServer.createQueue(true, "Q1", null, true, "/queue/Q1"); @@ -682,7 +682,7 @@ public class PagingOrderTest extends ActiveMQTestBase { prod.send(bmt); } - PagingStore store = server.getPagingManager().getPageStore(new SimpleString("jms.queue.Q1")); + PagingStore store = server.getPagingManager().getPageStore(new SimpleString("Q1")); assertEquals(100 * 1024, store.getMaxSize()); assertEquals(10 * 1024, store.getPageSizeBytes()); @@ -698,13 +698,13 @@ public class PagingOrderTest extends ActiveMQTestBase { jmsServer.setRegistry(new JndiBindingRegistry(context)); jmsServer.start(); - AddressSettings settings = server.getAddressSettingsRepository().getMatch("jms.queue.Q1"); + AddressSettings settings = server.getAddressSettingsRepository().getMatch("Q1"); assertEquals(100 * 1024, settings.getMaxSizeBytes()); assertEquals(10 * 1024, settings.getPageSizeBytes()); assertEquals(AddressFullMessagePolicy.PAGE, settings.getAddressFullMessagePolicy()); - store = server.getPagingManager().getPageStore(new SimpleString("jms.queue.Q1")); + store = server.getPagingManager().getPageStore(new SimpleString("Q1")); assertEquals(100 * 1024, store.getMaxSize()); assertEquals(10 * 1024, store.getPageSizeBytes()); assertEquals(AddressFullMessagePolicy.PAGE, store.getAddressFullMessagePolicy()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java index 4a26d97..72ccffd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java @@ -33,7 +33,7 @@ import org.junit.Test; public class PagingReceiveTest extends ActiveMQTestBase { - private static final SimpleString ADDRESS = new SimpleString("jms.queue.catalog-service.price.change.bm"); + private static final SimpleString ADDRESS = new SimpleString("catalog-service.price.change.bm"); private ActiveMQServer server; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java index 6a1adda..8f15998 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java @@ -50,9 +50,9 @@ public class RolesConfigurationStorageTest extends StorageManagerTestBase { public void testStoreSecuritySettings() throws Exception { createStorage(); - addSetting(new PersistedRoles("a#", "a1", "a1", "a1", "a1", "a1", "a1", "a1", "a1")); + addSetting(new PersistedRoles("a#", "a1", "a1", "a1", "a1", "a1", "a1", "a1", "a1", "a1")); - addSetting(new PersistedRoles("a2", "a1", null, "a1", "a1", "a1", "a1", "a1", "a1")); + addSetting(new PersistedRoles("a2", "a1", null, "a1", "a1", "a1", "a1", "a1", "a1", "a1")); journal.stop(); @@ -62,9 +62,9 @@ public class RolesConfigurationStorageTest extends StorageManagerTestBase { checkSettings(); - addSetting(new PersistedRoles("a2", "a1", null, "a1", "a1", "a1", "a1", "a1", "a1")); + addSetting(new PersistedRoles("a2", "a1", null, "a1", "a1", "a1", "a1", "a1", "a1", "a1")); - addSetting(new PersistedRoles("a3", "a1", null, "a1", "a1", "a1", "a1", "a1", "a1")); + addSetting(new PersistedRoles("a3", "a1", null, "a1", "a1", "a1", "a1", "a1", "a1", "a1")); checkSettings(); @@ -92,7 +92,7 @@ public class RolesConfigurationStorageTest extends StorageManagerTestBase { checkSettings(); - addSetting(new PersistedRoles("a#", "a1", "a1", "a1", "a1", "a1", "a1", "a1", "a1")); + addSetting(new PersistedRoles("a#", "a1", "a1", "a1", "a1", "a1", "a1", "a1", "a1", "a1")); journal.stop(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java index f8c2032..ce0ae5d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQClusteredTest.java @@ -95,7 +95,7 @@ public class ActiveMQClusteredTest extends ActiveMQRAClusteredTestBase { DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false); qResourceAdapter.endpointActivation(endpointFactory, spec); ClientSession session = addClientSession(locator.createSessionFactory().createSession()); - ClientProducer clientProducer = session.createProducer("jms.topic.mdbTopic"); + ClientProducer clientProducer = session.createProducer("mdbTopic"); ClientMessage message = session.createMessage(true); message.getBodyBuffer().writeString("test"); clientProducer.send(message); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java index 464c097..c25d3db 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerSecurityTest.java @@ -67,7 +67,7 @@ public class ActiveMQMessageHandlerSecurityTest extends ActiveMQRATestBase { ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager(); securityManager.getConfiguration().addUser("testuser", "testpassword"); securityManager.getConfiguration().addRole("testuser", "arole"); - Role role = new Role("arole", false, true, false, false, false, false, false, false); + Role role = new Role("arole", false, true, false, false, false, false, false, false, false); Set<Role> roles = new HashSet<>(); roles.add(role); server.getSecurityRepository().addMatch(MDBQUEUEPREFIXED, roles); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java index 98e6adb..9fd0bfa 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQMessageHandlerTest.java @@ -503,7 +503,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase { DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false); qResourceAdapter.endpointActivation(endpointFactory, spec); ClientSession session = locator.createSessionFactory().createSession(); - ClientProducer clientProducer = session.createProducer("jms.topic.mdbTopic"); + ClientProducer clientProducer = session.createProducer("mdbTopic"); ClientMessage message = session.createMessage(true); message.getBodyBuffer().writeString("test"); clientProducer.send(message); @@ -536,7 +536,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase { DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false); qResourceAdapter.endpointActivation(endpointFactory, spec); ClientSession session = locator.createSessionFactory().createSession(); - ClientProducer clientProducer = session.createProducer("jms.topic.mdbTopic"); + ClientProducer clientProducer = session.createProducer("mdbTopic"); ClientMessage message = session.createMessage(true); message.getBodyBuffer().writeString("1"); clientProducer.send(message); @@ -589,7 +589,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase { DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false); qResourceAdapter.endpointActivation(endpointFactory, spec); ClientSession session = locator.createSessionFactory().createSession(); - ClientProducer clientProducer = session.createProducer("jms.topic.mdbTopic"); + ClientProducer clientProducer = session.createProducer("mdbTopic"); ClientMessage message = session.createMessage(true); message.getBodyBuffer().writeString("1"); clientProducer.send(message); @@ -638,7 +638,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase { qResourceAdapter.endpointActivation(endpointFactory, spec); ClientSession session = locator.createSessionFactory().createSession(); - ClientProducer clientProducer = session.createProducer("jms.topic.mdbTopic"); + ClientProducer clientProducer = session.createProducer("mdbTopic"); ClientMessage message = session.createMessage(true); message.getBodyBuffer().writeString("1"); clientProducer.send(message); @@ -690,7 +690,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase { DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false); qResourceAdapter.endpointActivation(endpointFactory, spec); ClientSession session = locator.createSessionFactory().createSession(); - ClientProducer clientProducer = session.createProducer("jms.topic.mdbTopic"); + ClientProducer clientProducer = session.createProducer("mdbTopic"); ClientMessage message = session.createMessage(true); message.getBodyBuffer().writeString("1"); message.putStringProperty("foo", "bar"); @@ -767,7 +767,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase { qResourceAdapter.endpointActivation(endpointFactory2, spec2); ClientSession session = locator.createSessionFactory().createSession(); - ClientProducer clientProducer = session.createProducer("jms.topic.mdbTopic"); + ClientProducer clientProducer = session.createProducer("mdbTopic"); for (int i = 0; i < 10; i++) { ClientMessage message = session.createMessage(true); @@ -863,7 +863,7 @@ public class ActiveMQMessageHandlerTest extends ActiveMQRATestBase { DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false); qResourceAdapter.endpointActivation(endpointFactory, spec); ClientSession session = locator.createSessionFactory().createSession(); - ClientProducer clientProducer = session.createProducer("jms.topic.mdbTopic"); + ClientProducer clientProducer = session.createProducer("mdbTopic"); ClientMessage message = session.createMessage(true); message.getBodyBuffer().writeString("1"); message.putStringProperty("foo", "bar"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java index 3a9e0b0..80f562d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java @@ -51,8 +51,8 @@ public abstract class ActiveMQRATestBase extends JMSTestBase { protected static final String MDBQUEUE = "mdbQueue"; protected static final String DLQ = "dlqQueue"; - protected static final String MDBQUEUEPREFIXED = "jms.queue.mdbQueue"; - protected static final SimpleString MDBQUEUEPREFIXEDSIMPLE = new SimpleString("jms.queue.mdbQueue"); + protected static final String MDBQUEUEPREFIXED = "mdbQueue"; + protected static final SimpleString MDBQUEUEPREFIXEDSIMPLE = new SimpleString("mdbQueue"); @Override @Before @@ -65,7 +65,7 @@ public abstract class ActiveMQRATestBase extends JMSTestBase { } protected void setupDLQ(int maxDeliveries) { - AddressSettings settings = new AddressSettings().setDeadLetterAddress(SimpleString.toSimpleString("jms.queue." + DLQ)).setMaxDeliveryAttempts(maxDeliveries); + AddressSettings settings = new AddressSettings().setDeadLetterAddress(SimpleString.toSimpleString(DLQ)).setMaxDeliveryAttempts(maxDeliveries); server.getAddressSettingsRepository().addMatch("#", settings); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java index ae88721..895ebbe 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/JMSContextTest.java @@ -57,7 +57,7 @@ public class JMSContextTest extends ActiveMQRATestBase { securityManager.getConfiguration().setDefaultUser("guest"); securityManager.getConfiguration().addRole("testuser", "arole"); securityManager.getConfiguration().addRole("guest", "arole"); - 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.getSecurityRepository().addMatch(MDBQUEUEPREFIXED, roles); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java index c5bdd7c..a96c00e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTest.java @@ -82,7 +82,7 @@ public class OutgoingConnectionTest extends ActiveMQRATestBase { securityManager.getConfiguration().setDefaultUser("guest"); securityManager.getConfiguration().addRole("testuser", "arole"); securityManager.getConfiguration().addRole("guest", "arole"); - 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.getSecurityRepository().addMatch(MDBQUEUEPREFIXED, roles);
