You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/11/04 13:29:11 UTC
[08/13] activemq-artemis git commit: Remove JMS prefixes
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTestJTA.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTestJTA.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTestJTA.java
index b8f529f..c85140d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTestJTA.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/OutgoingConnectionTestJTA.java
@@ -71,7 +71,7 @@ public class OutgoingConnectionTestJTA extends ActiveMQRATestBase {
((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().setDefaultUser("guest");
((ActiveMQJAASSecurityManager) server.getSecurityManager()).getConfiguration().addRole("testuser", "arole");
((ActiveMQJAASSecurityManager) server.getSecurityManager()).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);
@@ -187,7 +187,7 @@ public class OutgoingConnectionTestJTA extends ActiveMQRATestBase {
try (ClientSessionFactory sf = locator.createSessionFactory();
ClientSession session = sf.createSession();
- ClientConsumer consVerify = session.createConsumer("jms.queue." + MDBQUEUE);
+ ClientConsumer consVerify = session.createConsumer(MDBQUEUE);
JMSContext jmsctx = qraConnectionFactory.createContext();
) {
session.start();
@@ -233,7 +233,7 @@ public class OutgoingConnectionTestJTA extends ActiveMQRATestBase {
Queue q = ActiveMQJMSClient.createQueue(MDBQUEUE);
try (ClientSessionFactory sf = locator.createSessionFactory();
ClientSession session = sf.createSession();
- ClientConsumer consVerify = session.createConsumer("jms.queue." + MDBQUEUE);
+ ClientConsumer consVerify = session.createConsumer(MDBQUEUE);
Connection conn = qraConnectionFactory.createConnection();
) {
Session jmsSess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/RestDeserializationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/RestDeserializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/RestDeserializationTest.java
index 7e78795..64086e2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/RestDeserializationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/RestDeserializationTest.java
@@ -39,6 +39,9 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.apache.activemq.artemis.jms.client.ActiveMQDestination.QUEUE_QUALIFIED_PREFIX;
+import static org.apache.activemq.artemis.jms.client.ActiveMQDestination.TOPIC_QUALIFIED_PREFIX;
+
public class RestDeserializationTest extends RestTestBase {
private RestAMQConnection restConnection;
@@ -169,11 +172,11 @@ public class RestDeserializationTest extends RestTestBase {
ConnectionFactory factory = new ActiveMQJMSConnectionFactory("tcp://localhost:61616");
String jmsDest;
if (isQueue) {
- jmsDest = "jms.queue." + destName;
+ jmsDest = QUEUE_QUALIFIED_PREFIX + destName;
} else {
- jmsDest = "jms.topic." + destName;
+ jmsDest = TOPIC_QUALIFIED_PREFIX + destName;
}
- Destination destination = ActiveMQDestination.fromAddress(jmsDest);
+ Destination destination = ActiveMQDestination.fromPrefixedName(jmsDest);
Connection conn = factory.createConnection();
try {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/util/QueueRestMessageContext.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/util/QueueRestMessageContext.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/util/QueueRestMessageContext.java
index 265c1fb..ffd8a53 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/util/QueueRestMessageContext.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/util/QueueRestMessageContext.java
@@ -23,7 +23,7 @@ import org.apache.http.client.methods.CloseableHttpResponse;
public class QueueRestMessageContext extends RestMessageContext {
- public static final String PREFIX_QUEUE = "/queues/jms.queue.";
+ public static final String PREFIX_QUEUE = "/queues/";
public QueueRestMessageContext(RestAMQConnection restAMQConnection, String queue) throws IOException {
super(restAMQConnection, queue);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/util/TopicRestMessageContext.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/util/TopicRestMessageContext.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/util/TopicRestMessageContext.java
index d3419e6..7d99e41 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/util/TopicRestMessageContext.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/util/TopicRestMessageContext.java
@@ -23,7 +23,7 @@ import org.apache.http.client.methods.CloseableHttpResponse;
public class TopicRestMessageContext extends RestMessageContext {
- public static final String PREFIX_TOPIC = "/topics/jms.topic.";
+ public static final String PREFIX_TOPIC = "/topics/";
private boolean durableSub;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/LDAPSecurityTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/LDAPSecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/LDAPSecurityTest.java
index a900968..5bfdc62 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/LDAPSecurityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/LDAPSecurityTest.java
@@ -174,7 +174,7 @@ public class LDAPSecurityTest extends AbstractLdapTestUnit {
final SimpleString NON_DURABLE_QUEUE = new SimpleString("nonDurableQueue");
Set<Role> roles = new HashSet<>();
- roles.add(new Role("programmers", false, false, false, false, false, false, false, false));
+ roles.add(new Role("programmers", false, false, false, false, false, false, false, false, false));
server.getConfiguration().putSecurityRoles("#", roles);
server.start();
server.createQueue(ADDRESS, DURABLE_QUEUE, null, true, false);
@@ -260,7 +260,7 @@ public class LDAPSecurityTest extends AbstractLdapTestUnit {
final SimpleString NON_DURABLE_QUEUE = new SimpleString("nonDurableQueue");
Set<Role> roles = new HashSet<>();
- roles.add(new Role("admins", true, true, true, true, true, true, true, true));
+ roles.add(new Role("admins", true, true, true, true, true, true, true, true, true));
server.getConfiguration().putSecurityRoles("#", roles);
server.start();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
index 8fef6e5..d08afed 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/security/SecurityTest.java
@@ -224,7 +224,7 @@ public class SecurityTest extends ActiveMQTestBase {
ActiveMQJAASSecurityManager securityManager = new ActiveMQJAASSecurityManager("PropertiesLogin");
ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig().setSecurityEnabled(true), ManagementFactory.getPlatformMBeanServer(), securityManager, false));
Set<Role> roles = new HashSet<>();
- roles.add(new Role("programmers", false, false, false, false, false, false, false, false));
+ roles.add(new Role("programmers", false, false, false, false, false, false, false, false, false));
server.getConfiguration().putSecurityRoles("#", roles);
server.start();
server.createQueue(ADDRESS, DURABLE_QUEUE, null, true, false);
@@ -309,10 +309,10 @@ public class SecurityTest extends ActiveMQTestBase {
ActiveMQJAASSecurityManager securityManager = new ActiveMQJAASSecurityManager("PropertiesLogin");
ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig().setSecurityEnabled(true), ManagementFactory.getPlatformMBeanServer(), securityManager, false));
Set<Role> aRoles = new HashSet<>();
- aRoles.add(new Role(QUEUE_A.toString(), false, true, false, false, false, false, false, false));
+ aRoles.add(new Role(QUEUE_A.toString(), false, true, false, false, false, false, false, false, false));
server.getConfiguration().putSecurityRoles(ADDRESS.concat(".").concat(QUEUE_A).toString(), aRoles);
Set<Role> bRoles = new HashSet<>();
- bRoles.add(new Role(QUEUE_B.toString(), false, true, false, false, false, false, false, false));
+ bRoles.add(new Role(QUEUE_B.toString(), false, true, false, false, false, false, false, false, false));
server.getConfiguration().putSecurityRoles(ADDRESS.concat(".").concat(QUEUE_B).toString(), bRoles);
server.start();
server.createQueue(ADDRESS, QUEUE_A, null, true, false);
@@ -375,7 +375,7 @@ public class SecurityTest extends ActiveMQTestBase {
server.getConfiguration().addAcceptorConfiguration(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params));
Set<Role> roles = new HashSet<>();
- roles.add(new Role("programmers", false, false, false, false, false, false, false, false));
+ roles.add(new Role("programmers", false, false, false, false, false, false, false, false, false));
server.getConfiguration().putSecurityRoles("#", roles);
server.start();
@@ -470,7 +470,7 @@ public class SecurityTest extends ActiveMQTestBase {
ActiveMQJAASSecurityManager securityManager = new ActiveMQJAASSecurityManager("PropertiesLogin");
ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig().setSecurityEnabled(true), ManagementFactory.getPlatformMBeanServer(), securityManager, false));
Set<Role> roles = new HashSet<>();
- roles.add(new Role("programmers", true, true, true, true, true, true, true, true));
+ roles.add(new Role("programmers", true, true, true, true, true, true, true, true, true));
server.getConfiguration().putSecurityRoles("#", roles);
server.start();
@@ -558,7 +558,7 @@ public class SecurityTest extends ActiveMQTestBase {
server.getConfiguration().addAcceptorConfiguration(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params));
Set<Role> roles = new HashSet<>();
- roles.add(new Role("programmers", true, true, true, true, true, true, true, true));
+ roles.add(new Role("programmers", true, true, true, true, true, true, true, true, true));
server.getConfiguration().putSecurityRoles("#", roles);
server.start();
@@ -642,7 +642,7 @@ public class SecurityTest extends ActiveMQTestBase {
ActiveMQJAASSecurityManager securityManager = new ActiveMQJAASSecurityManager("GuestLogin");
ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(createDefaultInVMConfig().setSecurityEnabled(true), ManagementFactory.getPlatformMBeanServer(), securityManager, false));
Set<Role> roles = new HashSet<>();
- roles.add(new Role("bar", true, true, true, true, true, true, true, false));
+ roles.add(new Role("bar", true, true, true, true, true, true, true, false, true));
server.getConfiguration().putSecurityRoles("#", roles);
server.start();
@@ -789,7 +789,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, false, false, false, false, false);
+ Role role = new Role("arole", false, false, true, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -808,7 +808,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, false, false, false, false, false, false);
+ Role role = new Role("arole", false, false, false, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -833,7 +833,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, true, false, false, false, false);
+ Role role = new Role("arole", false, false, true, true, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -852,7 +852,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, false, false, false, false, false);
+ Role role = new Role("arole", false, false, true, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -879,7 +879,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, false, false, true, false, false, false);
+ Role role = new Role("arole", false, false, false, false, true, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -898,7 +898,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, false, false, false, false, false, false);
+ Role role = new Role("arole", false, false, false, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -923,7 +923,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, false, false, true, true, false, false);
+ Role role = new Role("arole", false, false, false, false, true, true, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -942,7 +942,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, false, false, true, false, false, false);
+ Role role = new Role("arole", false, false, false, false, true, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -973,7 +973,7 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", true, true, true, false, false, false, false, false);
+ Role role = new Role("arole", true, true, true, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
@@ -1005,7 +1005,7 @@ public class SecurityTest extends ActiveMQTestBase {
receivedMessage.acknowledge();
- role = new Role("arole", false, false, true, false, false, false, false, false);
+ role = new Role("arole", false, false, true, false, false, false, false, false, false);
roles = new HashSet<>();
@@ -1032,7 +1032,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, false, false, false, false, false);
+ Role role = new Role("arole", false, false, true, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -1060,7 +1060,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, false, false, false, false, false);
+ Role role = new Role("arole", false, false, true, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(SecurityTest.addressA, roles);
@@ -1086,8 +1086,8 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().addUser("guest", "guest");
securityManager.getConfiguration().addRole("guest", "guest");
securityManager.getConfiguration().setDefaultUser("guest");
- Role role = new Role("arole", false, true, false, false, false, false, false, false);
- Role sendRole = new Role("guest", true, false, true, false, false, false, false, false);
+ Role role = new Role("arole", false, true, false, false, false, false, false, false, false);
+ Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(sendRole);
roles.add(role);
@@ -1114,8 +1114,8 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().addUser("guest", "guest");
securityManager.getConfiguration().addRole("guest", "guest");
securityManager.getConfiguration().setDefaultUser("guest");
- Role role = new Role("arole", false, false, false, false, false, false, false, false);
- Role sendRole = new Role("guest", true, false, true, false, false, false, false, false);
+ Role role = new Role("arole", false, false, false, false, false, false, false, false, false);
+ Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(sendRole);
roles.add(role);
@@ -1149,9 +1149,9 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().addUser("guest", "guest");
securityManager.getConfiguration().addRole("guest", "guest");
securityManager.getConfiguration().setDefaultUser("guest");
- Role role = new Role("arole", false, false, false, false, false, false, false, false);
- Role sendRole = new Role("guest", true, false, true, false, false, false, false, false);
- Role receiveRole = new Role("receiver", false, true, false, false, false, false, false, false);
+ Role role = new Role("arole", false, false, false, false, false, false, false, false, false);
+ Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false);
+ Role receiveRole = new Role("receiver", false, true, false, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(sendRole);
roles.add(role);
@@ -1198,9 +1198,9 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().addUser("guest", "guest");
securityManager.getConfiguration().addRole("guest", "guest");
securityManager.getConfiguration().setDefaultUser("guest");
- Role role = new Role("arole", false, false, false, false, false, false, false, false);
- Role sendRole = new Role("guest", true, false, true, false, false, false, false, false);
- Role receiveRole = new Role("receiver", false, true, false, false, false, false, false, false);
+ Role role = new Role("arole", false, false, false, false, false, false, false, false, false);
+ Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false);
+ Role receiveRole = new Role("receiver", false, true, false, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(sendRole);
roles.add(role);
@@ -1254,11 +1254,11 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().addUser("guest", "guest");
securityManager.getConfiguration().addRole("guest", "guest");
securityManager.getConfiguration().setDefaultUser("guest");
- Role role = new Role("arole", false, false, false, false, false, false, false, false);
+ Role role = new Role("arole", false, false, false, false, false, false, false, false, false);
System.out.println("guest:" + role);
- Role sendRole = new Role("guest", true, false, true, false, false, false, false, false);
+ Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false);
System.out.println("guest:" + sendRole);
- Role receiveRole = new Role("receiver", false, true, false, false, false, false, false, false);
+ Role receiveRole = new Role("receiver", false, true, false, false, false, false, false, false, false);
System.out.println("guest:" + receiveRole);
Set<Role> roles = new HashSet<>();
roles.add(sendRole);
@@ -1339,7 +1339,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, false, false, false, false, true, false);
+ Role role = new Role("arole", false, false, false, false, false, false, true, false, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(configuration.getManagementAddress().toString(), roles);
@@ -1360,7 +1360,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, false, false, false, false, false);
+ Role role = new Role("arole", false, false, true, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(configuration.getManagementAddress().toString(), roles);
@@ -1389,7 +1389,7 @@ public class SecurityTest extends ActiveMQTestBase {
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("auser", "pass");
- Role role = new Role("arole", false, false, true, false, false, false, false, false);
+ Role role = new Role("arole", false, false, true, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(role);
securityRepository.addMatch(configuration.getManagementAddress().toString(), roles);
@@ -1425,23 +1425,23 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().addRole("frank", "user");
securityManager.getConfiguration().addRole("sam", "news-user");
securityManager.getConfiguration().addRole("sam", "user");
- Role all = new Role("all", true, true, true, true, true, true, true, true);
+ Role all = new Role("all", true, true, true, true, true, true, true, true, true);
HierarchicalRepository<Set<Role>> repository = server.getSecurityRepository();
Set<Role> add = new HashSet<>();
- add.add(new Role("user", true, true, true, true, true, true, false, true));
+ add.add(new Role("user", true, true, true, true, true, true, false, true, true));
add.add(all);
repository.addMatch("#", add);
Set<Role> add1 = new HashSet<>();
add1.add(all);
- add1.add(new Role("user", false, false, true, true, true, true, false, true));
- add1.add(new Role("europe-user", true, false, false, false, false, false, false, true));
- add1.add(new Role("news-user", false, true, false, false, false, false, false, true));
+ add1.add(new Role("user", false, false, true, true, true, true, false, true, true));
+ add1.add(new Role("europe-user", true, false, false, false, false, false, false, true, true));
+ add1.add(new Role("news-user", false, true, false, false, false, false, false, true, true));
repository.addMatch("news.europe.#", add1);
Set<Role> add2 = new HashSet<>();
add2.add(all);
- add2.add(new Role("user", false, false, true, true, true, true, false, true));
- add2.add(new Role("us-user", true, false, false, false, false, false, false, true));
- add2.add(new Role("news-user", false, true, false, false, false, false, false, true));
+ add2.add(new Role("user", false, false, true, true, true, true, false, true, true));
+ add2.add(new Role("us-user", true, false, false, false, false, false, false, true, true));
+ add2.add(new Role("news-user", false, true, false, false, false, false, false, true, true));
repository.addMatch("news.us.#", add2);
ClientSession billConnection = null;
ClientSession andrewConnection = null;
@@ -1552,23 +1552,23 @@ public class SecurityTest extends ActiveMQTestBase {
securityManager.getConfiguration().addRole("frank", "user");
securityManager.getConfiguration().addRole("sam", "news-user");
securityManager.getConfiguration().addRole("sam", "user");
- Role all = new Role("all", true, true, true, true, true, true, true, true);
+ Role all = new Role("all", true, true, true, true, true, true, true, true, true);
HierarchicalRepository<Set<Role>> repository = server.getSecurityRepository();
Set<Role> add = new HashSet<>();
- add.add(new Role("user", true, true, true, true, true, true, false, true));
+ add.add(new Role("user", true, true, true, true, true, true, false, true, true));
add.add(all);
repository.addMatch("#", add);
Set<Role> add1 = new HashSet<>();
add1.add(all);
- add1.add(new Role("user", false, false, true, true, true, true, false, true));
- add1.add(new Role("europe-user", true, false, false, false, false, false, false, true));
- add1.add(new Role("news-user", false, true, false, false, false, false, false, true));
+ add1.add(new Role("user", false, false, true, true, true, true, false, true, true));
+ add1.add(new Role("europe-user", true, false, false, false, false, false, false, true, true));
+ add1.add(new Role("news-user", false, true, false, false, false, false, false, true, true));
repository.addMatch("news.europe.#", add1);
Set<Role> add2 = new HashSet<>();
add2.add(all);
- add2.add(new Role("user", false, false, true, true, true, true, false, true));
- add2.add(new Role("us-user", true, false, false, false, false, false, false, true));
- add2.add(new Role("news-user", false, true, false, false, false, false, false, true));
+ add2.add(new Role("user", false, false, true, true, true, true, false, true, true));
+ add2.add(new Role("us-user", true, false, false, false, false, false, false, true, true));
+ add2.add(new Role("news-user", false, true, false, false, false, false, false, true, true));
repository.addMatch("news.us.#", add2);
ClientSession billConnection = null;
ClientSession andrewConnection = 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/server/ResourceLimitTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java
index 0f0a0ac..b6ebc12 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ResourceLimitTest.java
@@ -59,7 +59,7 @@ public class ResourceLimitTest extends ActiveMQTestBase {
ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
securityManager.getConfiguration().addUser("myUser", "password");
securityManager.getConfiguration().addRole("myUser", "arole");
- Role role = new Role("arole", false, false, false, false, true, true, false, true);
+ Role role = new Role("arole", false, false, false, false, true, true, false, true, false);
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/ssl/DualAuthenticationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/DualAuthenticationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/DualAuthenticationTest.java
index 3540615..6529d9b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/DualAuthenticationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/DualAuthenticationTest.java
@@ -128,8 +128,8 @@ public class DualAuthenticationTest extends ActiveMQTestBase {
server = addServer(ActiveMQServers.newActiveMQServer(config, ManagementFactory.getPlatformMBeanServer(), securityManager, false));
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
- Role sendRole = new Role("producers", true, false, true, false, true, false, false, false);
- Role receiveRole = new Role("consumers", false, true, false, false, false, false, false, false);
+ Role sendRole = new Role("producers", true, false, true, false, true, false, false, false, false);
+ Role receiveRole = new Role("consumers", false, true, false, false, false, false, false, false, false);
Set<Role> roles = new HashSet<>();
roles.add(sendRole);
roles.add(receiveRole);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
index 7d66465..90d18ae 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
@@ -37,7 +37,6 @@ import org.apache.activemq.artemis.api.core.client.ClientProducer;
import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
-import org.apache.activemq.artemis.api.core.management.ResourceNames;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
import org.apache.activemq.artemis.core.protocol.stomp.Stomp;
@@ -298,9 +297,9 @@ public class StompTest extends StompTestBase {
Assert.assertTrue(Math.abs(tnow - tmsg) < 1500);
// closing the consumer here should trigger auto-deletion
- assertNotNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_QUEUE + nonExistentQueue)));
+ assertNotNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(nonExistentQueue)));
consumer.close();
- assertNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_QUEUE + nonExistentQueue)));
+ assertNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(nonExistentQueue)));
}
@Test
@@ -333,11 +332,11 @@ public class StompTest extends StompTestBase {
long tmsg = message.getJMSTimestamp();
Assert.assertTrue(Math.abs(tnow - tmsg) < 1500);
- assertNotNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_TOPIC + nonExistentTopic)));
+ assertNotNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(nonExistentTopic)));
// closing the consumer here should trigger auto-deletion of the topic
consumer.close();
- assertNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_TOPIC + nonExistentTopic)));
+ assertNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(nonExistentTopic)));
}
/*
@@ -1436,9 +1435,9 @@ public class StompTest extends StompTestBase {
Assert.assertTrue(frame.indexOf("destination:") > 0);
Assert.assertTrue(frame.indexOf(getName()) > 0);
- assertNotNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_QUEUE + nonExistentQueue)));
+ assertNotNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(nonExistentQueue)));
- final Queue subscription = ((LocalQueueBinding) server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_QUEUE + nonExistentQueue))).getQueue();
+ final Queue subscription = ((LocalQueueBinding) server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(nonExistentQueue))).getQueue();
assertTrue(Wait.waitFor(new Wait.Condition() {
@Override
@@ -1462,7 +1461,7 @@ public class StompTest extends StompTestBase {
frame = receiveFrame(10000);
Assert.assertTrue(frame.startsWith("RECEIPT"));
- assertNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(ResourceNames.JMS_QUEUE + nonExistentQueue)));
+ assertNull(server.getActiveMQServer().getPostOffice().getBinding(new SimpleString(nonExistentQueue)));
sendMessage(getName(), ActiveMQJMSClient.createQueue(nonExistentQueue));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
index 2eb95cf..26f2a2f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
@@ -72,6 +72,7 @@ import org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationI
import org.apache.activemq.artemis.jms.server.config.impl.TopicConfigurationImpl;
import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.After;
@@ -215,7 +216,7 @@ public abstract class StompTestBase extends ActiveMQTestBase {
securityManager.getConfiguration().addRole(defUser, role);
config.getSecurityRoles().put("#", new HashSet<Role>() {
{
- add(new Role(role, true, true, true, true, true, true, true, true));
+ add(new Role(role, true, true, true, true, true, true, true, true, true));
}
});
}
@@ -280,7 +281,7 @@ public abstract class StompTestBase extends ActiveMQTestBase {
}
protected String getQueuePrefix() {
- return "jms.queue.";
+ return "";
}
protected String getTopicName() {
@@ -288,7 +289,7 @@ public abstract class StompTestBase extends ActiveMQTestBase {
}
protected String getTopicPrefix() {
- return "jms.topic.";
+ return "";
}
protected void assertChannelClosed() throws InterruptedException {
@@ -301,6 +302,7 @@ public abstract class StompTestBase extends ActiveMQTestBase {
}
public void sendFrame(String data) throws Exception {
+ IntegrationTestLogger.LOGGER.info("Sending: " + data);
sendFrame(0, data);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
index 56338e4..ce94ec3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
@@ -27,6 +27,8 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+
public abstract class AbstractStompClientConnection implements StompClientConnection {
public static final String STOMP_COMMAND = "STOMP";
@@ -91,6 +93,7 @@ public abstract class AbstractStompClientConnection implements StompClientConnec
@Override
public ClientStompFrame sendFrame(ClientStompFrame frame) throws IOException, InterruptedException {
ClientStompFrame response = null;
+ IntegrationTestLogger.LOGGER.info("Sending frame:\n" + frame);
ByteBuffer buffer = frame.toByteBuffer();
while (buffer.remaining() > 0) {
socketChannel.write(buffer);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
index 4d42a34..da69d96 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
@@ -2489,7 +2489,7 @@ public class StompV11Test extends StompV11TestBase {
ClientStompFrame frame = connV11.createFrame("SEND");
String guid = UUID.randomUUID().toString();
- frame.addHeader("destination", "jms.queue.NonExistentQueue" + guid);
+ frame.addHeader("destination", "NonExistentQueue" + guid);
frame.addHeader("receipt", "1234");
frame.setBody("Hello World");
@@ -2508,7 +2508,7 @@ public class StompV11Test extends StompV11TestBase {
ClientStompFrame frame = connV11.createFrame("SEND");
String guid = UUID.randomUUID().toString();
- frame.addHeader("destination", "jms.queue.NonExistentQueue" + guid);
+ frame.addHeader("destination", "NonExistentQueue" + guid);
frame.addHeader("receipt", "1234");
frame.setBody("Hello World");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
index c1bdccc..341b583 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
@@ -124,7 +124,7 @@ public abstract class StompV11TestBase extends ActiveMQTestBase {
}
protected String getQueuePrefix() {
- return "jms.queue.";
+ return "";
}
protected String getTopicName() {
@@ -132,7 +132,7 @@ public abstract class StompV11TestBase extends ActiveMQTestBase {
}
protected String getTopicPrefix() {
- return "jms.topic.";
+ return "";
}
public void sendMessage(String msg) 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/stomp/v12/StompV12Test.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
index c075da5..b7c0b60 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
@@ -2533,7 +2533,7 @@ public class StompV12Test extends StompV11TestBase {
ClientStompFrame frame = connV12.createFrame("SEND");
String guid = UUID.randomUUID().toString();
- frame.addHeader("destination", "jms.queue.NonExistentQueue" + guid);
+ frame.addHeader("destination", "NonExistentQueue" + guid);
frame.addHeader("receipt", "1234");
frame.setBody("Hello World");
@@ -2553,7 +2553,7 @@ public class StompV12Test extends StompV11TestBase {
ClientStompFrame frame = connV12.createFrame("SEND");
String guid = UUID.randomUUID().toString();
- frame.addHeader("destination", "jms.queue.NonExistentQueue" + guid);
+ frame.addHeader("destination", "NonExistentQueue" + guid);
frame.addHeader("receipt", "1234");
frame.setBody("Hello World");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
index 322d9a8..edf0397 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
@@ -87,8 +87,8 @@ public class JMSClusteredTestBase extends ActiveMQTestBase {
jmsServer2.createQueue(false, name, null, true, "/queue/" + name);
jmsServer1.createQueue(false, name, null, true, "/queue/" + name);
- assertTrue(waitForBindings(server1, "jms.queue." + name, false, 1, 0, 10000));
- assertTrue(waitForBindings(server2, "jms.queue." + name, false, 1, 0, 10000));
+ assertTrue(waitForBindings(server1, name, false, 1, 0, 10000));
+ assertTrue(waitForBindings(server2, name, false, 1, 0, 10000));
return (Queue) context1.lookup("/queue/" + name);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/resources/reload-test-jms.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/reload-test-jms.xml b/tests/integration-tests/src/test/resources/reload-test-jms.xml
index 9d56984..e914942 100644
--- a/tests/integration-tests/src/test/resources/reload-test-jms.xml
+++ b/tests/integration-tests/src/test/resources/reload-test-jms.xml
@@ -100,8 +100,8 @@ under the License.
<!--default for catch all-->
<address-setting match="#">
<auto-create-jms-queues>false</auto-create-jms-queues>
- <dead-letter-address>jms.queue.DLQ</dead-letter-address>
- <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <dead-letter-address>DLQ</dead-letter-address>
+ <expiry-address>ExpiryQueue</expiry-address>
<redelivery-delay>0</redelivery-delay>
<max-size-bytes>10485760</max-size-bytes>
<message-counter-history-day-limit>10</message-counter-history-day-limit>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml b/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml
index a9d1016..5195fed 100644
--- a/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml
+++ b/tests/integration-tests/src/test/resources/reload-test-updated-jms.xml
@@ -86,8 +86,8 @@ under the License.
<diverts>
<divert name="myDivert">
- <address>jms.queue.DivertQueue</address>
- <forwarding-address>jms.queue.NewQueue</forwarding-address>
+ <address>DivertQueue</address>
+ <forwarding-address>NewQueue</forwarding-address>
</divert>
</diverts>
@@ -110,8 +110,8 @@ under the License.
<!--default for catch all-->
<address-setting match="#">
<auto-create-jms-queues>false</auto-create-jms-queues>
- <dead-letter-address>jms.queue.NewQueue</dead-letter-address>
- <expiry-address>jms.queue.NewQueue</expiry-address>
+ <dead-letter-address>NewQueue</dead-letter-address>
+ <expiry-address>NewQueue</expiry-address>
<redelivery-delay>0</redelivery-delay>
<max-size-bytes>10485760</max-size-bytes>
<message-counter-history-day-limit>10</message-counter-history-day-limit>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
index 42d6ea5..f309c16 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
@@ -367,7 +367,7 @@ public abstract class ActiveMQServerTestCase {
protected boolean assertRemainingMessages(final int expected) throws Exception {
String queueName = "Queue1";
- Binding binding = servers.get(0).getActiveMQServer().getPostOffice().getBinding(SimpleString.toSimpleString("jms.queue." + queueName));
+ Binding binding = servers.get(0).getActiveMQServer().getPostOffice().getBinding(SimpleString.toSimpleString(queueName));
if (binding != null && binding instanceof LocalQueueBinding) {
((LocalQueueBinding) binding).getQueue().flushExecutor();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/BrowserTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/BrowserTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/BrowserTest.java
index 4256e60..c97e864 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/BrowserTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/BrowserTest.java
@@ -92,7 +92,7 @@ public class BrowserTest extends JMSTestCase {
coreSession.start();
- ClientConsumer browser = coreSession.createConsumer("jms.queue.Queue1", true);
+ ClientConsumer browser = coreSession.createConsumer("Queue1", true);
conn.start();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
index 7534542..da171cb 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
@@ -339,7 +339,7 @@ public class MessageProducerTest extends JMSTestCase {
@Test
public void testCreateProducerOnInexistentDestination() throws Exception {
- getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsTopics(false));
+ getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsQueues(false));
Connection pconn = createConnection();
try {
Session ps = pconn.createSession(false, Session.AUTO_ACKNOWLEDGE);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
index 63b8561..016b052 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
@@ -169,7 +169,7 @@ public class SessionTest extends ActiveMQServerTestCase {
@Test
public void testCreateNonExistentTopic() throws Exception {
- getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsTopics(false));
+ getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsQueues(false));
Connection conn = getConnectionFactory().createConnection();
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
try {
@@ -197,7 +197,7 @@ public class SessionTest extends ActiveMQServerTestCase {
@Test
public void testCreateTopicWhileQueueWithSameNameExists() throws Exception {
- getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsTopics(false));
+ getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsQueues(false));
Connection conn = getConnectionFactory().createConnection();
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
try {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
index 7aa0af3..994c1a6 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
@@ -1125,6 +1125,11 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
}
@Override
+ public void createAddress(SimpleString address, boolean multicast) throws ActiveMQException {
+
+ }
+
+ @Override
public FakeSession setSendAcknowledgementHandler(final SendAcknowledgementHandler handler) {
return this;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
index c749ef1..0fe7b47 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
@@ -31,7 +31,6 @@ import java.util.Set;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.artemis.api.core.management.ResourceNames;
import org.apache.activemq.artemis.api.jms.JMSFactoryType;
import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
import org.apache.activemq.artemis.api.jms.management.TopicControl;
@@ -287,11 +286,10 @@ public class LocalTestServer implements Server, Runnable {
public void configureSecurityForDestination(final String destName,
final boolean isQueue,
final Set<Role> roles) throws Exception {
- String destination = (isQueue ? "jms.queue." : "jms.topic.") + destName;
if (roles != null) {
- getActiveMQServer().getSecurityRepository().addMatch(destination, roles);
+ getActiveMQServer().getSecurityRepository().addMatch(destName, roles);
} else {
- getActiveMQServer().getSecurityRepository().removeMatch(destination);
+ getActiveMQServer().getSecurityRepository().removeMatch(destName);
}
}
@@ -330,7 +328,7 @@ public class LocalTestServer implements Server, Runnable {
@Override
public Long getMessageCountForQueue(final String queueName) throws Exception {
- JMSQueueControl queue = (JMSQueueControl) getActiveMQServer().getManagementService().getResource(ResourceNames.JMS_QUEUE + queueName);
+ JMSQueueControl queue = (JMSQueueControl) getActiveMQServer().getManagementService().getResource(queueName);
if (queue != null) {
queue.flushExecutor();
return queue.getMessageCount();
@@ -342,10 +340,10 @@ public class LocalTestServer implements Server, Runnable {
@Override
public void removeAllMessages(final String destination, final boolean isQueue) throws Exception {
if (isQueue) {
- JMSQueueControl queue = (JMSQueueControl) getActiveMQServer().getManagementService().getResource(ResourceNames.JMS_QUEUE + destination);
+ JMSQueueControl queue = (JMSQueueControl) getActiveMQServer().getManagementService().getResource(destination);
queue.removeMessages(null);
} else {
- TopicControl topic = (TopicControl) getActiveMQServer().getManagementService().getResource(ResourceNames.JMS_TOPIC + destination);
+ TopicControl topic = (TopicControl) getActiveMQServer().getManagementService().getResource(destination);
topic.removeMessages(null);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/joram-tests/src/test/java/org/apache/activemq/artemis/amqpJMS/ActiveMQAMQPAdmin.java
----------------------------------------------------------------------
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/amqpJMS/ActiveMQAMQPAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/amqpJMS/ActiveMQAMQPAdmin.java
index 6f6b142..a6e0b74 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/amqpJMS/ActiveMQAMQPAdmin.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/amqpJMS/ActiveMQAMQPAdmin.java
@@ -100,7 +100,7 @@ public class ActiveMQAMQPAdmin extends AbstractAdmin {
public void createQueue(String name) {
super.createQueue(name);
try {
- context.bind(name, new JmsQueue("jms.queue." + name));
+ context.bind(name, new JmsQueue(name));
} catch (NamingException e) {
throw new RuntimeException(e);
}
@@ -110,7 +110,7 @@ public class ActiveMQAMQPAdmin extends AbstractAdmin {
public void createTopic(String name) {
super.createTopic(name);
try {
- context.bind(name, new JmsTopic("jms.topic." + name));
+ context.bind(name, new JmsTopic(name));
} catch (NamingException e) {
throw new RuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/headers/MessageHeaderTest.java
----------------------------------------------------------------------
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/headers/MessageHeaderTest.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/headers/MessageHeaderTest.java
index 915f2cc..1317ff8 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/headers/MessageHeaderTest.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/message/headers/MessageHeaderTest.java
@@ -180,7 +180,9 @@ public class MessageHeaderTest extends PTPTestCase {
Assert.assertEquals("sec. 3.4.1 After completion of the send it holds the destination object specified " + "by the sending method.\n", senderQueue, message.getJMSDestination());
Message msg = receiver.receive(TestConfig.TIMEOUT);
- Assert.assertEquals("sec. 3.4.1 When a message is received, its destination value must be equivalent " + " to the value assigned when it was sent.\n", ((Queue) message.getJMSDestination()).getQueueName(), ((Queue) msg.getJMSDestination()).getQueueName());
+ String one = ((Queue) message.getJMSDestination()).getQueueName();
+ String two = ((Queue) msg.getJMSDestination()).getQueueName();
+ Assert.assertEquals("sec. 3.4.1 When a message is received, its destination value must be equivalent " + " to the value assigned when it was sent.\n", one, two);
admin.deleteQueue("anotherQueue");
} catch (JMSException e) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/SendReceiveMultiThreadTest.java
----------------------------------------------------------------------
diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/SendReceiveMultiThreadTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/SendReceiveMultiThreadTest.java
index 2a89afb..92fa6c8 100644
--- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/SendReceiveMultiThreadTest.java
+++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/SendReceiveMultiThreadTest.java
@@ -78,9 +78,9 @@ public class SendReceiveMultiThreadTest extends ActiveMQTestBase {
server.start();
- Queue queue = server.createQueue(SimpleString.toSimpleString("jms.queue.performanceQueue"), SimpleString.toSimpleString("jms.queue.performanceQueue"), null, true, false);
+ Queue queue = server.createQueue(SimpleString.toSimpleString("performanceQueue"), SimpleString.toSimpleString("performanceQueue"), null, true, false);
- Queue queue2 = server.createQueue(SimpleString.toSimpleString("jms.queue.stationaryQueue"), SimpleString.toSimpleString("jms.queue.stationaryQueue"), null, true, false);
+ Queue queue2 = server.createQueue(SimpleString.toSimpleString("stationaryQueue"), SimpleString.toSimpleString("stationaryQueue"), null, true, false);
MyThread[] threads = new MyThread[NUMBER_OF_THREADS];
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
index c797955..3718afb 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
@@ -43,9 +43,9 @@ public class WildcardAddressManagerUnitTest extends ActiveMQTestBase {
public void testUnitOnWildCardFailingScenario() throws Exception {
int errors = 0;
WildcardAddressManager ad = new WildcardAddressManager(new BindingFactoryFake());
- ad.addBinding(new BindingFake("jms.topic.Topic1", "jms.topic.Topic1"));
- ad.addBinding(new BindingFake("jms.topic.Topic1", "one"));
- ad.addBinding(new BindingFake("jms.topic.*", "two"));
+ ad.addBinding(new BindingFake("Topic1", "Topic1"));
+ ad.addBinding(new BindingFake("Topic1", "one"));
+ ad.addBinding(new BindingFake("*", "two"));
ad.removeBinding(SimpleString.toSimpleString("one"), null);
try {
ad.removeBinding(SimpleString.toSimpleString("two"), null);
@@ -57,7 +57,7 @@ public class WildcardAddressManagerUnitTest extends ActiveMQTestBase {
e.printStackTrace();
}
try {
- ad.addBinding(new BindingFake("jms.topic.Topic1", "three"));
+ ad.addBinding(new BindingFake("Topic1", "three"));
} catch (Throwable e) {
// We are not failing the test here as this test is replicating the exact scenario
// that was happening under https://issues.jboss.org/browse/HORNETQ-988
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java
index 87da4cc..0df0e89 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/security/impl/ActiveMQSecurityManagerImplTest.java
@@ -59,22 +59,22 @@ public class ActiveMQSecurityManagerImplTest extends ActiveMQTestBase {
Assert.assertTrue(securityManager.validateUser("guest", "password"));
Assert.assertFalse(securityManager.validateUser(null, "wrongpass"));
HashSet<Role> roles = new HashSet<>();
- roles.add(new Role("guest", true, true, true, true, true, true, true, true));
+ roles.add(new Role("guest", true, true, true, true, true, true, true, true, true));
Assert.assertTrue(securityManager.validateUserAndRole(null, null, roles, CheckType.CREATE_DURABLE_QUEUE));
Assert.assertTrue(securityManager.validateUserAndRole(null, null, roles, CheckType.SEND));
Assert.assertTrue(securityManager.validateUserAndRole(null, null, roles, CheckType.CONSUME));
roles = new HashSet<>();
- roles.add(new Role("guest", true, true, false, true, true, true, true, true));
+ roles.add(new Role("guest", true, true, false, true, true, true, true, true, true));
Assert.assertFalse(securityManager.validateUserAndRole(null, null, roles, CheckType.CREATE_DURABLE_QUEUE));
Assert.assertTrue(securityManager.validateUserAndRole(null, null, roles, CheckType.SEND));
Assert.assertTrue(securityManager.validateUserAndRole(null, null, roles, CheckType.CONSUME));
roles = new HashSet<>();
- roles.add(new Role("guest", true, false, false, true, true, true, true, true));
+ roles.add(new Role("guest", true, false, false, true, true, true, true, true, true));
Assert.assertFalse(securityManager.validateUserAndRole(null, null, roles, CheckType.CREATE_DURABLE_QUEUE));
Assert.assertTrue(securityManager.validateUserAndRole(null, null, roles, CheckType.SEND));
Assert.assertFalse(securityManager.validateUserAndRole(null, null, roles, CheckType.CONSUME));
roles = new HashSet<>();
- roles.add(new Role("guest", false, false, false, true, true, true, true, true));
+ roles.add(new Role("guest", false, false, false, true, true, true, true, true, true));
Assert.assertFalse(securityManager.validateUserAndRole(null, null, roles, CheckType.CREATE_DURABLE_QUEUE));
Assert.assertFalse(securityManager.validateUserAndRole(null, null, roles, CheckType.SEND));
Assert.assertFalse(securityManager.validateUserAndRole(null, null, roles, CheckType.CONSUME));
@@ -124,19 +124,19 @@ public class ActiveMQSecurityManagerImplTest extends ActiveMQTestBase {
securityManager.getConfiguration().addRole("newuser1", "role3");
securityManager.getConfiguration().addRole("newuser1", "role4");
HashSet<Role> roles = new HashSet<>();
- roles.add(new Role("role1", true, true, true, true, true, true, true, true));
+ roles.add(new Role("role1", true, true, true, true, true, true, true, true, true));
Assert.assertTrue(securityManager.validateUserAndRole("newuser1", "newpassword1", roles, CheckType.SEND));
roles = new HashSet<>();
- roles.add(new Role("role2", true, true, true, true, true, true, true, true));
+ roles.add(new Role("role2", true, true, true, true, true, true, true, true, true));
Assert.assertTrue(securityManager.validateUserAndRole("newuser1", "newpassword1", roles, CheckType.SEND));
roles = new HashSet<>();
- roles.add(new Role("role3", true, true, true, true, true, true, true, true));
+ roles.add(new Role("role3", true, true, true, true, true, true, true, true, true));
Assert.assertTrue(securityManager.validateUserAndRole("newuser1", "newpassword1", roles, CheckType.SEND));
roles = new HashSet<>();
- roles.add(new Role("role4", true, true, true, true, true, true, true, true));
+ roles.add(new Role("role4", true, true, true, true, true, true, true, true, true));
Assert.assertTrue(securityManager.validateUserAndRole("newuser1", "newpassword1", roles, CheckType.SEND));
roles = new HashSet<>();
- roles.add(new Role("role5", true, true, true, true, true, true, true, true));
+ roles.add(new Role("role5", true, true, true, true, true, true, true, true, true));
Assert.assertFalse(securityManager.validateUserAndRole("newuser1", "newpassword1", roles, CheckType.SEND));
}
@@ -150,19 +150,19 @@ public class ActiveMQSecurityManagerImplTest extends ActiveMQTestBase {
securityManager.getConfiguration().removeRole("newuser1", "role2");
securityManager.getConfiguration().removeRole("newuser1", "role4");
HashSet<Role> roles = new HashSet<>();
- roles.add(new Role("role1", true, true, true, true, true, true, true, true));
+ roles.add(new Role("role1", true, true, true, true, true, true, true, true, true));
Assert.assertTrue(securityManager.validateUserAndRole("newuser1", "newpassword1", roles, CheckType.SEND));
roles = new HashSet<>();
- roles.add(new Role("role2", true, true, true, true, true, true, true, true));
+ roles.add(new Role("role2", true, true, true, true, true, true, true, true, true));
Assert.assertFalse(securityManager.validateUserAndRole("newuser1", "newpassword1", roles, CheckType.SEND));
roles = new HashSet<>();
- roles.add(new Role("role3", true, true, true, true, true, true, true, true));
+ roles.add(new Role("role3", true, true, true, true, true, true, true, true, true));
Assert.assertTrue(securityManager.validateUserAndRole("newuser1", "newpassword1", roles, CheckType.SEND));
roles = new HashSet<>();
- roles.add(new Role("role4", true, true, true, true, true, true, true, true));
+ roles.add(new Role("role4", true, true, true, true, true, true, true, true, true));
Assert.assertFalse(securityManager.validateUserAndRole("newuser1", "newpassword1", roles, CheckType.SEND));
roles = new HashSet<>();
- roles.add(new Role("role5", true, true, true, true, true, true, true, true));
+ roles.add(new Role("role5", true, true, true, true, true, true, true, true, true));
Assert.assertFalse(securityManager.validateUserAndRole("newuser1", "newpassword1", roles, CheckType.SEND));
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6303fcb4/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java
index 06389ec..5c66bc1 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/ActiveMQDestinationTest.java
@@ -26,6 +26,9 @@ import org.apache.activemq.artemis.utils.RandomUtil;
import org.junit.Assert;
import org.junit.Test;
+import static org.apache.activemq.artemis.jms.client.ActiveMQDestination.QUEUE_QUALIFIED_PREFIX;
+import static org.apache.activemq.artemis.jms.client.ActiveMQDestination.TOPIC_QUALIFIED_PREFIX;
+
public class ActiveMQDestinationTest extends ActiveMQTestBase {
// Constants -----------------------------------------------------
@@ -40,10 +43,10 @@ public class ActiveMQDestinationTest extends ActiveMQTestBase {
@Test
public void testEquals() throws Exception {
String destinationName = RandomUtil.randomString();
- String address = ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + destinationName;
- ActiveMQDestination destination = (ActiveMQDestination) ActiveMQDestination.fromAddress(address);
- ActiveMQDestination sameDestination = (ActiveMQDestination) ActiveMQDestination.fromAddress(address);
- ActiveMQDestination differentDestination = (ActiveMQDestination) ActiveMQDestination.fromAddress(address + RandomUtil.randomString());
+ String address = QUEUE_QUALIFIED_PREFIX + destinationName;
+ ActiveMQDestination destination = (ActiveMQDestination) ActiveMQDestination.fromPrefixedName(address);
+ ActiveMQDestination sameDestination = (ActiveMQDestination) ActiveMQDestination.fromPrefixedName(address);
+ ActiveMQDestination differentDestination = (ActiveMQDestination) ActiveMQDestination.fromPrefixedName(address + RandomUtil.randomString());
Assert.assertFalse(destination.equals(null));
Assert.assertTrue(destination.equals(destination));
@@ -54,8 +57,8 @@ public class ActiveMQDestinationTest extends ActiveMQTestBase {
@Test
public void testFromAddressWithQueueAddressPrefix() throws Exception {
String destinationName = RandomUtil.randomString();
- String address = ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + destinationName;
- ActiveMQDestination destination = (ActiveMQDestination) ActiveMQDestination.fromAddress(address);
+ String address = QUEUE_QUALIFIED_PREFIX + destinationName;
+ ActiveMQDestination destination = (ActiveMQDestination) ActiveMQDestination.fromPrefixedName(address);
Assert.assertTrue(destination instanceof Queue);
Assert.assertEquals(destinationName, ((Queue) destination).getQueueName());
}
@@ -63,8 +66,8 @@ public class ActiveMQDestinationTest extends ActiveMQTestBase {
@Test
public void testFromAddressWithTopicAddressPrefix() throws Exception {
String destinationName = RandomUtil.randomString();
- String address = ActiveMQDestination.JMS_TOPIC_ADDRESS_PREFIX + destinationName;
- ActiveMQDestination destination = (ActiveMQDestination) ActiveMQDestination.fromAddress(address);
+ String address = TOPIC_QUALIFIED_PREFIX + destinationName;
+ ActiveMQDestination destination = (ActiveMQDestination) ActiveMQDestination.fromPrefixedName(address);
Assert.assertTrue(destination instanceof Topic);
Assert.assertEquals(destinationName, ((Topic) destination).getTopicName());
}
@@ -75,7 +78,7 @@ public class ActiveMQDestinationTest extends ActiveMQTestBase {
String destinationName = RandomUtil.randomString();
String address = invalidPrefix + destinationName;
try {
- ActiveMQDestination.fromAddress(address);
+ ActiveMQDestination.fromPrefixedName(address);
Assert.fail("IllegalArgumentException");
} catch (JMSRuntimeException e) {
}