http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java index 8e86067..2d94fa3 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java @@ -50,7 +50,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.artemis.api.core.Pair; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.api.core.management.ResourceNames; import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl; import org.apache.activemq.artemis.core.config.BridgeConfiguration; import org.apache.activemq.artemis.core.config.Configuration; @@ -624,14 +623,15 @@ public class ActiveMQServerImpl implements ActiveMQServer { return postOffice.isAddressBound(SimpleString.toSimpleString(address)); } + // TODO: this should probably look at the addresses too, not just queue bindings @Override public BindingQueryResult bindingQuery(SimpleString address) throws Exception { if (address == null) { throw ActiveMQMessageBundle.BUNDLE.addressIsNull(); } - boolean autoCreateJmsQueues = address.toString().startsWith(ResourceNames.JMS_QUEUE) && getAddressSettingsRepository().getMatch(address.toString()).isAutoCreateJmsQueues(); - boolean autoCreateJmsTopics = address.toString().startsWith(ResourceNames.JMS_TOPIC) && getAddressSettingsRepository().getMatch(address.toString()).isAutoCreateJmsTopics(); + boolean autoCreateJmsQueues = getAddressSettingsRepository().getMatch(address.toString()).isAutoCreateJmsQueues(); + boolean autoCreateJmsTopics = getAddressSettingsRepository().getMatch(address.toString()).isAutoCreateJmsTopics(); List<SimpleString> names = new ArrayList<>(); @@ -660,7 +660,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { throw ActiveMQMessageBundle.BUNDLE.queueNameIsNull(); } - boolean autoCreateJmsQueues = name.toString().startsWith(ResourceNames.JMS_QUEUE) && getAddressSettingsRepository().getMatch(name.toString()).isAutoCreateJmsQueues(); + boolean autoCreateJmsQueues = getAddressSettingsRepository().getMatch(name.toString()).isAutoCreateJmsQueues(); QueueQueryResult response; @@ -1558,11 +1558,8 @@ public class ActiveMQServerImpl implements ActiveMQServer { final Integer maxConsumers, final Boolean deleteOnNoConsumers) throws Exception { - if (resourceName.toString().toLowerCase().startsWith("jms.topic")) { - ActiveMQServerLogger.LOGGER.deployTopic(resourceName); - } else { - ActiveMQServerLogger.LOGGER.deployQueue(resourceName); - } + // TODO: fix logging here as this could be for a topic or queue + ActiveMQServerLogger.LOGGER.deployQueue(resourceName); return createQueue(address, resourceName, filterString, null, durable, temporary, true, false, autoCreated, maxConsumers, deleteOnNoConsumers); } @@ -1592,6 +1589,10 @@ public class ActiveMQServerImpl implements ActiveMQServer { final SecurityAuth session, final boolean checkConsumerCount, final boolean removeConsumers) throws Exception { + if (postOffice == null) { + return; + } + addressSettingsRepository.clearCache(); Binding binding = postOffice.getBinding(queueName); @@ -2141,7 +2142,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { AddressInfo info = new AddressInfo(SimpleString.toSimpleString(config.getName())); info.setRoutingType(config.getRoutingType()); info.setDefaultDeleteOnNoConsumers(config.getDefaultDeleteOnNoConsumers()); - info.setDefaultMaxConsumers(config.getDefaultMaxConsumers()); + info.setDefaultMaxQueueConsumers(config.getDefaultMaxConsumers()); createOrUpdateAddressInfo(info); deployQueuesFromListCoreQueueConfiguration(config.getQueueConfigurations()); @@ -2254,20 +2255,34 @@ public class ActiveMQServerImpl implements ActiveMQServer { List<PersistedRoles> roles = storageManager.recoverPersistedRoles(); for (PersistedRoles roleItem : roles) { - Set<Role> setRoles = SecurityFormatter.createSecurity(roleItem.getSendRoles(), roleItem.getConsumeRoles(), roleItem.getCreateDurableQueueRoles(), roleItem.getDeleteDurableQueueRoles(), roleItem.getCreateNonDurableQueueRoles(), roleItem.getDeleteNonDurableQueueRoles(), roleItem.getManageRoles(), roleItem.getBrowseRoles()); + Set<Role> setRoles = SecurityFormatter.createSecurity(roleItem.getSendRoles(), roleItem.getConsumeRoles(), roleItem.getCreateDurableQueueRoles(), roleItem.getDeleteDurableQueueRoles(), roleItem.getCreateNonDurableQueueRoles(), roleItem.getDeleteNonDurableQueueRoles(), roleItem.getManageRoles(), roleItem.getBrowseRoles(), roleItem.getCreateAddressRoles()); securityRepository.addMatch(roleItem.getAddressMatch().toString(), setRoles); } } @Override - public AddressInfo createOrUpdateAddressInfo(AddressInfo addressInfo) { - return postOffice.addOrUpdateAddressInfo(addressInfo); + public AddressInfo createOrUpdateAddressInfo(AddressInfo addressInfo) throws Exception { + AddressInfo result = postOffice.addOrUpdateAddressInfo(addressInfo); + + // TODO: is this the right way to do this? + long txID = storageManager.generateID(); + storageManager.addAddressBinding(txID, addressInfo); + storageManager.commitBindings(txID); + + return result; } @Override - public AddressInfo removeAddressInfo(SimpleString address) { - return postOffice.removeAddressInfo(address); + public AddressInfo removeAddressInfo(SimpleString address) throws Exception { + AddressInfo result = postOffice.removeAddressInfo(address); + + // TODO: is this the right way to do this? +// long txID = storageManager.generateID(); +// storageManager.deleteAddressBinding(txID, getAddressInfo(address).getID()); +// storageManager.commitBindings(txID); + + return result; } @Override @@ -2325,30 +2340,25 @@ public class ActiveMQServerImpl implements ActiveMQServer { final long queueID = storageManager.generateID(); final QueueConfig.Builder queueConfigBuilder; - final SimpleString address; if (addressName == null) { queueConfigBuilder = QueueConfig.builderWith(queueID, queueName); - address = queueName; } else { queueConfigBuilder = QueueConfig.builderWith(queueID, queueName, addressName); - address = addressName; } - - AddressInfo defaultAddressInfo = new AddressInfo(address); + AddressInfo defaultAddressInfo = new AddressInfo(addressName); // FIXME This boils down to a putIfAbsent (avoids race). This should be reflected in the API. - AddressInfo info = postOffice.addAddressInfo(defaultAddressInfo); + AddressInfo info = postOffice.getAddressInfo(addressName); - boolean addressExists = true; if (info == null) { info = defaultAddressInfo; - addressExists = false; } final boolean isDeleteOnNoConsumers = deleteOnNoConsumers == null ? info.isDefaultDeleteOnNoConsumers() : deleteOnNoConsumers; - final int noMaxConsumers = maxConsumers == null ? info.getDefaultMaxConsumers() : maxConsumers; + final int noMaxConsumers = maxConsumers == null ? info.getDefaultMaxQueueConsumers() : maxConsumers; - final QueueConfig queueConfig = queueConfigBuilder.filter(filter) + final QueueConfig queueConfig = queueConfigBuilder + .filter(filter) .pagingManager(pagingManager) .user(user) .durable(durable) @@ -2359,6 +2369,15 @@ public class ActiveMQServerImpl implements ActiveMQServer { .build(); final Queue queue = queueFactory.createQueueWith(queueConfig); + boolean addressAlreadyExists = true; + + if (postOffice.getAddressInfo(queue.getAddress()) == null) { + postOffice.addAddressInfo(new AddressInfo(queue.getAddress()) + .setRoutingType(AddressInfo.RoutingType.MULTICAST) + .setDefaultMaxQueueConsumers(maxConsumers == null ? ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers() : maxConsumers)); + addressAlreadyExists = false; + } + if (transientQueue) { queue.setConsumersRefCount(new TransientQueueManagerImpl(this, queue.getName())); } else if (queue.isAutoCreated()) { @@ -2368,10 +2387,10 @@ public class ActiveMQServerImpl implements ActiveMQServer { final QueueBinding localQueueBinding = new LocalQueueBinding(getAddressInfo(queue.getAddress()), queue, nodeManager.getNodeId()); if (queue.isDurable()) { - if (!addressExists) { - storageManager.addAddressBinding(txID, getAddressInfo(address)); - } storageManager.addQueueBinding(txID, localQueueBinding); + if (!addressAlreadyExists) { + storageManager.addAddressBinding(txID, getAddressInfo(queue.getAddress())); + } } try { @@ -2398,7 +2417,9 @@ public class ActiveMQServerImpl implements ActiveMQServer { throw e; } - managementService.registerAddress(queue.getAddress()); + if (!addressAlreadyExists) { + managementService.registerAddress(queue.getAddress()); + } managementService.registerQueue(queue, queue.getAddress(), storageManager); callPostQueueCreationCallbacks(queue.getName());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java index 7c71c1f..488c4b2 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java @@ -27,7 +27,7 @@ public class AddressInfo { private boolean defaultDeleteOnNoConsumers = ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(); - private int defaultMaxConsumers = ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(); + private int defaultMaxQueueConsumers = ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(); public AddressInfo(SimpleString name) { this.name = name; @@ -51,12 +51,12 @@ public class AddressInfo { return this; } - public int getDefaultMaxConsumers() { - return defaultMaxConsumers; + public int getDefaultMaxQueueConsumers() { + return defaultMaxQueueConsumers; } - public AddressInfo setDefaultMaxConsumers(int defaultMaxConsumers) { - this.defaultMaxConsumers = defaultMaxConsumers; + public AddressInfo setDefaultMaxQueueConsumers(int defaultMaxQueueConsumers) { + this.defaultMaxQueueConsumers = defaultMaxQueueConsumers; return this; } @@ -64,6 +64,17 @@ public class AddressInfo { return name; } + @Override + public String toString() { + StringBuffer buff = new StringBuffer(); + buff.append("AddressInfo [name=" + name); + buff.append(", routingType=" + routingType); + buff.append(", defaultMaxQueueConsumers=" + defaultMaxQueueConsumers); + buff.append(", defaultDeleteOnNoConsumers=" + defaultDeleteOnNoConsumers); + buff.append("]"); + return buff.toString(); + } + public enum RoutingType { MULTICAST, ANYCAST; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java index 6f4cf03..dc64ddd 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java @@ -180,7 +180,8 @@ public class PostOfficeJournalLoader implements JournalLoader { // TODO: figure out what else to set here AddressInfo addressInfo = new AddressInfo(addressBindingInfo.getName()) - .setRoutingType(addressBindingInfo.getRoutingType()); + .setRoutingType(addressBindingInfo.getRoutingType()) + .setDefaultMaxQueueConsumers(addressBindingInfo.getDefaultMaxConsumers()); postOffice.addAddressInfo(addressInfo); managementService.registerAddress(addressInfo.getName()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java index 7e68382..c391b90 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java @@ -40,6 +40,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.Pair; @@ -380,9 +381,9 @@ public class QueueImpl implements Queue { this.autoCreated = autoCreated; - this.maxConsumers = maxConsumers == null ? addressInfo.getDefaultMaxConsumers() : maxConsumers; + this.maxConsumers = maxConsumers == null ? (addressInfo == null ? ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers() : addressInfo.getDefaultMaxQueueConsumers()) : maxConsumers; - this.deleteOnNoConsumers = deleteOnNoConsumers == null ? addressInfo.isDefaultDeleteOnNoConsumers() : deleteOnNoConsumers; + this.deleteOnNoConsumers = deleteOnNoConsumers == null ? (addressInfo == null ? ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers() : addressInfo.isDefaultDeleteOnNoConsumers()) : deleteOnNoConsumers; this.postOffice = postOffice; @@ -1883,7 +1884,7 @@ public class QueueImpl implements Queue { @Override public String toString() { - return "QueueImpl[name=" + name.toString() + ", postOffice=" + this.postOffice + "]@" + Integer.toHexString(System.identityHashCode(this)); + return "QueueImpl[name=" + name.toString() + ", postOffice=" + this.postOffice + ", temp=" + this.temporary + "]@" + Integer.toHexString(System.identityHashCode(this)); } private synchronized void internalAddTail(final MessageReference ref) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java index dc62676..9c1e209 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java @@ -439,7 +439,7 @@ public class ScaleDownHandler { private Integer getQueueID(ClientSession session, SimpleString queueName) throws Exception { Integer queueID = -1; Object result; - try (ClientRequestor requestor = new ClientRequestor(session, "jms.queue.activemq.management")) { + try (ClientRequestor requestor = new ClientRequestor(session, "activemq.management")) { ClientMessage managementMessage = session.createMessage(false); ManagementHelper.putAttribute(managementMessage, "core.queue." + queueName, "ID"); session.start(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java index 4a7a89d..3eb5fcf 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java @@ -41,7 +41,6 @@ import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.client.ClientSession; import org.apache.activemq.artemis.api.core.management.CoreNotificationType; import org.apache.activemq.artemis.api.core.management.ManagementHelper; -import org.apache.activemq.artemis.api.core.management.ResourceNames; import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl; import org.apache.activemq.artemis.core.exception.ActiveMQXAException; import org.apache.activemq.artemis.core.filter.Filter; @@ -520,14 +519,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { server.checkQueueCreationLimit(getUsername()); - Queue queue; - - // any non-temporary JMS destination created via this method should be marked as auto-created - if (!temporary && ((address.toString().startsWith(ResourceNames.JMS_QUEUE) && address.equals(name)) || address.toString().startsWith(ResourceNames.JMS_TOPIC))) { - queue = server.createQueue(address, name, filterString, SimpleString.toSimpleString(getUsername()), durable, temporary, true, maxConsumers, deleteOnNoConsumers); - } else { - queue = server.createQueue(address, name, filterString, SimpleString.toSimpleString(getUsername()), durable, temporary, maxConsumers, deleteOnNoConsumers); - } + Queue queue = server.createQueue(address, name, filterString, SimpleString.toSimpleString(getUsername()), durable, temporary, maxConsumers, deleteOnNoConsumers); if (temporary) { // Temporary queue in core simply means the queue will be deleted if @@ -555,6 +547,17 @@ public class ServerSessionImpl implements ServerSession, FailureListener { } @Override + public AddressInfo createAddress(final SimpleString address, final boolean multicast) throws Exception { + // make sure the user has privileges to create this queue + securityCheck(address, CheckType.CREATE_ADDRESS, this); + AddressInfo.RoutingType routingType = multicast ? AddressInfo.RoutingType.MULTICAST : AddressInfo.RoutingType.ANYCAST; + + AddressInfo addressInfo = server.createOrUpdateAddressInfo(new AddressInfo(address).setRoutingType(routingType)); + + return addressInfo; + } + + @Override public void createSharedQueue(final SimpleString address, final SimpleString name, boolean durable, @@ -1503,6 +1506,12 @@ public class ServerSessionImpl implements ServerSession, FailureListener { SimpleString replyTo = message.getSimpleStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME); if (replyTo != null) { + // TODO: move this check somewhere else? this is a JMS-specific bit of logic in the core impl + if (replyTo.toString().startsWith("queue://") || replyTo.toString().startsWith("topic://")) { + replyTo = SimpleString.toSimpleString(replyTo.toString().substring(8)); + } else if (replyTo.toString().startsWith("temp-queue://") || replyTo.toString().startsWith("temp-topic://")) { + replyTo = SimpleString.toSimpleString(replyTo.toString().substring(13)); + } reply.setAddress(replyTo); doSend(tx, reply, direct, false); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java index 73248f0..ac1ab1a 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java @@ -464,11 +464,13 @@ public class ManagementServiceImpl implements ManagementService { public synchronized void registerInRegistry(final String resourceName, final Object managedResource) { unregisterFromRegistry(resourceName); + ActiveMQServerLogger.LOGGER.info("Registering: " + resourceName); registry.put(resourceName, managedResource); } @Override public synchronized void unregisterFromRegistry(final String resourceName) { + ActiveMQServerLogger.LOGGER.info("Unregistering: " + resourceName, new Exception()); registry.remove(resourceName); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java index 0d14c7c..68d9656 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java @@ -52,9 +52,9 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable public static final boolean DEFAULT_LAST_VALUE_QUEUE = false; - public static final boolean DEFAULT_AUTO_CREATE_QUEUES = true; + public static final boolean DEFAULT_AUTO_CREATE_JMS_QUEUES = true; - public static final boolean DEFAULT_AUTO_DELETE_QUEUES = true; + public static final boolean DEFAULT_AUTO_DELETE_JMS_QUEUES = true; public static final boolean DEFAULT_AUTO_CREATE_TOPICS = true; @@ -166,7 +166,7 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable } public boolean isAutoCreateJmsQueues() { - return autoCreateJmsQueues != null ? autoCreateJmsQueues : AddressSettings.DEFAULT_AUTO_CREATE_QUEUES; + return autoCreateJmsQueues != null ? autoCreateJmsQueues : AddressSettings.DEFAULT_AUTO_CREATE_JMS_QUEUES; } public AddressSettings setAutoCreateJmsQueues(final boolean autoCreateJmsQueues) { @@ -174,8 +174,8 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable return this; } - public boolean isAutoDeleteJmsQueues() { - return autoDeleteJmsQueues != null ? autoDeleteJmsQueues : AddressSettings.DEFAULT_AUTO_DELETE_QUEUES; + public boolean getAutoDeleteJmsQueues() { + return autoDeleteJmsQueues != null ? autoDeleteJmsQueues : AddressSettings.DEFAULT_AUTO_DELETE_JMS_QUEUES; } public AddressSettings setAutoDeleteJmsQueues(final boolean autoDeleteJmsQueues) { @@ -193,7 +193,7 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable } public boolean isAutoDeleteJmsTopics() { - return autoDeleteJmsTopics != null ? autoDeleteJmsTopics : AddressSettings.DEFAULT_AUTO_DELETE_QUEUES; + return autoDeleteJmsTopics != null ? autoDeleteJmsTopics : AddressSettings.DEFAULT_AUTO_DELETE_TOPICS; } public AddressSettings setAutoDeleteJmsTopics(final boolean autoDeleteJmsTopics) { @@ -459,9 +459,9 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable if (autoDeleteJmsQueues == null) { autoDeleteJmsQueues = merged.autoDeleteJmsQueues; } - if (autoCreateJmsTopics == null) { - autoCreateJmsTopics = merged.autoCreateJmsTopics; - } +// if (autoCreateJmsTopics == null) { +// autoCreateJmsTopics = merged.autoCreateJmsTopics; +// } if (autoDeleteJmsTopics == null) { autoDeleteJmsTopics = merged.autoDeleteJmsTopics; } @@ -532,7 +532,7 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable autoDeleteJmsQueues = BufferHelper.readNullableBoolean(buffer); - autoCreateJmsTopics = BufferHelper.readNullableBoolean(buffer); +// autoCreateJmsTopics = BufferHelper.readNullableBoolean(buffer); autoDeleteJmsTopics = BufferHelper.readNullableBoolean(buffer); @@ -565,7 +565,7 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable BufferHelper.sizeOfNullableSimpleString(slowConsumerPolicy != null ? slowConsumerPolicy.toString() : null) + BufferHelper.sizeOfNullableBoolean(autoCreateJmsQueues) + BufferHelper.sizeOfNullableBoolean(autoDeleteJmsQueues) + - BufferHelper.sizeOfNullableBoolean(autoCreateJmsTopics) + +// BufferHelper.sizeOfNullableBoolean(autoCreateJmsTopics) + BufferHelper.sizeOfNullableBoolean(autoDeleteJmsTopics) + BufferHelper.sizeOfNullableInteger(managementBrowsePageSize) + BufferHelper.sizeOfNullableLong(maxSizeBytesRejectThreshold); @@ -615,7 +615,7 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable BufferHelper.writeNullableBoolean(buffer, autoDeleteJmsQueues); - BufferHelper.writeNullableBoolean(buffer, autoCreateJmsTopics); +// BufferHelper.writeNullableBoolean(buffer, autoCreateJmsTopics); BufferHelper.writeNullableBoolean(buffer, autoDeleteJmsTopics); @@ -652,7 +652,7 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable result = prime * result + ((slowConsumerPolicy == null) ? 0 : slowConsumerPolicy.hashCode()); result = prime * result + ((autoCreateJmsQueues == null) ? 0 : autoCreateJmsQueues.hashCode()); result = prime * result + ((autoDeleteJmsQueues == null) ? 0 : autoDeleteJmsQueues.hashCode()); - result = prime * result + ((autoCreateJmsTopics == null) ? 0 : autoCreateJmsTopics.hashCode()); +// result = prime * result + ((autoCreateJmsTopics == null) ? 0 : autoCreateJmsTopics.hashCode()); result = prime * result + ((autoDeleteJmsTopics == null) ? 0 : autoDeleteJmsTopics.hashCode()); result = prime * result + ((managementBrowsePageSize == null) ? 0 : managementBrowsePageSize.hashCode()); result = prime * result + ((queuePrefetch == null) ? 0 : queuePrefetch.hashCode()); @@ -778,11 +778,11 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable } else if (!autoDeleteJmsQueues.equals(other.autoDeleteJmsQueues)) return false; - if (autoCreateJmsTopics == null) { - if (other.autoCreateJmsTopics != null) - return false; - } else if (!autoCreateJmsTopics.equals(other.autoCreateJmsTopics)) - return false; +// if (autoCreateJmsTopics == null) { +// if (other.autoCreateJmsTopics != null) +// return false; +// } else if (!autoCreateJmsTopics.equals(other.autoCreateJmsTopics)) +// return false; if (autoDeleteJmsTopics == null) { if (other.autoDeleteJmsTopics != null) return false; @@ -854,11 +854,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable slowConsumerPolicy + ", autoCreateJmsQueues=" + autoCreateJmsQueues + - ", autoDeleteJmsQueues=" + - autoDeleteJmsQueues + + ", autoDeleteJmsQueues=" + autoDeleteJmsQueues + ", autoCreateJmsTopics=" + - autoCreateJmsTopics + - ", autoDeleteJmsTopics=" + +// autoCreateJmsTopics + +// ", autoDeleteJmsTopics=" + autoDeleteJmsTopics + ", managementBrowsePageSize=" + managementBrowsePageSize + http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java index 9653760..f2b0143 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java @@ -170,7 +170,7 @@ public class FileConfigurationParserTest extends ActiveMQTestBase { "</security-setting>" + "\n" + "</security-settings>" + "\n" + "<address-settings>" + "\n" + - "<address-setting match=\"#\">" + "\n" + "<dead-letter-address>jms.queue.DLQ\n</dead-letter-address>" + "\n" + "<expiry-address>jms.queue.ExpiryQueue\n</expiry-address>" + "\n" + "<redelivery-delay>0\n</redelivery-delay>" + "\n" + "<max-size-bytes>10485760\n</max-size-bytes>" + "\n" + "<message-counter-history-day-limit>10</message-counter-history-day-limit>" + "\n" + "<address-full-policy>BLOCK</address-full-policy>" + "\n" + + "<address-setting match=\"#\">" + "\n" + "<dead-letter-address>DLQ\n</dead-letter-address>" + "\n" + "<expiry-address>ExpiryQueue\n</expiry-address>" + "\n" + "<redelivery-delay>0\n</redelivery-delay>" + "\n" + "<max-size-bytes>10485760\n</max-size-bytes>" + "\n" + "<message-counter-history-day-limit>10</message-counter-history-day-limit>" + "\n" + "<address-full-policy>BLOCK</address-full-policy>" + "\n" + "</address-setting>" + "\n" + "</address-settings>" + "\n"; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java index c1639c7..eb97b17 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java @@ -292,7 +292,7 @@ public class FileConfigurationTest extends ConfigurationImplTest { assertEquals(5, conf.getAddressesSettings().get("a1").getSlowConsumerCheckPeriod()); assertEquals(SlowConsumerPolicy.NOTIFY, conf.getAddressesSettings().get("a1").getSlowConsumerPolicy()); assertEquals(true, conf.getAddressesSettings().get("a1").isAutoCreateJmsQueues()); - assertEquals(true, conf.getAddressesSettings().get("a1").isAutoDeleteJmsQueues()); + assertEquals(true, conf.getAddressesSettings().get("a1").getAutoDeleteJmsQueues()); assertEquals(true, conf.getAddressesSettings().get("a1").isAutoCreateJmsTopics()); assertEquals(true, conf.getAddressesSettings().get("a1").isAutoDeleteJmsTopics()); @@ -307,7 +307,7 @@ public class FileConfigurationTest extends ConfigurationImplTest { assertEquals(15, conf.getAddressesSettings().get("a2").getSlowConsumerCheckPeriod()); assertEquals(SlowConsumerPolicy.KILL, conf.getAddressesSettings().get("a2").getSlowConsumerPolicy()); assertEquals(false, conf.getAddressesSettings().get("a2").isAutoCreateJmsQueues()); - assertEquals(false, conf.getAddressesSettings().get("a2").isAutoDeleteJmsQueues()); + assertEquals(false, conf.getAddressesSettings().get("a2").getAutoDeleteJmsQueues()); assertEquals(false, conf.getAddressesSettings().get("a2").isAutoCreateJmsTopics()); assertEquals(false, conf.getAddressesSettings().get("a2").isAutoDeleteJmsTopics()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java index d3f7679..b19aee0 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/WrongRoleFileConfigurationParserTest.java @@ -89,7 +89,7 @@ public class WrongRoleFileConfigurationParserTest extends ActiveMQTestBase { "</security-setting>" + "\n" + "</security-settings>" + "\n" + "<address-settings>" + "\n" + - "<address-setting match=\"#\">" + "\n" + "<dead-letter-address>jms.queue.DLQ\n</dead-letter-address>" + "\n" + "<expiry-address>jms.queue.ExpiryQueue\n</expiry-address>" + "\n" + "<redelivery-delay>0\n</redelivery-delay>" + "\n" + "<max-size-bytes>10485760\n</max-size-bytes>" + "\n" + "<message-counter-history-day-limit>10</message-counter-history-day-limit>" + "\n" + "<address-full-policy>BLOCK</address-full-policy>" + "\n" + + "<address-setting match=\"#\">" + "\n" + "<dead-letter-address>DLQ\n</dead-letter-address>" + "\n" + "<expiry-address>ExpiryQueue\n</expiry-address>" + "\n" + "<redelivery-delay>0\n</redelivery-delay>" + "\n" + "<max-size-bytes>10485760\n</max-size-bytes>" + "\n" + "<message-counter-history-day-limit>10</message-counter-history-day-limit>" + "\n" + "<address-full-policy>BLOCK</address-full-policy>" + "\n" + "</address-setting>" + "\n" + "</address-settings>" + "\n" + "</configuration>"; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java index 3a1729a..5274db6 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java @@ -21,6 +21,7 @@ import org.junit.Test; import static org.apache.activemq.artemis.core.security.CheckType.BROWSE; import static org.apache.activemq.artemis.core.security.CheckType.CONSUME; +import static org.apache.activemq.artemis.core.security.CheckType.CREATE_ADDRESS; import static org.apache.activemq.artemis.core.security.CheckType.CREATE_DURABLE_QUEUE; import static org.apache.activemq.artemis.core.security.CheckType.CREATE_NON_DURABLE_QUEUE; import static org.apache.activemq.artemis.core.security.CheckType.DELETE_DURABLE_QUEUE; @@ -41,7 +42,7 @@ public class RoleTest extends Assert { @Test public void testWriteRole() throws Exception { - Role role = new Role("testWriteRole", true, false, false, false, false, false, false, false); + Role role = new Role("testWriteRole", true, false, false, false, false, false, false, false, false); Assert.assertTrue(SEND.hasRole(role)); Assert.assertFalse(CONSUME.hasRole(role)); Assert.assertFalse(CREATE_DURABLE_QUEUE.hasRole(role)); @@ -50,11 +51,12 @@ public class RoleTest extends Assert { Assert.assertFalse(DELETE_NON_DURABLE_QUEUE.hasRole(role)); Assert.assertFalse(MANAGE.hasRole(role)); Assert.assertFalse(BROWSE.hasRole(role)); + Assert.assertFalse(CREATE_ADDRESS.hasRole(role)); } @Test public void testReadRole() throws Exception { - Role role = new Role("testReadRole", false, true, false, false, false, false, false, true); + Role role = new Role("testReadRole", false, true, false, false, false, false, false, true, false); Assert.assertFalse(SEND.hasRole(role)); Assert.assertTrue(CONSUME.hasRole(role)); Assert.assertFalse(CREATE_DURABLE_QUEUE.hasRole(role)); @@ -63,11 +65,12 @@ public class RoleTest extends Assert { Assert.assertFalse(DELETE_NON_DURABLE_QUEUE.hasRole(role)); Assert.assertFalse(MANAGE.hasRole(role)); Assert.assertTrue(BROWSE.hasRole(role)); + Assert.assertFalse(CREATE_ADDRESS.hasRole(role)); } @Test public void testCreateRole() throws Exception { - Role role = new Role("testCreateRole", false, false, true, false, false, false, false, false); + Role role = new Role("testCreateRole", false, false, true, false, false, false, false, false, false); Assert.assertFalse(SEND.hasRole(role)); Assert.assertFalse(CONSUME.hasRole(role)); Assert.assertTrue(CREATE_DURABLE_QUEUE.hasRole(role)); @@ -76,11 +79,12 @@ public class RoleTest extends Assert { Assert.assertFalse(DELETE_NON_DURABLE_QUEUE.hasRole(role)); Assert.assertFalse(MANAGE.hasRole(role)); Assert.assertFalse(BROWSE.hasRole(role)); + Assert.assertFalse(CREATE_ADDRESS.hasRole(role)); } @Test public void testManageRole() throws Exception { - Role role = new Role("testManageRole", false, false, false, false, false, false, true, false); + Role role = new Role("testManageRole", false, false, false, false, false, false, true, false, false); Assert.assertFalse(SEND.hasRole(role)); Assert.assertFalse(CONSUME.hasRole(role)); Assert.assertFalse(CREATE_DURABLE_QUEUE.hasRole(role)); @@ -89,16 +93,17 @@ public class RoleTest extends Assert { Assert.assertFalse(DELETE_NON_DURABLE_QUEUE.hasRole(role)); Assert.assertTrue(MANAGE.hasRole(role)); Assert.assertFalse(BROWSE.hasRole(role)); + Assert.assertFalse(CREATE_ADDRESS.hasRole(role)); } @Test public void testEqualsAndHashcode() throws Exception { - Role role = new Role("testEquals", true, true, true, false, false, false, false, false); - Role sameRole = new Role("testEquals", true, true, true, false, false, false, false, false); - Role roleWithDifferentName = new Role("notEquals", true, true, true, false, false, false, false, false); - Role roleWithDifferentRead = new Role("testEquals", false, true, true, false, false, false, false, false); - Role roleWithDifferentWrite = new Role("testEquals", true, false, true, false, false, false, false, false); - Role roleWithDifferentCreate = new Role("testEquals", true, true, false, false, false, false, false, false); + Role role = new Role("testEquals", true, true, true, false, false, false, false, false, false); + Role sameRole = new Role("testEquals", true, true, true, false, false, false, false, false, false); + Role roleWithDifferentName = new Role("notEquals", true, true, true, false, false, false, false, false, false); + Role roleWithDifferentRead = new Role("testEquals", false, true, true, false, false, false, false, false, false); + Role roleWithDifferentWrite = new Role("testEquals", true, false, true, false, false, false, false, false, false); + Role roleWithDifferentCreate = new Role("testEquals", true, true, false, false, false, false, false, false, false); Assert.assertTrue(role.equals(role)); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java index 202f2ba..3861782 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java @@ -39,10 +39,10 @@ public class AddressSettingsTest extends ActiveMQTestBase { Assert.assertEquals(AddressSettings.DEFAULT_SLOW_CONSUMER_THRESHOLD, addressSettings.getSlowConsumerThreshold()); Assert.assertEquals(AddressSettings.DEFAULT_SLOW_CONSUMER_CHECK_PERIOD, addressSettings.getSlowConsumerCheckPeriod()); Assert.assertEquals(AddressSettings.DEFAULT_SLOW_CONSUMER_POLICY, addressSettings.getSlowConsumerPolicy()); - Assert.assertEquals(AddressSettings.DEFAULT_AUTO_CREATE_QUEUES, addressSettings.isAutoCreateJmsQueues()); - Assert.assertEquals(AddressSettings.DEFAULT_AUTO_DELETE_QUEUES, addressSettings.isAutoDeleteJmsQueues()); - Assert.assertEquals(AddressSettings.DEFAULT_AUTO_CREATE_TOPICS, addressSettings.isAutoCreateJmsTopics()); - Assert.assertEquals(AddressSettings.DEFAULT_AUTO_DELETE_TOPICS, addressSettings.isAutoDeleteJmsTopics()); + Assert.assertEquals(AddressSettings.DEFAULT_AUTO_CREATE_JMS_QUEUES, addressSettings.isAutoCreateJmsQueues()); + Assert.assertEquals(AddressSettings.DEFAULT_AUTO_DELETE_JMS_QUEUES, addressSettings.getAutoDeleteJmsQueues()); +// Assert.assertEquals(AddressSettings.DEFAULT_AUTO_CREATE_TOPICS, addressSettings.isAutoCreateJmsTopics()); +// Assert.assertEquals(AddressSettings.DEFAULT_AUTO_DELETE_TOPICS, addressSettings.isAutoDeleteJmsTopics()); } @Test http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java index 2f59240..b8678ae 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/RepositoryTest.java @@ -72,13 +72,13 @@ public class RepositoryTest extends ActiveMQTestBase { public void testSingletwo() { securityRepository.addMatch("queues.another.aq.*", new HashSet<Role>()); HashSet<Role> roles = new HashSet<>(2); - roles.add(new Role("test1", true, true, true, true, true, true, true, true)); - roles.add(new Role("test2", true, true, true, true, true, true, true, true)); + roles.add(new Role("test1", true, true, true, true, true, true, true, true, true)); + roles.add(new Role("test2", true, true, true, true, true, true, true, true, true)); securityRepository.addMatch("queues.aq", roles); HashSet<Role> roles2 = new HashSet<>(2); - roles2.add(new Role("test1", true, true, true, true, true, true, true, true)); - roles2.add(new Role("test2", true, true, true, true, true, true, true, true)); - roles2.add(new Role("test3", true, true, true, true, true, true, true, true)); + roles2.add(new Role("test1", true, true, true, true, true, true, true, true, true)); + roles2.add(new Role("test2", true, true, true, true, true, true, true, true, true)); + roles2.add(new Role("test3", true, true, true, true, true, true, true, true, true)); securityRepository.addMatch("queues.another.andanother", roles2); HashSet<Role> hashSet = securityRepository.getMatch("queues.another.andanother"); @@ -89,8 +89,8 @@ public class RepositoryTest extends ActiveMQTestBase { public void testWithoutWildcard() { securityRepository.addMatch("queues.1.*", new HashSet<Role>()); HashSet<Role> roles = new HashSet<>(2); - roles.add(new Role("test1", true, true, true, true, true, true, true, true)); - roles.add(new Role("test2", true, true, true, true, true, true, true, true)); + roles.add(new Role("test1", true, true, true, true, true, true, true, true, true)); + roles.add(new Role("test2", true, true, true, true, true, true, true, true, true)); securityRepository.addMatch("queues.2.aq", roles); HashSet<Role> hashSet = securityRepository.getMatch("queues.2.aq"); Assert.assertEquals(hashSet.size(), 2); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java b/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java index 79a4898..f1ceb3a 100644 --- a/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java +++ b/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java @@ -81,7 +81,7 @@ public class ManagementExample { // Step 13. Use a helper class to fill the JMS message with management information: // * the name of the resource to manage // * in this case, we want to retrieve the value of the messageCount of the queue - JMSManagementHelper.putAttribute(m, "jms.queue.exampleQueue", "messageCount"); + JMSManagementHelper.putAttribute(m, "exampleQueue", "messageCount"); // Step 14. Use the requestor to send the request and wait for the reply Message reply = requestor.request(m); @@ -97,7 +97,7 @@ public class ManagementExample { // * the object name of the resource to manage (i.e. the queue) // * in this case, we want to call the "removeMessage" operation with the JMS MessageID // of the message sent to the queue in step 8. - JMSManagementHelper.putOperationInvocation(m, "jms.queue.exampleQueue", "removeMessage", message.getJMSMessageID()); + JMSManagementHelper.putOperationInvocation(m, "exampleQueue", "removeMessage", message.getJMSMessageID()); // Step 18 Use the requestor to send the request and wait for the reply reply = requestor.request(m); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/features/standard/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java b/examples/features/standard/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java index 4962535..8a3fe10 100644 --- a/examples/features/standard/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java +++ b/examples/features/standard/pre-acknowledge/src/main/java/org/apache/activemq/artemis/jms/example/PreacknowledgeExample.java @@ -113,7 +113,7 @@ public class PreacknowledgeExample { Message m = session.createMessage(); - JMSManagementHelper.putAttribute(m, "jms.queue.exampleQueue", "messageCount"); + JMSManagementHelper.putAttribute(m, "exampleQueue", "messageCount"); Message response = requestor.request(m); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/features/standard/rest/dup-send/src/main/java/PostOrder.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/dup-send/src/main/java/PostOrder.java b/examples/features/standard/rest/dup-send/src/main/java/PostOrder.java index dfa37fe..c2d1dca 100644 --- a/examples/features/standard/rest/dup-send/src/main/java/PostOrder.java +++ b/examples/features/standard/rest/dup-send/src/main/java/PostOrder.java @@ -23,7 +23,7 @@ public class PostOrder { public static void main(String[] args) throws Exception { // first get the create URL for the shipping queue - ClientRequest request = new ClientRequest("http://localhost:8080/queues/jms.queue.orders";); + ClientRequest request = new ClientRequest("http://localhost:8080/queues/orders";); ClientResponse res = request.head(); Link create = res.getHeaderAsLink("msg-create"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/features/standard/rest/dup-send/src/main/java/PostOrderWithId.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/dup-send/src/main/java/PostOrderWithId.java b/examples/features/standard/rest/dup-send/src/main/java/PostOrderWithId.java index 2e87398..af864e4 100644 --- a/examples/features/standard/rest/dup-send/src/main/java/PostOrderWithId.java +++ b/examples/features/standard/rest/dup-send/src/main/java/PostOrderWithId.java @@ -26,7 +26,7 @@ public class PostOrderWithId { throw new RuntimeException("You must pass in a parameter"); // first get the create URL for the shipping queue - ClientRequest request = new ClientRequest("http://localhost:8080/queues/jms.queue.orders";); + ClientRequest request = new ClientRequest("http://localhost:8080/queues/orders";); ClientResponse res = request.head(); Link create = res.getHeaderAsLink("msg-create-with-id"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/features/standard/rest/dup-send/src/main/java/ReceiveOrder.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/dup-send/src/main/java/ReceiveOrder.java b/examples/features/standard/rest/dup-send/src/main/java/ReceiveOrder.java index e16d4ee..3c29ae0 100644 --- a/examples/features/standard/rest/dup-send/src/main/java/ReceiveOrder.java +++ b/examples/features/standard/rest/dup-send/src/main/java/ReceiveOrder.java @@ -23,7 +23,7 @@ public class ReceiveOrder { public static void main(String[] args) throws Exception { // first get the create URL for the shipping queue - ClientRequest request = new ClientRequest("http://localhost:8080/queues/jms.queue.orders";); + ClientRequest request = new ClientRequest("http://localhost:8080/queues/orders";); ClientResponse res = request.head(); Link pullConsumers = res.getHeaderAsLink("msg-pull-consumers"); res.releaseConnection(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/features/standard/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java b/examples/features/standard/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java index 10fb311..4f15a54 100644 --- a/examples/features/standard/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java +++ b/examples/features/standard/rest/javascript-chat/src/test/java/org/jboss/resteasy/messaging/test/AutoAckTopicTest.java @@ -31,7 +31,7 @@ public class AutoAckTopicTest { //todo fix //@Test public void testSuccessFirst() throws Exception { - ClientRequest request = new ClientRequest("http://localhost:8080/topics/jms.topic.chat";); + ClientRequest request = new ClientRequest("http://localhost:8080/topics/chat";); ClientResponse response = request.head(); Assert.assertEquals("*****", 200, response.getStatus()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/features/standard/rest/jms-to-rest/src/main/java/JmsReceive.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/jms-to-rest/src/main/java/JmsReceive.java b/examples/features/standard/rest/jms-to-rest/src/main/java/JmsReceive.java index 54ca51f..b16b7f1 100644 --- a/examples/features/standard/rest/jms-to-rest/src/main/java/JmsReceive.java +++ b/examples/features/standard/rest/jms-to-rest/src/main/java/JmsReceive.java @@ -32,7 +32,7 @@ public class JmsReceive { public static void main(String[] args) throws Exception { System.out.println("Receive Setup..."); ConnectionFactory factory = new ActiveMQJMSConnectionFactory("tcp://localhost:61616"); - Destination destination = ActiveMQDestination.fromAddress("jms.queue.orders"); + Destination destination = ActiveMQDestination.fromAddress("orders"); try (Connection conn = factory.createConnection()) { Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/features/standard/rest/jms-to-rest/src/main/java/JmsSend.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/jms-to-rest/src/main/java/JmsSend.java b/examples/features/standard/rest/jms-to-rest/src/main/java/JmsSend.java index 7d5734f..608cab5 100644 --- a/examples/features/standard/rest/jms-to-rest/src/main/java/JmsSend.java +++ b/examples/features/standard/rest/jms-to-rest/src/main/java/JmsSend.java @@ -29,7 +29,7 @@ public class JmsSend { public static void main(String[] args) throws Exception { ConnectionFactory factory = new ActiveMQJMSConnectionFactory("tcp://localhost:61616"); - Destination destination = ActiveMQDestination.fromAddress("jms.queue.orders"); + Destination destination = ActiveMQDestination.fromAddress("orders"); try (Connection conn = factory.createConnection()) { Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/features/standard/rest/jms-to-rest/src/main/java/RestReceive.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/jms-to-rest/src/main/java/RestReceive.java b/examples/features/standard/rest/jms-to-rest/src/main/java/RestReceive.java index 34b9154..e134c46 100644 --- a/examples/features/standard/rest/jms-to-rest/src/main/java/RestReceive.java +++ b/examples/features/standard/rest/jms-to-rest/src/main/java/RestReceive.java @@ -23,7 +23,7 @@ public class RestReceive { public static void main(String[] args) throws Exception { // first get the create URL for the shipping queue - ClientRequest request = new ClientRequest("http://localhost:8080/queues/jms.queue.orders";); + ClientRequest request = new ClientRequest("http://localhost:8080/queues/orders";); ClientResponse res = request.head(); Link pullConsumers = res.getHeaderAsLink("msg-pull-consumers"); res = pullConsumers.request().formParameter("autoAck", "false").post(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/features/standard/rest/jms-to-rest/src/main/java/RestSend.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/jms-to-rest/src/main/java/RestSend.java b/examples/features/standard/rest/jms-to-rest/src/main/java/RestSend.java index e9649ac..eb28d6d 100644 --- a/examples/features/standard/rest/jms-to-rest/src/main/java/RestSend.java +++ b/examples/features/standard/rest/jms-to-rest/src/main/java/RestSend.java @@ -23,7 +23,7 @@ public class RestSend { public static void main(String[] args) throws Exception { // first get the create URL for the shipping queue - ClientRequest request = new ClientRequest("http://localhost:8080/queues/jms.queue.orders";); + ClientRequest request = new ClientRequest("http://localhost:8080/queues/orders";); ClientResponse res = request.head(); Link create = res.getHeaderAsLink("msg-create"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/features/standard/rest/push/src/main/java/PostOrder.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/push/src/main/java/PostOrder.java b/examples/features/standard/rest/push/src/main/java/PostOrder.java index 5ceaecd..d32e9d5 100644 --- a/examples/features/standard/rest/push/src/main/java/PostOrder.java +++ b/examples/features/standard/rest/push/src/main/java/PostOrder.java @@ -29,7 +29,7 @@ public class PostOrder { public static void main(String[] args) throws Exception { ConnectionFactory factory = new ActiveMQJMSConnectionFactory("tcp://localhost:61616"); - Destination destination = ActiveMQDestination.fromAddress("jms.queue.orders"); + Destination destination = ActiveMQDestination.fromAddress("orders"); try (Connection conn = factory.createConnection()) { Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/features/standard/rest/push/src/main/java/PushReg.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/push/src/main/java/PushReg.java b/examples/features/standard/rest/push/src/main/java/PushReg.java index 05466d6..630c62a 100644 --- a/examples/features/standard/rest/push/src/main/java/PushReg.java +++ b/examples/features/standard/rest/push/src/main/java/PushReg.java @@ -25,7 +25,7 @@ public class PushReg { public static void main(String[] args) throws Exception { // get the push consumers factory resource - ClientRequest request = new ClientRequest("http://localhost:8080/queues/jms.queue.orders";); + ClientRequest request = new ClientRequest("http://localhost:8080/queues/orders";); ClientResponse res = request.head(); Link pushConsumers = res.getHeaderAsLink("msg-push-consumers"); @@ -33,7 +33,7 @@ public class PushReg { // Really, just create a link with the shipping URL and the type you want posted PushRegistration reg = new PushRegistration(); XmlLink target = new XmlLink(); - target.setHref("http://localhost:8080/queues/jms.queue.shipping";); + target.setHref("http://localhost:8080/queues/shipping";); target.setType("application/xml"); target.setRelationship("destination"); reg.setTarget(target); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/features/standard/rest/push/src/main/java/ReceiveShipping.java ---------------------------------------------------------------------- diff --git a/examples/features/standard/rest/push/src/main/java/ReceiveShipping.java b/examples/features/standard/rest/push/src/main/java/ReceiveShipping.java index b422c03..6eba27e 100644 --- a/examples/features/standard/rest/push/src/main/java/ReceiveShipping.java +++ b/examples/features/standard/rest/push/src/main/java/ReceiveShipping.java @@ -31,7 +31,7 @@ public class ReceiveShipping { public static void main(String[] args) throws Exception { ConnectionFactory factory = new ActiveMQJMSConnectionFactory("tcp://localhost:61616"); - Destination destination = ActiveMQDestination.fromAddress("jms.queue.shipping"); + Destination destination = ActiveMQDestination.fromAddress("shipping"); try (Connection conn = factory.createConnection()) { Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java ---------------------------------------------------------------------- diff --git a/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java b/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java index c8fd1ff..a166dc2 100644 --- a/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java +++ b/examples/protocols/amqp/proton-cpp/src/main/java/org/apache/activemq/artemis/jms/example/ProtonCPPExample.java @@ -107,7 +107,7 @@ public class ProtonCPPExample { Message m = session.createMessage(); - JMSManagementHelper.putAttribute(m, "jms.queue.exampleQueue", "messageCount"); + JMSManagementHelper.putAttribute(m, "exampleQueue", "messageCount"); Message response = requestor.request(m); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java ---------------------------------------------------------------------- diff --git a/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java b/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java index 8386fc4..632f8f1 100644 --- a/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java +++ b/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java @@ -41,7 +41,7 @@ public class AMQPQueueExample { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); // Step 3. Create a sender - Queue queue = session.createQueue("jms.queue.exampleQueue"); + Queue queue = session.createQueue("exampleQueue"); MessageProducer sender = session.createProducer(queue); // Step 4. send a few simple message http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java ---------------------------------------------------------------------- diff --git a/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java b/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java index 6aa5c81..75d015c 100644 --- a/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java +++ b/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java @@ -70,7 +70,7 @@ public class StompDualAuthenticationExample { // jms.queue.exampleQueue address with a text body String text = "Hello, world from Stomp!"; String message = "SEND\n" + - "destination: jms.queue.exampleQueue\n" + + "destination: exampleQueue\n" + "\n" + text + END_OF_FRAME; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/StompEmbeddedWithInterceptorExample.java ---------------------------------------------------------------------- diff --git a/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/StompEmbeddedWithInterceptorExample.java b/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/StompEmbeddedWithInterceptorExample.java index 91a7c98..12d8a44 100644 --- a/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/StompEmbeddedWithInterceptorExample.java +++ b/examples/protocols/stomp/stomp-embedded-interceptor/src/main/java/org/apache/activemq/artemis/jms/example/StompEmbeddedWithInterceptorExample.java @@ -52,7 +52,7 @@ public class StompEmbeddedWithInterceptorExample { // jms.queue.exampleQueue address with a text body String text = "Hello World from Stomp 1.2 !"; String message = "SEND\n" + - "destination:jms.queue.exampleQueue" + + "destination:exampleQueue" + "\n" + text + END_OF_FRAME; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/protocols/stomp/stomp-jms/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java ---------------------------------------------------------------------- diff --git a/examples/protocols/stomp/stomp-jms/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java b/examples/protocols/stomp/stomp-jms/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java index d466ab6..838a7e4 100644 --- a/examples/protocols/stomp/stomp-jms/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java +++ b/examples/protocols/stomp/stomp-jms/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java @@ -32,9 +32,7 @@ public class StompExample { public static void main(final String[] args) throws Exception { StompJmsConnectionFactory factory = new StompJmsConnectionFactory(); - factory.setQueuePrefix("jms.queue."); factory.setDisconnectTimeout(5000); - factory.setTopicPrefix("jms.topic."); factory.setBrokerURI("tcp://localhost:61616"); Connection connection = factory.createConnection(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/protocols/stomp/stomp/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java ---------------------------------------------------------------------- diff --git a/examples/protocols/stomp/stomp/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java b/examples/protocols/stomp/stomp/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java index 98cae66..9515ae9 100644 --- a/examples/protocols/stomp/stomp/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java +++ b/examples/protocols/stomp/stomp/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java @@ -59,7 +59,7 @@ public class StompExample { // jms.queue.exampleQueue address with a text body String text = "Hello, world from Stomp!"; String message = "SEND\n" + - "destination: jms.queue.exampleQueue\n" + + "destination: exampleQueue\n" + "\n" + text + END_OF_FRAME; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/protocols/stomp/stomp1.1/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java ---------------------------------------------------------------------- diff --git a/examples/protocols/stomp/stomp1.1/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java b/examples/protocols/stomp/stomp1.1/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java index 02937bf..c14b861 100644 --- a/examples/protocols/stomp/stomp1.1/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java +++ b/examples/protocols/stomp/stomp1.1/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java @@ -62,7 +62,7 @@ public class StompExample { // jms.queue.exampleQueue address with a text body String text = "Hello World from Stomp 1.1 !"; String message = "SEND\n" + - "destination:jms.queue.exampleQueue\n" + + "destination:exampleQueue\n" + "\n" + text + END_OF_FRAME; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/examples/protocols/stomp/stomp1.2/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java ---------------------------------------------------------------------- diff --git a/examples/protocols/stomp/stomp1.2/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java b/examples/protocols/stomp/stomp1.2/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java index 05bf1fe..3a8e37a 100644 --- a/examples/protocols/stomp/stomp1.2/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java +++ b/examples/protocols/stomp/stomp1.2/src/main/java/org/apache/activemq/artemis/jms/example/StompExample.java @@ -62,7 +62,7 @@ public class StompExample { // jms.queue.exampleQueue address with a text body String text = "Hello World from Stomp 1.2 !"; String message = "SEND\n" + - "destination:jms.queue.exampleQueue\n" + + "destination:exampleQueue\n" + "\n" + text + END_OF_FRAME; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0c27716..9064923 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ <activemq.version.majorVersion>1</activemq.version.majorVersion> <activemq.version.minorVersion>0</activemq.version.minorVersion> <activemq.version.microVersion>0</activemq.version.microVersion> - <activemq.version.incrementingVersion>128,127,126,125,124,123,122</activemq.version.incrementingVersion> + <activemq.version.incrementingVersion>129,128,127,126,125,124,123,122</activemq.version.incrementingVersion> <activemq.version.versionTag>${project.version}</activemq.version.versionTag> <ActiveMQ-Version>${project.version}(${activemq.version.incrementingVersion})</ActiveMQ-Version> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java index b16383a..caa4cc3 100644 --- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java +++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java @@ -81,13 +81,13 @@ public class ArtemisBrokerWrapper extends ArtemisBrokerBase { translatePolicyMap(serverConfig, policyMap); } - String match = "jms.queue.#"; + String match = "#"; AddressSettings commonSettings = addressSettingsMap.get(match); if (commonSettings == null) { commonSettings = new AddressSettings(); addressSettingsMap.put(match, commonSettings); } - SimpleString dla = new SimpleString("jms.queue.ActiveMQ.DLQ"); + SimpleString dla = new SimpleString("ActiveMQ.DLQ"); commonSettings.setDeadLetterAddress(dla); commonSettings.setAutoCreateJmsQueues(true); @@ -223,9 +223,9 @@ public class ArtemisBrokerWrapper extends ArtemisBrokerBase { String physicalName = dest.getPhysicalName(); String pattern = physicalName.replace(">", "#"); if (dest.isTopic()) { - pattern = "jms.topic." + pattern; + pattern = pattern; } else { - pattern = "jms.queue." + pattern; + pattern = pattern; } return pattern; @@ -248,7 +248,7 @@ public class ArtemisBrokerWrapper extends ArtemisBrokerBase { synchronized (testQueues) { SimpleString coreQ = testQueues.get(qname); if (coreQ == null) { - coreQ = new SimpleString("jms.queue." + qname); + coreQ = new SimpleString(qname); try { this.server.createQueue(coreQ, coreQ, null, false, false); testQueues.put(qname, coreQ); @@ -266,9 +266,9 @@ public class ArtemisBrokerWrapper extends ArtemisBrokerBase { long count = 0; String qname = null; if (amq5Dest.isTemporary()) { - qname = "jms.tempqueue." + amq5Dest.getPhysicalName(); + qname = amq5Dest.getPhysicalName(); } else { - qname = "jms.queue." + amq5Dest.getPhysicalName(); + qname = amq5Dest.getPhysicalName(); } Binding binding = server.getPostOffice().getBinding(new SimpleString(qname)); if (binding != null) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java index 03f9675..11b1372 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java @@ -111,7 +111,7 @@ public class JmsQueueCompositeSendReceiveTest extends JmsTopicSendReceiveTest { try (ServerLocator locator = ServerLocatorImpl.newLocator("tcp://localhost:61616"); ClientSessionFactory factory = locator.createSessionFactory(); ClientSession session = factory.createSession()) { - ClientSession.QueueQuery query = session.queueQuery(new SimpleString("jms.queue.TEST")); + ClientSession.QueueQuery query = session.queueQuery(new SimpleString("TEST")); assertNotNull(query); assertEquals(data.length, query.getMessageCount()); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java index 0697e12..82b5f58 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java @@ -65,7 +65,7 @@ public class OptimizedAckTest extends TestSupport { MessageConsumer consumer = session.createConsumer(queue); //check queue delivering count is 10 ArtemisBrokerWrapper broker = (ArtemisBrokerWrapper) ArtemisBrokerHelper.getBroker().getBroker(); - Binding binding = broker.getServer().getPostOffice().getBinding(new SimpleString("jms.queue.test")); + Binding binding = broker.getServer().getPostOffice().getBinding(new SimpleString("test")); final QueueImpl coreQueue = (QueueImpl) binding.getBindable(); assertTrue("delivering count is 10", Wait.waitFor(new Wait.Condition() { @@ -107,7 +107,7 @@ public class OptimizedAckTest extends TestSupport { //check queue delivering count is 10 ArtemisBrokerWrapper broker = (ArtemisBrokerWrapper) ArtemisBrokerHelper.getBroker().getBroker(); - Binding binding = broker.getServer().getPostOffice().getBinding(new SimpleString("jms.queue.test")); + Binding binding = broker.getServer().getPostOffice().getBinding(new SimpleString("test")); final QueueImpl coreQueue = (QueueImpl) binding.getBindable(); assertTrue("prefetch full", Wait.waitFor(new Wait.Condition() { @@ -151,7 +151,7 @@ public class OptimizedAckTest extends TestSupport { MessageConsumer consumer = session.createConsumer(queue); ArtemisBrokerWrapper broker = (ArtemisBrokerWrapper) ArtemisBrokerHelper.getBroker().getBroker(); - Binding binding = broker.getServer().getPostOffice().getBinding(new SimpleString("jms.queue.test")); + Binding binding = broker.getServer().getPostOffice().getBinding(new SimpleString("test")); final QueueImpl coreQueue = (QueueImpl) binding.getBindable(); assertTrue("prefetch full", Wait.waitFor(new Wait.Condition() { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java index 9b120db..4bb0646 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java @@ -158,7 +158,7 @@ public class RemoveDestinationTest { PostOffice po = wrapper.getServer().getPostOffice(); Set<SimpleString> addressSet = po.getAddresses(); Iterator<SimpleString> iter = addressSet.iterator(); - String addressToFind = "jms.topic." + amqTopic.getPhysicalName(); + String addressToFind = amqTopic.getPhysicalName(); while (iter.hasNext()) { if (addressToFind.equals(iter.next().toString())) { found = true; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java index 6c82916..386de2e 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java @@ -368,7 +368,7 @@ public class ZeroPrefetchConsumerTest extends EmbeddedBrokerTestSupport { @Override public EmbeddedJMS createArtemisBroker() throws Exception { Configuration config0 = createConfig("localhost", 0); - String coreQueueAddress = "jms.queue." + brokerZeroQueue.getQueueName(); + String coreQueueAddress = brokerZeroQueue.getQueueName(); AddressSettings addrSettings = new AddressSettings(); addrSettings.setQueuePrefetch(0); config0.getAddressesSettings().put(coreQueueAddress, addrSettings); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java index 589a3fd..29805c0 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java @@ -120,7 +120,7 @@ public class SoWriteTimeoutTest extends JmsTestSupport { frame = stompConnection.receiveFrame(); assertTrue(frame.startsWith("CONNECTED")); - frame = "SUBSCRIBE\n" + "destination:jms.queue." + dest.getQueueName() + "\n" + "ack:client\n\n" + Stomp.NULL; + frame = "SUBSCRIBE\n" + "destination:dest.getQueueName() + "\n" + "ack:client\n\n" + Stomp.NULL; stompConnection.sendFrame(frame); // ensure dispatch has started before pause @@ -148,7 +148,7 @@ public class SoWriteTimeoutTest extends JmsTestSupport { // verify connection is dead try { for (int i = 0; i < 200; i++) { - stompConnection.send("jms.queue." + dest.getPhysicalName(), "ShouldBeDeadConnectionText" + i); + stompConnection.send(dest.getPhysicalName(), "ShouldBeDeadConnectionText" + i); } fail("expected send to fail with timeout out connection"); } catch (SocketException expected) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java index 7723fb6..ee2cb96 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java @@ -316,7 +316,7 @@ public class AMQ1925Test extends OpenwireArtemisBaseTest implements ExceptionLis } private void assertQueueLength(int len) throws Exception, IOException { - QueueImpl queue = (QueueImpl) bs.getActiveMQServer().getPostOffice().getBinding(new SimpleString("jms.queue." + QUEUE_NAME)).getBindable(); + QueueImpl queue = (QueueImpl) bs.getActiveMQServer().getPostOffice().getBinding(new SimpleString(QUEUE_NAME)).getBindable(); if (len > queue.getMessageCount()) { //we wait for a moment as the tx might still in afterCommit stage (async op) Thread.sleep(5000); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java index f2ab9f4..fc6c5d6 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java @@ -241,7 +241,7 @@ public class FailoverConsumerUnconsumedTest extends OpenwireArtemisBaseTest { testConsumers.add(new TestConsumer(consumerSession, destination, connection)); } - assureQueueMessages(0, new SimpleString("jms.queue." + QUEUE_NAME)); + assureQueueMessages(0, new SimpleString(QUEUE_NAME)); produceMessage(consumerSession, destination, maxConsumers * prefetch); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageOverReplicationTest.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageOverReplicationTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageOverReplicationTest.java index 48a6757..d228c22 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageOverReplicationTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageOverReplicationTest.java @@ -79,7 +79,7 @@ public class LargeMessageOverReplicationTest extends ActiveMQTestBase { ReplicatedBackupUtils.configureReplicationPair(backupConfig, backupConnector, backupAcceptor, liveConfig, liveConnector, liveAcceptor); liveServer = createServer(liveConfig); - liveServer.getConfiguration().addQueueConfiguration(new CoreQueueConfiguration().setName("jms.queue.Queue").setAddress("jms.queue.Queue")); + liveServer.getConfiguration().addQueueConfiguration(new CoreQueueConfiguration().setName("Queue").setAddress("Queue")); liveServer.start(); waitForServerToStart(liveServer); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java index 866189f..0437ae0 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java @@ -108,7 +108,7 @@ public class RaceOnSyncLargeMessageOverReplication2Test extends ActiveMQTestBase ReplicatedBackupUtils.configureReplicationPair(backupConfig, backupConnector, backupAcceptor, liveConfig, liveConnector, liveAcceptor); liveServer = createServer(liveConfig); - liveServer.getConfiguration().addQueueConfiguration(new CoreQueueConfiguration().setName("jms.queue.Queue").setAddress("jms.queue.Queue")); + liveServer.getConfiguration().addQueueConfiguration(new CoreQueueConfiguration().setName("Queue").setAddress("Queue")); liveServer.start(); waitForServerToStart(liveServer); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ac7a0c5/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java ---------------------------------------------------------------------- diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java index d649bf2..99818d4 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplicationTest.java @@ -94,7 +94,7 @@ public class RaceOnSyncLargeMessageOverReplicationTest extends ActiveMQTestBase ReplicatedBackupUtils.configureReplicationPair(backupConfig, backupConnector, backupAcceptor, liveConfig, liveConnector, liveAcceptor); liveServer = createServer(liveConfig); - liveServer.getConfiguration().addQueueConfiguration(new CoreQueueConfiguration().setName("jms.queue.Queue").setAddress("jms.queue.Queue")); + liveServer.getConfiguration().addQueueConfiguration(new CoreQueueConfiguration().setName("Queue").setAddress("Queue")); liveServer.start(); waitForServerToStart(liveServer);
