[jboss-cvs] JBoss Messaging SVN: r5397 - in trunk: src/config and 16 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 20 05:27:57 EST 2008
Author: ataylor
Date: 2008-11-20 05:27:56 -0500 (Thu, 20 Nov 2008)
New Revision: 5397
Added:
trunk/tests/src/org/jboss/messaging/tests/integration/queue/
trunk/tests/src/org/jboss/messaging/tests/integration/queue/DeadLetterAddressTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryAddressTest.java
Modified:
trunk/examples/messaging/src/org/jboss/messaging/example/ManagementClient.java
trunk/src/config/queues.xml
trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueSettingsDeployer.java
trunk/src/main/org/jboss/messaging/core/management/QueueControlMBean.java
trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java
trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java
trunk/src/main/org/jboss/messaging/core/server/MessageReference.java
trunk/src/main/org/jboss/messaging/core/server/Queue.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
trunk/src/main/org/jboss/messaging/core/settings/impl/QueueSettings.java
trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControlMBean.java
trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueSettingsDeployerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/QueueSettingsTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java
Log:
changed DLQ and expiry to use address rather than queue
Modified: trunk/examples/messaging/src/org/jboss/messaging/example/ManagementClient.java
===================================================================
--- trunk/examples/messaging/src/org/jboss/messaging/example/ManagementClient.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/examples/messaging/src/org/jboss/messaging/example/ManagementClient.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -73,7 +73,7 @@
System.out.println("\toperation succeeded:" + ManagementHelper.hasOperationSucceeded(message));
if (ManagementHelper.hasOperationSucceeded(message))
{
- System.out.println("\t- result=" + message.getProperty(new SimpleString("sendMessageToDLQ")));
+ System.out.println("\t- result=" + message.getProperty(new SimpleString("sendMessageToDeadLetterAddress")));
}
else
{
@@ -155,13 +155,13 @@
producer.send(DEFAULT_MANAGEMENT_ADDRESS, mngmntMessage);
System.out.println("sent management message to retrieve attributes");
- // create a message to invoke the operation sendMessageToDLQ(long) on the
+ // create a message to invoke the operation sendMessageToDeadLetterAddress(long) on the
// queue
mngmntMessage = clientSession.createClientMessage(false);
ManagementHelper.putOperationInvocation(mngmntMessage,
replytoQueue,
ManagementServiceImpl.getQueueObjectName(queue, queue),
- "sendMessageToDLQ",
+ "sendMessageToDeadLetterAddress",
(long)6161);
producer.send(DEFAULT_MANAGEMENT_ADDRESS, mngmntMessage);
System.out.println("sent management message to invoke operation");
Modified: trunk/src/config/queues.xml
===================================================================
--- trunk/src/config/queues.xml 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/src/config/queues.xml 2008-11-20 10:27:56 UTC (rev 5397)
@@ -64,13 +64,13 @@
</security>
<queue-settings match="queuejms.QueueWithOwnDLQAndExpiryQueue">
- <dlq>queuejms.PrivateDLQ</dlq>
+ <dead-letter-address>queuejms.PrivateDLQ</dead-letter-address>
<expiry-queue>queuejms.PrivateExpiryQueue</expiry-queue>
</queue-settings>
<queue-settings match="topicjms.TopicWithOwnDLQAndExpiryQueue">
- <dlq>queuejms.PrivateDLQ</dlq>
- <expiry-queue>queuejms.PrivateExpiryQueue</expiry-queue>
+ <dead-letter-address>queuejms.PrivateDLQ</dead-letter-address>
+ <expiry-address>queuejms.PrivateExpiryQueue</expiry-address>
</queue-settings>
<queue-settings match="queuejms.QueueWithOwnRedeliveryDelay">
@@ -109,8 +109,8 @@
<!--default for catch all-->
<queue-settings match="*">
<clustered>false</clustered>
- <dlq>queuejms.DLQ</dlq>
- <expiry-queue>queuejms.ExpiryQueue</expiry-queue>
+ <dead-letter-address>queuejms.DLQ</dead-letter-address>
+ <expiry-address>queuejms.ExpiryQueue</expiry-address>
<redelivery-delay>0</redelivery-delay>
<max-size-bytes>-1</max-size-bytes>
<distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributionPolicy</distribution-policy-class>
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueSettingsDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueSettingsDeployer.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/QueueSettingsDeployer.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -37,9 +37,9 @@
{
private static final String CLUSTERED_NODE_NAME = "manageConfirmations";
- private static final String DLQ_NODE_NAME = "dlq";
+ private static final String DEAD_LETTER_ADDRESS_NODE_NAME = "dead-letter-address";
- private static final String EXPIRY_QUEUE_NODE_NAME = "expiry-queue";
+ private static final String EXPIRY_ADDRESS_NODE_NAME = "expiry-address";
private static final String REDELIVERY_DELAY_NODE_NAME = "redelivery-delay";
@@ -54,7 +54,7 @@
private static final String MESSAGE_COUNTER_HISTORY_DAY_LIMIT_NODE_NAME = "message-counter-history-day-limit";
private final HierarchicalRepository<QueueSettings> queueSettingsRepository;
-
+
public QueueSettingsDeployer(final DeploymentManager deploymentManager, final HierarchicalRepository<QueueSettings> queueSettingsRepository)
{
super(deploymentManager);
@@ -91,15 +91,15 @@
{
queueSettings.setClustered(Boolean.valueOf(child.getTextContent()));
}
- else if (DLQ_NODE_NAME.equalsIgnoreCase(child.getNodeName()))
+ else if (DEAD_LETTER_ADDRESS_NODE_NAME.equalsIgnoreCase(child.getNodeName()))
{
SimpleString queueName = new SimpleString(child.getTextContent());
- queueSettings.setDLQ(queueName);
+ queueSettings.setDeadLetterAddress(queueName);
}
- else if (EXPIRY_QUEUE_NODE_NAME.equalsIgnoreCase(child.getNodeName()))
+ else if (EXPIRY_ADDRESS_NODE_NAME.equalsIgnoreCase(child.getNodeName()))
{
SimpleString queueName = new SimpleString(child.getTextContent());
- queueSettings.setExpiryQueue(queueName);
+ queueSettings.setExpiryAddress(queueName);
}
else if (REDELIVERY_DELAY_NODE_NAME.equalsIgnoreCase(child.getNodeName()))
{
Modified: trunk/src/main/org/jboss/messaging/core/management/QueueControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/QueueControlMBean.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/src/main/org/jboss/messaging/core/management/QueueControlMBean.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -64,7 +64,7 @@
String getExpiryQueue();
- String getDLQ();
+ String getDeadLetterAddress();
boolean isBackup();
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -202,7 +202,7 @@
List<MessageReference> refs = queue.list(filter);
for (MessageReference ref : refs)
{
- queue.sendMessageToDLQ(ref.getMessage().getMessageID(), storageManager, postOffice, queueSettingsRepository);
+ queue.sendMessageToDeadLetterAddress(ref.getMessage().getMessageID(), storageManager, postOffice, queueSettingsRepository);
}
return refs.size();
}
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -158,14 +158,14 @@
return queue.getSizeBytes();
}
- public String getDLQ()
+ public String getDeadLetterAddress()
{
- return queueSettingsRepository.getMatch(getName()).getDLQ().toString();
+ return queueSettingsRepository.getMatch(getName()).getDeadLetterAddress().toString();
}
public String getExpiryQueue()
{
- return queueSettingsRepository.getMatch(getName()).getExpiryQueue()
+ return queueSettingsRepository.getMatch(getName()).getExpiryAddress()
.toString();
}
@@ -325,7 +325,7 @@
public boolean sendMessageToDLQ(final long messageID) throws Exception
{
- return queue.sendMessageToDLQ(messageID, storageManager, postOffice,
+ return queue.sendMessageToDeadLetterAddress(messageID, storageManager, postOffice,
queueSettingsRepository);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/MessageReference.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/MessageReference.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/src/main/org/jboss/messaging/core/server/MessageReference.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -66,7 +66,7 @@
boolean cancel(StorageManager storageManager, PostOffice postOffice,
HierarchicalRepository<QueueSettings> queueSettingsRepository) throws Exception;
- void sendToDLQ(StorageManager storageManager, PostOffice postOffice,
+ void sendToDeadLetterAddress(StorageManager storageManager, PostOffice postOffice,
HierarchicalRepository<QueueSettings> queueSettingsRepository) throws Exception;
void expire(StorageManager storageManager, PostOffice postOffice,
Modified: trunk/src/main/org/jboss/messaging/core/server/Queue.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/Queue.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/src/main/org/jboss/messaging/core/server/Queue.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -118,7 +118,7 @@
HierarchicalRepository<QueueSettings> queueSettingsRepository)
throws Exception;
- boolean sendMessageToDLQ(long messageID, StorageManager storageManager,
+ boolean sendMessageToDeadLetterAddress(long messageID, StorageManager storageManager,
PostOffice postOffice,
HierarchicalRepository<QueueSettings> queueSettingsRepository)
throws Exception;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessageReferenceImpl.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -27,7 +27,6 @@
import static org.jboss.messaging.core.message.impl.MessageImpl.HDR_ORIG_MESSAGE_ID;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.impl.MessageImpl;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
@@ -138,8 +137,8 @@
if (maxDeliveries > 0 && deliveryCount >= maxDeliveries)
{
- log.warn("Message has reached maximum delivery attempts, sending it to DLQ");
- sendToDLQ(storageManager, postOffice, queueSettingsRepository);
+ log.warn("Message has reached maximum delivery attempts, sending it to Dead Letter Address");
+ sendToDeadLetterAddress(storageManager, postOffice, queueSettingsRepository);
return false;
}
@@ -159,27 +158,18 @@
}
}
- public void sendToDLQ(final StorageManager persistenceManager,
+ public void sendToDeadLetterAddress(final StorageManager persistenceManager,
final PostOffice postOffice,
final HierarchicalRepository<QueueSettings> queueSettingsRepository) throws Exception
{
- SimpleString dlq = queueSettingsRepository.getMatch(queue.getName().toString()).getDLQ();
-
- //FIXME - this is not thread safe
- if (dlq != null)
+ SimpleString deadLetterAddress = queueSettingsRepository.getMatch(queue.getName().toString()).getDeadLetterAddress();
+ if (deadLetterAddress != null)
{
- Binding dlqBinding = postOffice.getBinding(dlq);
-
- if (dlqBinding == null)
- {
- dlqBinding = postOffice.addBinding(dlq, dlq, null, true, false, false);
- }
-
- move(dlqBinding, persistenceManager, postOffice, false);
+ move(deadLetterAddress, persistenceManager, postOffice, false);
}
else
{
- log.warn("Message has exceeded max delivery attempts. No DLQ configured for queue " + queue.getName() + " so dropping it");
+ log.warn("Message has exceeded max delivery attempts. No Dead Letter Address configured for queue " + queue.getName() + " so dropping it");
Transaction tx = new TransactionImpl(persistenceManager, postOffice);
tx.addAcknowledgement(this);
@@ -191,20 +181,11 @@
final PostOffice postOffice,
final HierarchicalRepository<QueueSettings> queueSettingsRepository) throws Exception
{
- SimpleString expiryQueue = queueSettingsRepository.getMatch(queue.getName().toString()).getExpiryQueue();
+ SimpleString expiryQueue = queueSettingsRepository.getMatch(queue.getName().toString()).getExpiryAddress();
if (expiryQueue != null)
{
- Binding expiryBinding = postOffice.getBinding(expiryQueue);
-
- //FIXME - this is not threadsafe - what if two refs get expired for same queue at same time
- //might try and create the binding twice?
- if (expiryBinding == null)
- {
- expiryBinding = postOffice.addBinding(expiryQueue, expiryQueue, null, true, false, false);
- }
-
- move(expiryBinding, persistenceManager, postOffice, true);
+ move(expiryQueue, persistenceManager, postOffice, true);
}
else
{
@@ -255,10 +236,28 @@
tx.commit();
}
+ private void move(final SimpleString address,
+ final StorageManager persistenceManager,
+ final PostOffice postOffice,
+ final boolean expiry) throws Exception
+ {
+ Transaction tx = new TransactionImpl(persistenceManager, postOffice);
+
+ ServerMessage copyMessage = makeCopy(expiry, persistenceManager);
+
+ copyMessage.setDestination(address);
+
+ tx.addMessage(copyMessage);
+
+ tx.addAcknowledgement(this);
+
+ tx.commit();
+ }
+
private ServerMessage makeCopy(final boolean expiry, final StorageManager pm) throws Exception
{
/*
- We copy the message and send that to the dlq/expiry queue - this is
+ We copy the message and send that to the dla/expiry queue - this is
because otherwise we may end up with a ref with the same message id in the
queue more than once which would barf - this might happen if the same message had been
expire from multiple subscriptions of a topic for example
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -471,7 +471,7 @@
return false;
}
- public boolean sendMessageToDLQ(final long messageID,
+ public boolean sendMessageToDeadLetterAddress(final long messageID,
final StorageManager storageManager,
final PostOffice postOffice,
final HierarchicalRepository<QueueSettings> queueSettingsRepository) throws Exception
@@ -484,7 +484,7 @@
if (ref.getMessage().getMessageID() == messageID)
{
deliveringCount.incrementAndGet();
- ref.sendToDLQ(storageManager, postOffice, queueSettingsRepository);
+ ref.sendToDeadLetterAddress(storageManager, postOffice, queueSettingsRepository);
iter.remove();
return true;
}
Modified: trunk/src/main/org/jboss/messaging/core/settings/impl/QueueSettings.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/settings/impl/QueueSettings.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/src/main/org/jboss/messaging/core/settings/impl/QueueSettings.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -71,9 +71,9 @@
private Long redeliveryDelay = null;
- private SimpleString DLQ = null;
+ private SimpleString deadLetterAddress = null;
- private SimpleString ExpiryQueue = null;
+ private SimpleString ExpiryAddress = null;
public Boolean isClustered()
{
@@ -156,24 +156,24 @@
this.distributionPolicyClass = distributionPolicyClass;
}
- public SimpleString getDLQ()
+ public SimpleString getDeadLetterAddress()
{
- return DLQ;
+ return deadLetterAddress;
}
- public void setDLQ(SimpleString DLQ)
+ public void setDeadLetterAddress(SimpleString deadLetterAddress)
{
- this.DLQ = DLQ;
+ this.deadLetterAddress = deadLetterAddress;
}
- public SimpleString getExpiryQueue()
+ public SimpleString getExpiryAddress()
{
- return ExpiryQueue;
+ return ExpiryAddress;
}
- public void setExpiryQueue(SimpleString expiryQueue)
+ public void setExpiryAddress(SimpleString expiryAddress)
{
- ExpiryQueue = expiryQueue;
+ ExpiryAddress = expiryAddress;
}
public DistributionPolicy getDistributionPolicy()
@@ -233,13 +233,13 @@
{
distributionPolicyClass = merged.distributionPolicyClass;
}
- if (DLQ == null)
+ if (deadLetterAddress == null)
{
- DLQ = merged.DLQ;
+ deadLetterAddress = merged.deadLetterAddress;
}
- if (ExpiryQueue == null)
+ if (ExpiryAddress == null)
{
- ExpiryQueue = merged.ExpiryQueue;
+ ExpiryAddress = merged.ExpiryAddress;
}
}
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControlMBean.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControlMBean.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -45,9 +45,9 @@
String getExpiryQueue();
- void setExpiryQueue(@Parameter(name = "expiryQueue", desc = "Name of the expiry queueur") String expiryQueue);
+ void setExpiryAddress(@Parameter(name = "expiryQueue", desc = "Name of the expiry queueur") String expiryQueue);
- String getDLQ();
+ String getDeadLetterAddress();
int getMessagesAdded();
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -174,12 +174,12 @@
return binding;
}
- public String getDLQ()
+ public String getDeadLetterAddress()
{
QueueSettings queueSettings = queueSettingsRepository.getMatch(getName());
- if (queueSettings != null && queueSettings.getDLQ() != null)
+ if (queueSettings != null && queueSettings.getDeadLetterAddress() != null)
{
- return JBossDestination.fromAddress(queueSettings.getDLQ().toString())
+ return JBossDestination.fromAddress(queueSettings.getDeadLetterAddress().toString())
.getName();
} else
{
@@ -190,23 +190,23 @@
public String getExpiryQueue()
{
QueueSettings queueSettings = queueSettingsRepository.getMatch(getName());
- if (queueSettings != null && queueSettings.getExpiryQueue() != null)
+ if (queueSettings != null && queueSettings.getExpiryAddress() != null)
{
return JBossDestination.fromAddress(
- queueSettings.getExpiryQueue().toString()).getName();
+ queueSettings.getExpiryAddress().toString()).getName();
} else
{
return null;
}
}
- public void setExpiryQueue(String expiryQueueName)
+ public void setExpiryAddress(String expiryQueueName)
{
QueueSettings queueSettings = queueSettingsRepository.getMatch(getName());
if (expiryQueueName != null)
{
- queueSettings.setExpiryQueue(new SimpleString(expiryQueueName));
+ queueSettings.setExpiryAddress(new SimpleString(expiryQueueName));
}
}
@@ -320,7 +320,7 @@
throw new IllegalArgumentException(
"No message found for JMSMessageID: " + messageID);
}
- return coreQueue.sendMessageToDLQ(
+ return coreQueue.sendMessageToDeadLetterAddress(
refs.get(0).getMessage().getMessageID(), storageManager,
postOffice, queueSettingsRepository);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -233,7 +233,7 @@
JBossQueue expiryQueue = new JBossQueue(expiryQueueName);
serverManager.createQueue(expiryQueueName, expiryQueueName);
// FIXME we must be able to pass the queue name, not its address
- queueControl.setExpiryQueue(expiryQueue.getAddress());
+ queueControl.setExpiryAddress(expiryQueue.getAddress());
JMSQueueControlMBean expiryQueueControl = createQueueControl(expiryQueue);
JMSUtil.sendMessages(queue, 1);
Added: trunk/tests/src/org/jboss/messaging/tests/integration/queue/DeadLetterAddressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/queue/DeadLetterAddressTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/queue/DeadLetterAddressTest.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -0,0 +1,198 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.tests.integration.queue;
+
+import org.jboss.messaging.tests.util.UnitTestCase;
+import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
+import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.client.ClientSessionFactory;
+import org.jboss.messaging.core.client.ClientProducer;
+import org.jboss.messaging.core.client.ClientConsumer;
+import org.jboss.messaging.core.client.ClientMessage;
+import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.config.TransportConfiguration;
+import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.settings.impl.QueueSettings;
+import org.jboss.messaging.core.transaction.impl.XidImpl;
+import org.jboss.messaging.util.SimpleString;
+
+import javax.transaction.xa.Xid;
+import javax.transaction.xa.XAResource;
+
+/**
+ * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
+ */
+public class DeadLetterAddressTest extends UnitTestCase
+{
+ private MessagingService messagingService;
+
+ private ClientSession clientSession;
+
+ public void testBasicSend() throws Exception
+ {
+ Xid xid = new XidImpl("bq".getBytes(), 0, "gt".getBytes());
+ SimpleString dla = new SimpleString("DLA");
+ SimpleString qName = new SimpleString("q1");
+ QueueSettings queueSettings = new QueueSettings();
+ queueSettings.setMaxDeliveryAttempts(1);
+ queueSettings.setDeadLetterAddress(dla);
+ messagingService.getServer().getQueueSettingsRepository().addMatch(qName.toString(), queueSettings);
+ SimpleString dlq = new SimpleString("DLQ1");
+ clientSession.createQueue(dla, dlq, null, false, false, false);
+ clientSession.createQueue(qName, qName, null, false, false, false);
+ ClientProducer producer = clientSession.createProducer(qName);
+ producer.send(createTextMessage("heyho!", clientSession));
+ clientSession.start();
+ clientSession.start(xid, XAResource.TMNOFLAGS);
+ ClientConsumer clientConsumer = clientSession.createConsumer(qName);
+ ClientMessage m = clientConsumer.receive(500);
+ m.acknowledge();
+ assertNotNull(m);
+ assertEquals(m.getBody().getString(), "heyho!");
+ //force a cancel
+ clientSession.end(xid, XAResource.TMSUCCESS);
+ clientSession.rollback(xid);
+ m = clientConsumer.receive(500);
+ assertNull(m);
+ clientConsumer.close();
+ clientConsumer = clientSession.createConsumer(dlq);
+ m = clientConsumer.receive(500);
+ assertNotNull(m);
+ assertEquals(m.getBody().getString(), "heyho!");
+ }
+
+ public void testBasicSendToMultipleQueues() throws Exception
+ {
+ Xid xid = new XidImpl("bq".getBytes(), 0, "gt".getBytes());
+ SimpleString dla = new SimpleString("DLA");
+ SimpleString qName = new SimpleString("q1");
+ QueueSettings queueSettings = new QueueSettings();
+ queueSettings.setMaxDeliveryAttempts(1);
+ queueSettings.setDeadLetterAddress(dla);
+ messagingService.getServer().getQueueSettingsRepository().addMatch(qName.toString(), queueSettings);
+ SimpleString dlq = new SimpleString("DLQ1");
+ SimpleString dlq2 = new SimpleString("DLQ2");
+ clientSession.createQueue(dla, dlq, null, false, false, true);
+ clientSession.createQueue(dla, dlq2, null, false, false, true);
+ clientSession.createQueue(qName, qName, null, false, false, true);
+ ClientProducer producer = clientSession.createProducer(qName);
+ producer.send(createTextMessage("heyho!", clientSession));
+ clientSession.start();
+ clientSession.start(xid, XAResource.TMNOFLAGS);
+ ClientConsumer clientConsumer = clientSession.createConsumer(qName);
+ ClientMessage m = clientConsumer.receive(500);
+ m.acknowledge();
+ assertNotNull(m);
+ assertEquals(m.getBody().getString(), "heyho!");
+ //force a cancel
+ clientSession.end(xid, XAResource.TMSUCCESS);
+ clientSession.rollback(xid);
+ clientSession.start(xid, XAResource.TMNOFLAGS);
+ m = clientConsumer.receive(500);
+ assertNull(m);
+ clientConsumer.close();
+ clientConsumer = clientSession.createConsumer(dlq);
+ m = clientConsumer.receive(500);
+ assertNotNull(m);
+ m.acknowledge();
+ assertEquals(m.getBody().getString(), "heyho!");
+ clientConsumer.close();
+ clientConsumer = clientSession.createConsumer(dlq2);
+ m = clientConsumer.receive(500);
+ assertNotNull(m);
+ m.acknowledge();
+ assertEquals(m.getBody().getString(), "heyho!");
+ clientConsumer.close();
+ }
+
+ public void testBasicSendToNoQueue() throws Exception
+ {
+ Xid xid = new XidImpl("bq".getBytes(), 0, "gt".getBytes());
+ SimpleString qName = new SimpleString("q1");
+ QueueSettings queueSettings = new QueueSettings();
+ queueSettings.setMaxDeliveryAttempts(1);
+ messagingService.getServer().getQueueSettingsRepository().addMatch(qName.toString(), queueSettings);
+ clientSession.createQueue(qName, qName, null, false, false, false);
+ ClientProducer producer = clientSession.createProducer(qName);
+ producer.send(createTextMessage("heyho!", clientSession));
+ clientSession.start();
+ clientSession.start(xid, XAResource.TMNOFLAGS);
+ ClientConsumer clientConsumer = clientSession.createConsumer(qName);
+ ClientMessage m = clientConsumer.receive(500);
+ m.acknowledge();
+ assertNotNull(m);
+ assertEquals(m.getBody().getString(), "heyho!");
+ //force a cancel
+ clientSession.end(xid, XAResource.TMSUCCESS);
+ clientSession.rollback(xid);
+ m = clientConsumer.receive(500);
+ assertNull(m);
+ clientConsumer.close();
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ ConfigurationImpl configuration = new ConfigurationImpl();
+ configuration.setSecurityEnabled(false);
+ TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
+ configuration.getAcceptorConfigurations().add(transportConfig);
+ messagingService = MessagingServiceImpl.newNullStorageMessagingServer(configuration);
+ //start the server
+ messagingService.start();
+ //then we create a client as normal
+ ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+ clientSession = sessionFactory.createSession(true, true, false);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ if (clientSession != null)
+ {
+ try
+ {
+ clientSession.close();
+ }
+ catch (MessagingException e1)
+ {
+ //
+ }
+ }
+ if (messagingService != null && messagingService.isStarted())
+ {
+ try
+ {
+ messagingService.stop();
+ }
+ catch (Exception e1)
+ {
+ //
+ }
+ }
+ messagingService = null;
+ clientSession = null;
+ }
+
+}
Added: trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryAddressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryAddressTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/queue/ExpiryAddressTest.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -0,0 +1,176 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.tests.integration.queue;
+
+import org.jboss.messaging.tests.util.UnitTestCase;
+import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
+import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.client.ClientProducer;
+import org.jboss.messaging.core.client.ClientConsumer;
+import org.jboss.messaging.core.client.ClientMessage;
+import org.jboss.messaging.core.client.ClientSessionFactory;
+import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
+import org.jboss.messaging.core.settings.impl.QueueSettings;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.config.TransportConfiguration;
+import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.util.SimpleString;
+
+
+/**
+ * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
+ */
+public class ExpiryAddressTest extends UnitTestCase
+{
+ private MessagingService messagingService;
+
+ private ClientSession clientSession;
+
+ public void testBasicSend() throws Exception
+ {
+ SimpleString ea = new SimpleString("EA");
+ SimpleString qName = new SimpleString("q1");
+ SimpleString eq = new SimpleString("EA1");
+ QueueSettings queueSettings = new QueueSettings();
+ queueSettings.setExpiryAddress(ea);
+ messagingService.getServer().getQueueSettingsRepository().addMatch(qName.toString(), queueSettings);
+ clientSession.createQueue(ea, eq, null, false, false, false);
+ clientSession.createQueue(qName, qName, null, false, false, false);
+ ClientProducer producer = clientSession.createProducer(qName);
+ ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
+ clientMessage.setExpiration(System.currentTimeMillis());
+ producer.send(clientMessage);
+ clientSession.start();
+ ClientConsumer clientConsumer = clientSession.createConsumer(qName);
+ ClientMessage m = clientConsumer.receive(500);
+ assertNull(m);
+ m = clientConsumer.receive(500);
+ assertNull(m);
+ clientConsumer.close();
+ clientConsumer = clientSession.createConsumer(eq);
+ m = clientConsumer.receive(500);
+ assertNotNull(m);
+ assertEquals(m.getBody().getString(), "heyho!");
+ }
+
+ public void testBasicSendToMultipleQueues() throws Exception
+ {
+ SimpleString ea = new SimpleString("EA");
+ SimpleString qName = new SimpleString("q1");
+ SimpleString eq = new SimpleString("EQ1");
+ SimpleString eq2 = new SimpleString("EQ2");
+ QueueSettings queueSettings = new QueueSettings();
+ queueSettings.setExpiryAddress(ea);
+ messagingService.getServer().getQueueSettingsRepository().addMatch(qName.toString(), queueSettings);
+ clientSession.createQueue(ea, eq, null, false, false, true);
+ clientSession.createQueue(ea, eq2, null, false, false, true);
+ clientSession.createQueue(qName, qName, null, false, false, true);
+ ClientProducer producer = clientSession.createProducer(qName);
+ ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
+ clientMessage.setExpiration(System.currentTimeMillis());
+ producer.send(clientMessage);
+ clientSession.start();
+ ClientConsumer clientConsumer = clientSession.createConsumer(qName);
+ ClientMessage m = clientConsumer.receive(500);
+ assertNull(m);
+ clientConsumer.close();
+ clientConsumer = clientSession.createConsumer(eq);
+ m = clientConsumer.receive(500);
+ assertNotNull(m);
+ m.acknowledge();
+ assertEquals(m.getBody().getString(), "heyho!");
+ clientConsumer.close();
+ clientConsumer = clientSession.createConsumer(eq2);
+ m = clientConsumer.receive(500);
+ assertNotNull(m);
+ m.acknowledge();
+ assertEquals(m.getBody().getString(), "heyho!");
+ clientConsumer.close();
+ }
+
+ public void testBasicSendToNoQueue() throws Exception
+ {
+ SimpleString ea = new SimpleString("EA");
+ SimpleString qName = new SimpleString("q1");
+ SimpleString eq = new SimpleString("EQ1");
+ SimpleString eq2 = new SimpleString("EQ2");
+ clientSession.createQueue(ea, eq, null, false, false, false);
+ clientSession.createQueue(ea, eq2, null, false, false, false);
+ clientSession.createQueue(qName, qName, null, false, false, false);
+ ClientProducer producer = clientSession.createProducer(qName);
+ ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
+ clientMessage.setExpiration(System.currentTimeMillis());
+ producer.send(clientMessage);
+ clientSession.start();
+ ClientConsumer clientConsumer = clientSession.createConsumer(qName);
+ ClientMessage m = clientConsumer.receive(500);
+ assertNull(m);
+ clientConsumer.close();
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ ConfigurationImpl configuration = new ConfigurationImpl();
+ configuration.setSecurityEnabled(false);
+ TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
+ configuration.getAcceptorConfigurations().add(transportConfig);
+ messagingService = MessagingServiceImpl.newNullStorageMessagingServer(configuration);
+ //start the server
+ messagingService.start();
+ //then we create a client as normal
+ ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+ clientSession = sessionFactory.createSession(true, true, false);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ if (clientSession != null)
+ {
+ try
+ {
+ clientSession.close();
+ }
+ catch (MessagingException e1)
+ {
+ //
+ }
+ }
+ if (messagingService != null && messagingService.isStarted())
+ {
+ try
+ {
+ messagingService.stop();
+ }
+ catch (Exception e1)
+ {
+ //
+ }
+ }
+ messagingService = null;
+ clientSession = null;
+ }
+
+}
+
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueSettingsDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueSettingsDeployerTest.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueSettingsDeployerTest.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -40,8 +40,8 @@
{
private String conf = "<queue-settings match=\"queues.*\">\n" +
" <manageConfirmations>false</manageConfirmations>\n" +
- " <dlq>DLQtest</dlq>\n" +
- " <expiry-queue>ExpiryQueueTest</expiry-queue>\n" +
+ " <dead-letter-address>DLQtest</dead-letter-address>\n" +
+ " <expiry-address>ExpiryQueueTest</expiry-address>\n" +
" <redelivery-delay>100</redelivery-delay>\n" +
" <max-size-bytes>-100</max-size-bytes>\n" +
" <distribution-policy-class>org.jboss.messaging.core.impl.RoundRobinDistributionPolicy</distribution-policy-class>\n" +
@@ -67,8 +67,8 @@
queueSettings.setMaxSizeBytes(-100);
queueSettings.setDistributionPolicyClass("org.jboss.messaging.core.impl.RoundRobinDistributionPolicy");
queueSettings.setMessageCounterHistoryDayLimit(1000);
- queueSettings.setDLQ(new SimpleString("DLQtest"));
- queueSettings.setExpiryQueue(new SimpleString("ExpiryQueueTest"));
+ queueSettings.setDeadLetterAddress(new SimpleString("DLQtest"));
+ queueSettings.setExpiryAddress(new SimpleString("ExpiryQueueTest"));
repository.addMatch(EasyMock.eq("queues.*"),(QueueSettings) EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new IAnswer<Object>()
@@ -81,8 +81,8 @@
assertEquals(q.getMaxSizeBytes(), queueSettings.getMaxSizeBytes());
assertEquals(q.getDistributionPolicyClass(), queueSettings.getDistributionPolicyClass());
assertEquals(q.getMessageCounterHistoryDayLimit(), queueSettings.getMessageCounterHistoryDayLimit());
- assertEquals(q.getDLQ(), queueSettings.getDLQ());
- assertEquals(q.getExpiryQueue(), queueSettings.getExpiryQueue());
+ assertEquals(q.getDeadLetterAddress(), queueSettings.getDeadLetterAddress());
+ assertEquals(q.getExpiryAddress(), queueSettings.getExpiryAddress());
return null;
}
});
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -276,7 +276,7 @@
QueueSettings queueSettings = new QueueSettings()
{
@Override
- public SimpleString getDLQ()
+ public SimpleString getDeadLetterAddress()
{
return new SimpleString(dlqName);
}
@@ -287,7 +287,7 @@
replayMockedAttributes();
QueueControlMBean control = createControl();
- assertEquals(dlqName, control.getDLQ());
+ assertEquals(dlqName, control.getDeadLetterAddress());
verifyMockedAttributes();
}
@@ -300,7 +300,7 @@
QueueSettings queueSettings = new QueueSettings()
{
@Override
- public SimpleString getExpiryQueue()
+ public SimpleString getExpiryAddress()
{
return new SimpleString(expiryQueueName);
}
@@ -619,7 +619,7 @@
{
long messageID = randomLong();
expect(
- queue.sendMessageToDLQ(messageID, storageManager, postOffice,
+ queue.sendMessageToDeadLetterAddress(messageID, storageManager, postOffice,
repository)).andReturn(true);
replayMockedAttributes();
@@ -634,7 +634,7 @@
{
long messageID = randomLong();
expect(
- queue.sendMessageToDLQ(messageID, storageManager, postOffice,
+ queue.sendMessageToDeadLetterAddress(messageID, storageManager, postOffice,
repository)).andReturn(false);
replayMockedAttributes();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -123,10 +123,10 @@
QueueSettings queueSettings = new QueueSettings();
queueSettings.setMaxDeliveryAttempts(1);
SimpleString dlqName = new SimpleString("testDLQ");
- queueSettings.setDLQ(dlqName);
+ queueSettings.setDeadLetterAddress(dlqName);
Binding dlqBinding = EasyMock.createStrictMock(Binding.class);
- EasyMock.expect(dlqBinding.getAddress()).andReturn(dlqName);
+ //EasyMock.expect(dlqBinding.getAddress()).andReturn(dlqName);
StorageManager sm = EasyMock.createNiceMock(StorageManager.class);
@@ -163,7 +163,7 @@
sm.updateDeliveryCount(messageReference);
- EasyMock.expect(po.getBinding(dlqName)).andReturn(dlqBinding);
+ //EasyMock.expect(po.getBinding(dlqName)).andReturn(dlqBinding);
EasyMock.expect(serverMessage.copy()).andReturn(serverMessage);
@@ -191,89 +191,13 @@
EasyMock.verify(sm, po, repos, serverMessage, queue, dlqBinding, pm);
}
- public void testCancelToDLQDoesntExist() throws Exception
- {
- QueueSettings queueSettings = new QueueSettings();
- queueSettings.setMaxDeliveryAttempts(1);
-
- SimpleString dlqName = new SimpleString("testDLQ");
-
- queueSettings.setDLQ(dlqName);
-
- Binding dlqBinding = EasyMock.createStrictMock(Binding.class);
-
- EasyMock.expect(dlqBinding.getAddress()).andReturn(dlqName);
-
- StorageManager sm = EasyMock.createNiceMock(StorageManager.class);
-
- PostOffice po = EasyMock.createStrictMock(PostOffice.class);
- PagingManager pm = EasyMock.createNiceMock(PagingManager.class);
- EasyMock.expect(pm.page(EasyMock.isA(ServerMessage.class))).andStubReturn(false);
- EasyMock.expect(po.getPagingManager()).andStubReturn(pm);
- EasyMock.expect(pm.isPaging(EasyMock.isA(SimpleString.class))).andStubReturn(false);
- pm.messageDone(EasyMock.isA(ServerMessage.class));
- EasyMock.expectLastCall().anyTimes();
-
- HierarchicalRepository<QueueSettings> repos = EasyMock.createStrictMock(HierarchicalRepository.class);
-
- ServerMessage serverMessage = EasyMock.createNiceMock(ServerMessage.class);
-
- Queue queue = EasyMock.createStrictMock(Queue.class);
-
- EasyMock.expect(queue.getPersistenceID()).andStubReturn(1);
-
- MessageReferenceImpl messageReference = new DummyMessageReference(serverMessage, queue);
- messageReference.setDeliveryCount(1);
-
- SimpleString queueName = new SimpleString("queueName");
-
- queue.referenceAcknowledged(messageReference);
-
- EasyMock.expect(queue.getName()).andStubReturn(queueName);
-
- EasyMock.expect(repos.getMatch(queueName.toString())).andStubReturn(queueSettings);
-
- EasyMock.expect(serverMessage.isDurable()).andStubReturn(true);
- EasyMock.expect(serverMessage.getMessageID()).andStubReturn(999l);
-
- EasyMock.expect(queue.isDurable()).andStubReturn(true);
-
- sm.updateDeliveryCount(messageReference);
-
- EasyMock.expect(po.getBinding(dlqName)).andReturn(null);
- EasyMock.expect(po.addBinding(dlqName, dlqName, null, true, false, false)).andReturn(dlqBinding);
-
- EasyMock.expect(serverMessage.copy()).andReturn(serverMessage);
-
- EasyMock.expect(sm.generateUniqueID()).andReturn(2l);
-
- // serverMessage.setMessageID(2);
-
- EasyMock.expect(serverMessage.getDestination()).andReturn(queueName);
- serverMessage.putStringProperty(MessageImpl.HDR_ORIGIN_QUEUE, queueName);
- serverMessage.setExpiration(0);
- serverMessage.setDestination(dlqName);
-
- EasyMock.expect(po.route(serverMessage)).andReturn(new ArrayList<MessageReference>());
-
- EasyMock.expect(serverMessage.getDurableRefCount()).andReturn(0);
- EasyMock.expect(serverMessage.decrementDurableRefCount()).andReturn(0);
-
- EasyMock.expect(sm.generateUniqueID()).andReturn(1l);
-
- EasyMock.replay(sm, po, repos, serverMessage, queue, dlqBinding, pm);
-
- assertFalse(messageReference.cancel(sm, po, repos));
-
- EasyMock.verify(sm, po, repos, serverMessage, queue, dlqBinding, pm);
- }
-
+
public void testExpire() throws Exception
{
QueueSettings queueSettings = new QueueSettings();
queueSettings.setMaxDeliveryAttempts(1);
SimpleString dlqName = new SimpleString("testDLQ");
- queueSettings.setDLQ(dlqName);
+ queueSettings.setDeadLetterAddress(dlqName);
StorageManager sm = EasyMock.createNiceMock(StorageManager.class);
PostOffice po = EasyMock.createStrictMock(PostOffice.class);
@@ -313,7 +237,7 @@
queueSettings.setMaxDeliveryAttempts(1);
SimpleString expQName = new SimpleString("testexpQ");
Binding expQBinding = EasyMock.createStrictMock(Binding.class);
- queueSettings.setExpiryQueue(expQName);
+ queueSettings.setExpiryAddress(expQName);
StorageManager sm = EasyMock.createNiceMock(StorageManager.class);
PostOffice po = EasyMock.createStrictMock(PostOffice.class);
@@ -342,7 +266,7 @@
EasyMock.expect(queue.isDurable()).andStubReturn(true);
EasyMock.expect(sm.generateUniqueID()).andReturn(2l);
EasyMock.expect(sm.generateUniqueID()).andReturn(1l);
- EasyMock.expect(po.getBinding(expQName)).andReturn(expQBinding);
+ //EasyMock.expect(po.getBinding(expQName)).andReturn(expQBinding);
EasyMock.expect(serverMessage.copy()).andReturn(serverMessage);
//serverMessage.setMessageID(2);
EasyMock.expect(serverMessage.getDestination()).andReturn(queueName);
@@ -362,64 +286,8 @@
EasyMock.verify(sm, po, repos, serverMessage, queue, expQBinding, pm);
}
- public void testExpireToQDoesntExist() throws Exception
- {
- QueueSettings queueSettings = new QueueSettings();
- queueSettings.setMaxDeliveryAttempts(1);
- SimpleString expQName = new SimpleString("testexpQ");
- Binding expQBinding = EasyMock.createStrictMock(Binding.class);
- queueSettings.setExpiryQueue(expQName);
- StorageManager sm = EasyMock.createNiceMock(StorageManager.class);
-
- PostOffice po = EasyMock.createStrictMock(PostOffice.class);
-
- PagingManager pm = EasyMock.createNiceMock(PagingManager.class);
- EasyMock.expect(pm.page(EasyMock.isA(ServerMessage.class))).andStubReturn(false);
- EasyMock.expect(po.getPagingManager()).andStubReturn(pm);
- EasyMock.expect(pm.isPaging(EasyMock.isA(SimpleString.class))).andStubReturn(false);
- pm.messageDone(EasyMock.isA(ServerMessage.class));
- EasyMock.expectLastCall().anyTimes();
-
- HierarchicalRepository<QueueSettings> repos = EasyMock.createStrictMock(HierarchicalRepository.class);
-
- ServerMessage serverMessage = EasyMock.createNiceMock(ServerMessage.class);
-
- Queue queue = EasyMock.createStrictMock(Queue.class);
-
- EasyMock.expect(queue.getPersistenceID()).andStubReturn(1);
- MessageReferenceImpl messageReference = new DummyMessageReference(serverMessage, queue);
- messageReference.setDeliveryCount(1);
- SimpleString queueName = new SimpleString("queueName");
- queue.referenceAcknowledged(messageReference);
- EasyMock.expect(queue.getName()).andStubReturn(queueName);
- EasyMock.expect(repos.getMatch(queueName.toString())).andStubReturn(queueSettings);
- EasyMock.expect(serverMessage.isDurable()).andStubReturn(true);
- EasyMock.expect(serverMessage.getMessageID()).andStubReturn(999l);
- EasyMock.expect(queue.isDurable()).andStubReturn(true);
- EasyMock.expect(sm.generateUniqueID()).andReturn(2l);
- EasyMock.expect(sm.generateUniqueID()).andReturn(1l);
- EasyMock.expect(po.getBinding(expQName)).andReturn(null);
- EasyMock.expect(po.addBinding(expQName, expQName, null, true, false, false)).andReturn(expQBinding);
- EasyMock.expect(serverMessage.copy()).andReturn(serverMessage);
- // serverMessage.setMessageID(2);
- EasyMock.expect(serverMessage.getDestination()).andReturn(queueName);
- serverMessage.putStringProperty(MessageImpl.HDR_ORIGIN_QUEUE, queueName);
- serverMessage.setExpiration(0);
- serverMessage.putLongProperty(EasyMock.eq(MessageImpl.HDR_ACTUAL_EXPIRY_TIME), EasyMock.anyLong());
- EasyMock.expect(expQBinding.getAddress()).andStubReturn(expQName);
- serverMessage.setDestination(expQName);
- EasyMock.expect(po.route(serverMessage)).andReturn(new ArrayList<MessageReference>());
- EasyMock.expect(serverMessage.getDurableRefCount()).andReturn(0);
- EasyMock.expect(serverMessage.decrementDurableRefCount()).andReturn(0);
- EasyMock.replay(sm, po, repos, serverMessage, queue, expQBinding, pm);
-
- messageReference.expire(sm, po, repos);
-
- EasyMock.verify(sm, po, repos, serverMessage, queue, expQBinding, pm);
- }
-
public void testMove() throws Exception
{
SimpleString fromAddress = RandomUtil.randomSimpleString();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueImplTest.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueImplTest.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -1271,13 +1271,13 @@
Binding expiryBinding = createMock(Binding.class);
EasyMock.expect(expiryBinding.getAddress()).andStubReturn(expiryQueue);
- EasyMock.expect(postOffice.getBinding(expiryQueue)).andReturn(expiryBinding );
+ //EasyMock.expect(postOffice.getBinding(expiryQueue)).andReturn(expiryBinding );
EasyMock.expect(postOffice.route(EasyMock.isA(ServerMessage.class))).andReturn(new ArrayList<MessageReference>());
HierarchicalRepository<QueueSettings> queueSettingsRepository = createMock(HierarchicalRepository.class);
QueueSettings queueSettings = new QueueSettings()
{
@Override
- public SimpleString getExpiryQueue()
+ public SimpleString getExpiryAddress()
{
return expiryQueue;
}
@@ -1328,13 +1328,13 @@
Binding dlqBinding = createMock(Binding.class);
expect(dlqBinding.getAddress()).andStubReturn(dlqName);
- expect(postOffice.getBinding(dlqName)).andReturn(dlqBinding );
+ //expect(postOffice.getBinding(dlqName)).andReturn(dlqBinding );
expect(postOffice.route(isA(ServerMessage.class))).andReturn(new ArrayList<MessageReference>());
HierarchicalRepository<QueueSettings> queueSettingsRepository = createMock(HierarchicalRepository.class);
QueueSettings queueSettings = new QueueSettings()
{
@Override
- public SimpleString getDLQ()
+ public SimpleString getDeadLetterAddress()
{
return dlqName;
}
@@ -1353,7 +1353,7 @@
assertEquals(0, queue.getDeliveringCount());
assertTrue(queue.getSizeBytes() > 0);
- queue.sendMessageToDLQ(messageID, storageManager , postOffice, queueSettingsRepository);
+ queue.sendMessageToDeadLetterAddress(messageID, storageManager , postOffice, queueSettingsRepository);
assertEquals(0, queue.getMessageCount());
assertEquals(0, queue.getDeliveringCount());
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/QueueSettingsTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/QueueSettingsTest.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/QueueSettingsTest.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -37,9 +37,9 @@
QueueSettings queueSettings = new QueueSettings();
assertEquals(queueSettings.getDistributionPolicy().getClass(), QueueSettings.DEFAULT_DISTRIBUTION_POLICY_CLASS);
assertEquals(queueSettings.getDistributionPolicyClass(), null);
- assertEquals(queueSettings.getDLQ(), null);
+ assertEquals(queueSettings.getDeadLetterAddress(), null);
assertEquals(queueSettings.isClustered(), Boolean.valueOf(false));
- assertEquals(queueSettings.getExpiryQueue(), null);
+ assertEquals(queueSettings.getExpiryAddress(), null);
assertEquals(queueSettings.getMaxDeliveryAttempts(), QueueSettings.DEFAULT_MAX_DELIVERY_ATTEMPTS);
assertEquals(queueSettings.getMaxSizeBytes(), QueueSettings.DEFAULT_MAX_SIZE_BYTES);
assertEquals(queueSettings.getPageSizeBytes(), null);
@@ -55,8 +55,8 @@
queueSettingsToMerge.setClustered(true);
SimpleString DLQ = new SimpleString("testDLQ");
SimpleString exp = new SimpleString("testExpiryQueue");
- queueSettingsToMerge.setDLQ(DLQ);
- queueSettingsToMerge.setExpiryQueue(exp);
+ queueSettingsToMerge.setDeadLetterAddress(DLQ);
+ queueSettingsToMerge.setExpiryAddress(exp);
queueSettingsToMerge.setMaxDeliveryAttempts(1000);
queueSettingsToMerge.setDropMessagesWhenFull(true);
queueSettingsToMerge.setMaxSizeBytes(1001);
@@ -67,8 +67,8 @@
assertEquals(queueSettings.getDistributionPolicy().getClass(), QueueSettings.DEFAULT_DISTRIBUTION_POLICY_CLASS);
assertEquals(queueSettings.getDistributionPolicyClass(), null);
assertEquals(queueSettings.isClustered(), Boolean.valueOf(true));
- assertEquals(queueSettings.getDLQ(), DLQ);
- assertEquals(queueSettings.getExpiryQueue(), exp);
+ assertEquals(queueSettings.getDeadLetterAddress(), DLQ);
+ assertEquals(queueSettings.getExpiryAddress(), exp);
assertEquals(queueSettings.getMaxDeliveryAttempts(), Integer.valueOf(1000));
assertEquals(queueSettings.getMaxSizeBytes(), Integer.valueOf(1001));
assertEquals(queueSettings.getMessageCounterHistoryDayLimit(), Integer.valueOf(1002));
@@ -84,8 +84,8 @@
queueSettingsToMerge.setClustered(true);
SimpleString DLQ = new SimpleString("testDLQ");
SimpleString exp = new SimpleString("testExpiryQueue");
- queueSettingsToMerge.setDLQ(DLQ);
- queueSettingsToMerge.setExpiryQueue(exp);
+ queueSettingsToMerge.setDeadLetterAddress(DLQ);
+ queueSettingsToMerge.setExpiryAddress(exp);
queueSettingsToMerge.setMaxDeliveryAttempts(1000);
queueSettingsToMerge.setMaxSizeBytes(1001);
queueSettingsToMerge.setMessageCounterHistoryDayLimit(1002);
@@ -94,7 +94,7 @@
QueueSettings queueSettingsToMerge2 = new QueueSettings();
queueSettingsToMerge2.setClustered(true);
SimpleString exp2 = new SimpleString("testExpiryQueue2");
- queueSettingsToMerge2.setExpiryQueue(exp2);
+ queueSettingsToMerge2.setExpiryAddress(exp2);
queueSettingsToMerge2.setMaxSizeBytes(2001);
queueSettingsToMerge2.setRedeliveryDelay((long)2003);
queueSettings.merge(queueSettingsToMerge2);
@@ -102,8 +102,8 @@
assertEquals(queueSettings.getDistributionPolicy().getClass(), QueueSettings.DEFAULT_DISTRIBUTION_POLICY_CLASS);
assertEquals(queueSettings.getDistributionPolicyClass(), null);
assertEquals(queueSettings.isClustered(), Boolean.valueOf(true));
- assertEquals(queueSettings.getDLQ(), DLQ);
- assertEquals(queueSettings.getExpiryQueue(), exp);
+ assertEquals(queueSettings.getDeadLetterAddress(), DLQ);
+ assertEquals(queueSettings.getExpiryAddress(), exp);
assertEquals(queueSettings.getMaxDeliveryAttempts(), Integer.valueOf(1000));
assertEquals(queueSettings.getMaxSizeBytes(), Integer.valueOf(1001));
assertEquals(queueSettings.getMessageCounterHistoryDayLimit(), Integer.valueOf(1002));
@@ -117,8 +117,8 @@
queueSettingsToMerge.setClustered(true);
SimpleString DLQ = new SimpleString("testDLQ");
SimpleString exp = new SimpleString("testExpiryQueue");
- queueSettingsToMerge.setDLQ(DLQ);
- queueSettingsToMerge.setExpiryQueue(exp);
+ queueSettingsToMerge.setDeadLetterAddress(DLQ);
+ queueSettingsToMerge.setExpiryAddress(exp);
queueSettingsToMerge.setMaxSizeBytes(1001);
queueSettingsToMerge.setRedeliveryDelay((long)1003);
queueSettings.merge(queueSettingsToMerge);
@@ -127,8 +127,8 @@
queueSettingsToMerge2.setClustered(false);
SimpleString exp2 = new SimpleString("testExpiryQueue2");
SimpleString DLQ2 = new SimpleString("testDlq2");
- queueSettingsToMerge2.setExpiryQueue(exp2);
- queueSettingsToMerge2.setDLQ(DLQ2);
+ queueSettingsToMerge2.setExpiryAddress(exp2);
+ queueSettingsToMerge2.setDeadLetterAddress(DLQ2);
queueSettingsToMerge2.setMaxDeliveryAttempts(2000);
queueSettingsToMerge2.setMaxSizeBytes(2001);
queueSettingsToMerge2.setMessageCounterHistoryDayLimit(2002);
@@ -138,8 +138,8 @@
assertEquals(queueSettings.getDistributionPolicy().getClass(), QueueSettings.DEFAULT_DISTRIBUTION_POLICY_CLASS);
assertEquals(queueSettings.getDistributionPolicyClass(), null);
assertEquals(queueSettings.isClustered(), Boolean.valueOf(true));
- assertEquals(queueSettings.getDLQ(), DLQ);
- assertEquals(queueSettings.getExpiryQueue(), exp);
+ assertEquals(queueSettings.getDeadLetterAddress(), DLQ);
+ assertEquals(queueSettings.getExpiryAddress(), exp);
assertEquals(queueSettings.getMaxDeliveryAttempts(), Integer.valueOf(2000));
assertEquals(queueSettings.getMaxSizeBytes(), Integer.valueOf(1001));
assertEquals(queueSettings.getMessageCounterHistoryDayLimit(), Integer.valueOf(2002));
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java 2008-11-20 10:09:24 UTC (rev 5396)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java 2008-11-20 10:27:56 UTC (rev 5397)
@@ -236,7 +236,7 @@
QueueSettings settings = new QueueSettings()
{
@Override
- public SimpleString getDLQ()
+ public SimpleString getDeadLetterAddress()
{
return new SimpleString(JBossQueue.JMS_QUEUE_ADDRESS_PREFIX + dlq);
}
@@ -246,7 +246,7 @@
replayMockedAttributes();
JMSQueueControl control = createControl();
- assertEquals(dlq, control.getDLQ());
+ assertEquals(dlq, control.getDeadLetterAddress());
verifyMockedAttributes();
}
@@ -258,7 +258,7 @@
QueueSettings settings = new QueueSettings()
{
@Override
- public SimpleString getExpiryQueue()
+ public SimpleString getExpiryAddress()
{
return new SimpleString(JBossQueue.JMS_QUEUE_ADDRESS_PREFIX
+ expiryQueue);
@@ -453,7 +453,7 @@
refs.add(ref);
expect(coreQueue.list(isA(Filter.class))).andReturn(refs);
expect(
- coreQueue.sendMessageToDLQ(messageID, storageManager, postOffice,
+ coreQueue.sendMessageToDeadLetterAddress(messageID, storageManager, postOffice,
queueSettingsRepository)).andReturn(true);
replayMockedAttributes();
More information about the jboss-cvs-commits
mailing list