http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java index 15cb8b6..877d5a7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java @@ -132,7 +132,8 @@ public class MQTTTestSupport extends ActiveMQTestBase { addMQTTConnector(); AddressSettings addressSettings = new AddressSettings(); addressSettings.setMaxSizeBytes(999999999); - addressSettings.setAutoCreateJmsQueues(true); + addressSettings.setAutoCreateQueues(true); + addressSettings.setAutoCreateAddresses(true); server.getAddressSettingsRepository().addMatch("#", addressSettings); server.start();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 52f090d..ac995c2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java @@ -64,7 +64,7 @@ public class OpenWireTestBase extends ActiveMQTestBase { Configuration serverConfig = server.getConfiguration(); - serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateJmsQueues(false).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ"))); + serverConfig.getAddressesSettings().put("#", new AddressSettings().setAutoCreateQueues(false).setAutoCreateAddresses(false).setDeadLetterAddress(new SimpleString("ActiveMQ.DLQ"))); serverConfig.setSecurityEnabled(enableSecurity); @@ -75,23 +75,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, true); + Role senderRole = new Role("sender", true, false, false, false, true, true, false, false, true, 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, false); + Role receiverRole = new Role("receiver", false, true, false, false, true, true, false, true, false, 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, false); + Role guestRole = new Role("guest", false, 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, false); + Role destRole = new Role("manager", false, false, false, false, true, true, false, false, false, false); Set<Role> roles = new HashSet<>(); roles.add(senderRole); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 f739b3e..4fccfa3 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 @@ -404,6 +404,13 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { @Test public void testSimpleTempQueue() throws Exception { + AddressSettings addressSetting = new AddressSettings(); + addressSetting.setAutoCreateQueues(true); + addressSetting.setAutoCreateAddresses(true); + + String address = "#"; + server.getAddressSettingsRepository().addMatch(address, addressSetting); + connection.start(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -440,17 +447,13 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { @Test public void testInvalidDestinationExceptionWhenNoQueueExistsOnCreateProducer() throws Exception { - AddressSettings addressSetting = new AddressSettings(); - addressSetting.setAutoCreateJmsQueues(false); - - server.getAddressSettingsRepository().addMatch("foo", addressSetting); - connection.start(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Queue queue = session.createQueue("foo"); try { session.createProducer(queue); + fail("Should have thrown an exception creating a producer here"); } catch (JMSException expected) { } session.close(); @@ -459,7 +462,8 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { @Test public void testAutoDestinationCreationOnProducerSend() throws JMSException { AddressSettings addressSetting = new AddressSettings(); - addressSetting.setAutoCreateJmsQueues(true); + addressSetting.setAutoCreateQueues(true); + addressSetting.setAutoCreateAddresses(true); String address = "foo"; server.getAddressSettingsRepository().addMatch(address, addressSetting); @@ -481,7 +485,8 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { @Test public void testAutoDestinationCreationOnConsumer() throws JMSException { AddressSettings addressSetting = new AddressSettings(); - addressSetting.setAutoCreateJmsQueues(true); + addressSetting.setAutoCreateQueues(true); + addressSetting.setAutoCreateAddresses(true); String address = "foo"; server.getAddressSettingsRepository().addMatch(address, addressSetting); @@ -504,7 +509,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest { @Test public void testAutoDestinationNoCreationOnConsumer() throws JMSException { AddressSettings addressSetting = new AddressSettings(); - addressSetting.setAutoCreateJmsQueues(false); + addressSetting.setAutoCreateQueues(false); String address = "foo"; server.getAddressSettingsRepository().addMatch(address, addressSetting); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 8f15998..b525e9d 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", "a1")); + addSetting(new PersistedRoles("a#", "a1", "a1", "a1", "a1", "a1", "a1", "a1", "a1", "a1", "a1")); - addSetting(new PersistedRoles("a2", "a1", null, "a1", "a1", "a1", "a1", "a1", "a1", "a1")); + addSetting(new PersistedRoles("a2", "a1", null, "a1", "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", "a1")); + addSetting(new PersistedRoles("a2", "a1", null, "a1", "a1", "a1", "a1", "a1", "a1", "a1", "a1")); - addSetting(new PersistedRoles("a3", "a1", null, "a1", "a1", "a1", "a1", "a1", "a1", "a1")); + addSetting(new PersistedRoles("a3", "a1", null, "a1", "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", "a1")); + addSetting(new PersistedRoles("a#", "a1", "a1", "a1", "a1", "a1", "a1", "a1", "a1", "a1", "a1")); journal.stop(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 c25d3db..143ec27 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, false); + Role role = new Role("arole", false, true, false, 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/0861be14/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 895ebbe..6956499 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, true); + Role role = new Role("arole", true, 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/0861be14/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 a96c00e..feed83c 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, true); + Role role = new Role("arole", true, 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/0861be14/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 c85140d..ab32ad3 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, true); + Role role = new Role("arole", true, 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/0861be14/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 5bfdc62..caacdd0 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, false)); + roles.add(new Role("programmers", false, 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, true)); + roles.add(new Role("admins", true, 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/0861be14/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 d08afed..2829d80 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, false)); + roles.add(new Role("programmers", false, 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, false)); + aRoles.add(new Role(QUEUE_A.toString(), false, true, false, 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, false)); + bRoles.add(new Role(QUEUE_B.toString(), false, true, false, 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, false)); + roles.add(new Role("programmers", false, 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, true)); + roles.add(new Role("programmers", true, 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, true)); + roles.add(new Role("programmers", true, 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, true)); + roles.add(new Role("bar", true, true, true, true, true, true, true, false, true, 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, false); + Role role = new Role("arole", false, false, true, false, 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, false); + Role role = new Role("arole", false, 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, false); + Role role = new Role("arole", false, false, true, true, false, 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, false); + Role role = new Role("arole", false, false, true, false, 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, false); + Role role = new Role("arole", false, false, false, false, true, false, 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, false); + Role role = new Role("arole", false, 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, false); + Role role = new Role("arole", false, false, false, false, true, true, false, 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, false); + Role role = new Role("arole", false, false, false, false, true, false, 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, false); + Role role = new Role("arole", true, true, true, false, 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, false); + role = new Role("arole", false, false, true, false, 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, false); + Role role = new Role("arole", false, false, true, false, 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, false); + Role role = new Role("arole", false, false, true, false, 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, false); - Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false); + Role role = new Role("arole", false, true, false, false, false, false, false, false, false, false); + Role sendRole = new Role("guest", true, false, true, false, 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, false); - Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false); + Role role = new Role("arole", false, false, false, false, false, false, false, false, false, false); + Role sendRole = new Role("guest", true, false, true, false, 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, 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); + Role role = new Role("arole", false, false, false, false, false, false, false, false, false, false); + Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false, false); + Role receiveRole = new Role("receiver", false, true, false, 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, 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); + Role role = new Role("arole", false, false, false, false, false, false, false, false, false, false); + Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false, false); + Role receiveRole = new Role("receiver", false, true, false, 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, false); + Role role = new Role("arole", false, 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, false); + Role sendRole = new Role("guest", true, false, true, false, false, false, false, false, false, false); System.out.println("guest:" + sendRole); - Role receiveRole = new Role("receiver", false, true, false, false, false, false, false, false, false); + Role receiveRole = new Role("receiver", false, true, false, 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, false); + Role role = new Role("arole", false, false, false, false, false, false, true, false, 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, false); + Role role = new Role("arole", false, false, true, false, 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, false); + Role role = new Role("arole", false, false, true, false, 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, true); + Role all = new Role("all", true, 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, true)); + add.add(new Role("user", true, true, true, true, true, true, false, true, 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, 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)); + add1.add(new Role("user", false, false, true, true, true, true, false, true, true, true)); + add1.add(new Role("europe-user", true, false, false, false, false, false, false, true, true, true)); + add1.add(new Role("news-user", false, true, false, false, false, false, false, true, 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, 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)); + add2.add(new Role("user", false, false, true, true, true, true, false, true, true, true)); + add2.add(new Role("us-user", true, false, false, false, false, false, false, true, true, true)); + add2.add(new Role("news-user", false, true, false, false, false, false, false, true, 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, true); + Role all = new Role("all", true, 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, true)); + add.add(new Role("user", true, true, true, true, true, true, false, true, 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, 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)); + add1.add(new Role("user", false, false, true, true, true, true, false, true, true, true)); + add1.add(new Role("europe-user", true, false, false, false, false, false, false, true, true, true)); + add1.add(new Role("news-user", false, true, false, false, false, false, false, true, 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, 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)); + add2.add(new Role("user", false, false, true, true, true, true, false, true, true, true)); + add2.add(new Role("us-user", true, false, false, false, false, false, false, true, true, true)); + add2.add(new Role("news-user", false, true, false, false, false, false, false, true, true, true)); repository.addMatch("news.us.#", add2); ClientSession billConnection = null; ClientSession andrewConnection = null; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 b6ebc12..a672bb1 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, false); + Role role = new Role("arole", false, false, false, false, true, true, false, true, false, false); Set<Role> roles = new HashSet<>(); roles.add(role); server.getSecurityRepository().addMatch("#", roles); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 6529d9b..6716e45 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, false); - Role receiveRole = new Role("consumers", false, true, false, false, false, false, false, false, false); + Role sendRole = new Role("producers", true, false, true, false, true, false, false, false, false, false); + Role receiveRole = new Role("consumers", false, true, false, 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/0861be14/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 e7dcc91..f1def68 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 @@ -31,6 +31,7 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.client.ActiveMQClient; import org.apache.activemq.artemis.api.core.client.ClientMessage; @@ -38,6 +39,8 @@ 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.ManagementHelper; +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; @@ -1406,4 +1409,59 @@ public class StompTest extends StompTestBase { frame = conn.sendFrame(frame); assertEquals(Stomp.Responses.ERROR, frame.getCommand()); } + + @Test + public void testGetManagementAttributeFromStomp() throws Exception { + conn.connect(defUser, defPass); + + subscribe(conn, null); + + ClientStompFrame frame = conn.createFrame(Stomp.Commands.SEND) + .addHeader(Stomp.Headers.Send.DESTINATION, ActiveMQDefaultConfiguration.getDefaultManagementAddress().toString()) + .addHeader(Stomp.Headers.Send.REPLY_TO, getQueuePrefix() + getQueueName()) + .addHeader(ManagementHelper.HDR_RESOURCE_NAME.toString(), ResourceNames.QUEUE + getQueuePrefix() + getQueueName()) + .addHeader(ManagementHelper.HDR_ATTRIBUTE.toString(), "Address"); + + conn.sendFrame(frame); + + frame = conn.receiveFrame(10000); + + IntegrationTestLogger.LOGGER.info("Received: " + frame); + + Assert.assertEquals(Boolean.TRUE.toString(), frame.getHeader(ManagementHelper.HDR_OPERATION_SUCCEEDED.toString())); + // the address will be returned in the message body in a JSON array + Assert.assertEquals("[\"" + getQueuePrefix() + getQueueName() + "\"]", frame.getBody()); + + unsubscribe(conn, null); + + conn.disconnect(); + } + + @Test + public void testInvokeOperationFromStomp() throws Exception { + conn.connect(defUser, defPass); + + subscribe(conn, null); + + ClientStompFrame frame = conn.createFrame(Stomp.Commands.SEND) + .addHeader(Stomp.Headers.Send.DESTINATION, ActiveMQDefaultConfiguration.getDefaultManagementAddress().toString()) + .addHeader(Stomp.Headers.Send.REPLY_TO, getQueuePrefix() + getQueueName()) + .addHeader(ManagementHelper.HDR_RESOURCE_NAME.toString(), ResourceNames.QUEUE + getQueuePrefix() + getQueueName()) + .addHeader(ManagementHelper.HDR_OPERATION_NAME.toString(), "countMessages") + .setBody("[\"color = 'blue'\"]"); + + conn.sendFrame(frame); + + frame = conn.receiveFrame(10000); + + IntegrationTestLogger.LOGGER.info("Received: " + frame); + + Assert.assertEquals(Boolean.TRUE.toString(), frame.getHeader(ManagementHelper.HDR_OPERATION_SUCCEEDED.toString())); + // there is no such messages => 0 returned in a JSON array + Assert.assertEquals("[0]", frame.getBody()); + + unsubscribe(conn, null); + + conn.disconnect(); + } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 bcac436..2cde849 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 @@ -177,7 +177,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, true)); + add(new Role(role, true, true, true, true, true, true, true, true, true, true)); } }); } @@ -314,20 +314,20 @@ public abstract class StompTestBase extends ActiveMQTestBase { public ClientStompFrame subscribe(StompClientConnection conn, String subscriptionId) throws IOException, InterruptedException { - return subscribe(conn, subscriptionId, Stomp.Headers.Subscribe.AckModeValues.AUTO, null, null); + return subscribe(conn, subscriptionId, Stomp.Headers.Subscribe.AckModeValues.AUTO); } public ClientStompFrame subscribe(StompClientConnection conn, String subscriptionId, String ack) throws IOException, InterruptedException { - return subscribe(conn, subscriptionId, ack, null, null); + return subscribe(conn, subscriptionId, ack, null); } public ClientStompFrame subscribe(StompClientConnection conn, String subscriptionId, String ack, String durableId) throws IOException, InterruptedException { - return subscribe(conn, subscriptionId, ack, durableId, null); + return subscribe(conn, subscriptionId, ack, durableId, false); } public ClientStompFrame subscribe(StompClientConnection conn, http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 9b1ad93..09fb0ba 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 @@ -354,7 +354,8 @@ public class StompV12Test extends StompTestBase { @Test public void testHeaderRepetitive() throws Exception { AddressSettings addressSettings = new AddressSettings(); - addressSettings.setAutoCreateJmsQueues(false); + addressSettings.setAutoCreateQueues(false); + addressSettings.setAutoCreateAddresses(false); server.getActiveMQServer().getAddressSettingsRepository().addMatch("#", addressSettings); conn.connect(defUser, defPass); @@ -378,7 +379,7 @@ public class StompV12Test extends StompTestBase { //subscribe StompClientConnection newConn = StompClientConnectionFactory.createClientConnection("1.2", hostname, port); newConn.connect(defUser, defPass); - subscribe(newConn, "a-sub"); + subscribe(newConn, "a-sub", null, null, true); frame = newConn.receiveFrame(); @@ -389,7 +390,7 @@ public class StompV12Test extends StompTestBase { Assert.assertEquals("value1", frame.getHeader("foo")); //unsub - unsubscribe(newConn, "a-sub"); + unsubscribe(newConn, "a-sub", true); newConn.disconnect(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 30fdfd4..ac52d02 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 @@ -175,8 +175,6 @@ public class JMSClusteredTestBase extends ActiveMQTestBase { .addConnectorConfiguration(destinationLabel, new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(destination))) .addConnectorConfiguration(sourceLabel, new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(source))) .addClusterConfiguration(new ClusterConnectionConfiguration().setName(destinationLabel) - // TODO should this be changed? - .setAddress("jms") .setConnectorName(sourceLabel) .setRetryInterval(250) .setMaxHops(MAX_HOPS) http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 e914942..5ff7184 100644 --- a/tests/integration-tests/src/test/resources/reload-test-jms.xml +++ b/tests/integration-tests/src/test/resources/reload-test-jms.xml @@ -99,7 +99,7 @@ under the License. <address-settings> <!--default for catch all--> <address-setting match="#"> - <auto-create-jms-queues>false</auto-create-jms-queues> + <auto-create-queues>false</auto-create-queues> <dead-letter-address>DLQ</dead-letter-address> <expiry-address>ExpiryQueue</expiry-address> <redelivery-delay>0</redelivery-delay> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 5195fed..1a67013 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 @@ -109,7 +109,7 @@ under the License. <address-settings> <!--default for catch all--> <address-setting match="#"> - <auto-create-jms-queues>false</auto-create-jms-queues> + <auto-create-queues>false</auto-create-queues> <dead-letter-address>NewQueue</dead-letter-address> <expiry-address>NewQueue</expiry-address> <redelivery-delay>0</redelivery-delay> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 fc97cd4..d001f5b 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,8 +339,8 @@ public class MessageProducerTest extends JMSTestCase { @Test public void testCreateProducerOnInexistentDestination() throws Exception { - getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsQueues(false)); - getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsTopics(false)); + getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateQueues(false)); + getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateAddresses(false)); Connection pconn = createConnection(); try { Session ps = pconn.createSession(false, Session.AUTO_ACKNOWLEDGE); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 1ff79d0..c2e700a 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java @@ -104,7 +104,7 @@ public class SessionTest extends ActiveMQServerTestCase { @Test public void testCreateNonExistentQueue() throws Exception { AddressSettings addressSettings = new AddressSettings(); - addressSettings.setAutoCreateJmsQueues(false); + addressSettings.setAutoCreateQueues(false); getJmsServer().getAddressSettingsRepository().addMatch("#", addressSettings); Connection conn = getConnectionFactory().createConnection(); @@ -134,7 +134,8 @@ public class SessionTest extends ActiveMQServerTestCase { @Test public void testCreateQueueWhileTopicWithSameNameExists() throws Exception { AddressSettings addressSettings = new AddressSettings(); - addressSettings.setAutoCreateJmsQueues(false); + addressSettings.setAutoCreateQueues(false); + addressSettings.setAutoCreateAddresses(false); getJmsServer().getAddressSettingsRepository().addMatch("#", addressSettings); Connection conn = getConnectionFactory().createConnection(); @@ -169,8 +170,8 @@ public class SessionTest extends ActiveMQServerTestCase { @Test public void testCreateNonExistentTopic() throws Exception { - getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsQueues(false)); - getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsTopics(false)); + getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateQueues(false)); + getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateAddresses(false)); Connection conn = getConnectionFactory().createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); try { @@ -198,8 +199,8 @@ public class SessionTest extends ActiveMQServerTestCase { @Test public void testCreateTopicWhileQueueWithSameNameExists() throws Exception { - getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsQueues(false)); - getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateJmsTopics(false)); + getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateQueues(false)); + getJmsServer().getAddressSettingsRepository().addMatch("#", new AddressSettings().setAutoCreateAddresses(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/0861be14/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 f8b7153..6d70569 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 @@ -821,18 +821,6 @@ public class MessageHeaderTest extends MessageHeaderTestBase { final boolean durable) throws ActiveMQException { } - public void createQueue(final SimpleString address, - final SimpleString queueName, - final boolean durable, - final boolean temporary) throws ActiveMQException { - } - - public void createQueue(final String address, - final String queueName, - final boolean durable, - final boolean temporary) throws ActiveMQException { - } - @Override public void createQueue(final String address, final String queueName, @@ -841,6 +829,24 @@ public class MessageHeaderTest extends MessageHeaderTestBase { } @Override + public void createQueue(SimpleString address, + SimpleString queueName, + SimpleString filter, + boolean durable, + boolean autoCreated) throws ActiveMQException { + + } + + @Override + public void createQueue(String address, + String queueName, + String filter, + boolean durable, + boolean autoCreated) throws ActiveMQException { + + } + + @Override public void createTemporaryQueue(final SimpleString address, final SimpleString queueName) throws ActiveMQException { } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/TopicSessionTest.java ---------------------------------------------------------------------- diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/TopicSessionTest.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/TopicSessionTest.java index 7ad6c76..6eab31d 100644 --- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/TopicSessionTest.java +++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/session/TopicSessionTest.java @@ -115,6 +115,8 @@ public class TopicSessionTest extends PubSubTestCase { TextMessage m = (TextMessage) subscriber.receive(TestConfig.TIMEOUT); Assert.assertTrue(m != null); Assert.assertEquals("test", m.getText()); + subscriber.close(); + subscriberSession.unsubscribe("testTopic"); } catch (JMSException e) { fail(e); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/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 0df0e89..eccdb5f 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, true)); + roles.add(new Role("guest", true, 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, true)); + roles.add(new Role("guest", true, true, false, true, 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, true)); + roles.add(new Role("guest", true, false, false, true, 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, true)); + roles.add(new Role("guest", false, false, false, true, 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, true)); + roles.add(new Role("role1", true, 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, true)); + roles.add(new Role("role2", true, 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, true)); + roles.add(new Role("role3", true, 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, true)); + roles.add(new Role("role4", true, 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, true)); + roles.add(new Role("role5", true, 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, true)); + roles.add(new Role("role1", true, 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, true)); + roles.add(new Role("role2", true, 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, true)); + roles.add(new Role("role3", true, 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, true)); + roles.add(new Role("role4", true, 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, true)); + roles.add(new Role("role5", true, true, true, true, true, true, true, true, true, true)); Assert.assertFalse(securityManager.validateUserAndRole("newuser1", "newpassword1", roles, CheckType.SEND)); } }
