[jboss-cvs] JBoss Messaging SVN: r6169 - in trunk: src/main/org/jboss/messaging/core/client and 23 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 26 05:17:48 EDT 2009
Author: jmesnil
Date: 2009-03-26 05:17:47 -0400 (Thu, 26 Mar 2009)
New Revision: 6169
Added:
trunk/tests/src/org/jboss/messaging/tests/integration/client/DurableQueueTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/TemporaryQueueTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingServiceIntegrationTest.java
Modified:
trunk/examples/messaging/src/org/jboss/messaging/example/ManagementClient.java
trunk/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java
trunk/examples/messaging/src/org/jboss/messaging/example/WildCardClient.java
trunk/src/main/org/jboss/messaging/core/client/ClientRequestor.java
trunk/src/main/org/jboss/messaging/core/client/ClientSession.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
trunk/src/main/org/jboss/messaging/ra/inflow/JBMMessageHandler.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/DuplicateDetectionTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientAutogroupIdTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientMessageCounterTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientMessageHandlerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientQueueBrowserTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientRequestorTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientRoutingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionCreateAndDeleteQueueTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionStopStartTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/CoreClientTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/DeadLetterAddressTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ExpiryAddressTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageGroupingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/TransactionDurabilityTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/WildCardRoutingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientCrashTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/JustReplicationTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PreserveOrderDuringFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareAddressControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/divert/DivertTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/divert/PersistentDivertTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/NotificationTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityNotificationTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/DelayedMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/security/SimpleClient.java
trunk/tests/src/org/jboss/messaging/tests/integration/server/ExpiryRunnerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/server/PredefinedQueueTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/server/SoloQueueRecoveryTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/server/SoloQueueTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java
trunk/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java
trunk/tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java
Log:
ClientSession API
* added createTemporaryQueue(...) methods to create temp queues
* createQueue(...) methods create durable/non-durable regular queues
Modified: trunk/examples/messaging/src/org/jboss/messaging/example/ManagementClient.java
===================================================================
--- trunk/examples/messaging/src/org/jboss/messaging/example/ManagementClient.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/examples/messaging/src/org/jboss/messaging/example/ManagementClient.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -60,10 +60,10 @@
sendMessages(clientSession, queue);
// add temporary queue
- clientSession.createQueue(replytoQueue, replytoQueue, null, false, true);
+ clientSession.createTemporaryQueue(replytoQueue, replytoQueue);
SimpleString notifQueue = new SimpleString("notifQueue");
- clientSession.createQueue(DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS, notifQueue, null, false, true);
+ clientSession.createQueue(DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS, notifQueue, false);
ClientConsumer notifConsumer = clientSession.createConsumer(notifQueue);
notifConsumer.setMessageHandler(new MessageHandler()
{
Modified: trunk/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java
===================================================================
--- trunk/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -60,7 +60,7 @@
ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.integration.transports.netty.NettyConnectorFactory"));
clientSession = sessionFactory.createSession(false, true, true);
SimpleString atestq = new SimpleString("atestq");
- clientSession.createQueue(atestq, atestq, null, false, true);
+ clientSession.createTemporaryQueue(atestq, atestq);
ClientProducer clientProducer = clientSession.createProducer(atestq);
ClientMessage message = clientSession.createClientMessage(false);
message.getBody().writeString("Hello!");
Modified: trunk/examples/messaging/src/org/jboss/messaging/example/WildCardClient.java
===================================================================
--- trunk/examples/messaging/src/org/jboss/messaging/example/WildCardClient.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/examples/messaging/src/org/jboss/messaging/example/WildCardClient.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -59,7 +59,7 @@
ClientMessage message2 = clientSession.createClientMessage(false);
message2.getBody().writeString("This is a message from queue " + queue2);
- clientSession.createQueue(wildCardQ, wildCardQ, null, false, true);
+ clientSession.createTemporaryQueue(wildCardQ, wildCardQ);
clientConsumer = clientSession.createConsumer(wildCardQ);
clientProducer.send(message);
log.info("message sent to " + queue);
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientRequestor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientRequestor.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientRequestor.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -49,7 +49,7 @@
requestProducer = queueSession.createProducer(requestAddress);
replyQueue = new SimpleString(UUID.randomUUID().toString());
- queueSession.createQueue(replyQueue, replyQueue, null, false, true);
+ queueSession.createTemporaryQueue(replyQueue, replyQueue);
replyConsumer = queueSession.createConsumer(replyQueue);
}
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientSession.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientSession.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -54,18 +54,18 @@
*/
void createQueue(String address, String queueName, boolean durable) throws MessagingException;
- void createQueue(SimpleString address, SimpleString queueName, boolean durable, boolean temporary) throws MessagingException;
+ void createQueue(SimpleString address, SimpleString queueName, SimpleString filterString, boolean durable) throws MessagingException;
- void createQueue(String address, String queueName, boolean durable, boolean temporary) throws MessagingException;
+ void createQueue(String address, String queueName, String filterString, boolean durable) throws MessagingException;
- void createQueue(SimpleString address,
- SimpleString queueName,
- SimpleString filterString,
- boolean durable,
- boolean temporary) throws MessagingException;
+ void createTemporaryQueue(SimpleString address, SimpleString queueName) throws MessagingException;
- void createQueue(String address, String queueName, String filterString, boolean durable, boolean temporary) throws MessagingException;
+ void createTemporaryQueue(String address, String queueName) throws MessagingException;
+ void createTemporaryQueue(SimpleString address, SimpleString queueName, SimpleString filter) throws MessagingException;
+
+ void createTemporaryQueue(String address, String queueName, String filter) throws MessagingException;
+
void deleteQueue(SimpleString queueName) throws MessagingException;
void deleteQueue(String queueName) throws MessagingException;
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -21,6 +21,21 @@
*/
package org.jboss.messaging.core.client.impl;
+import static org.jboss.messaging.utils.SimpleString.toSimpleString;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+
import org.jboss.messaging.core.buffers.ChannelBuffers;
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientFileMessage;
@@ -72,21 +87,8 @@
import org.jboss.messaging.utils.OrderedExecutorFactory;
import org.jboss.messaging.utils.SimpleIDGenerator;
import org.jboss.messaging.utils.SimpleString;
-import static org.jboss.messaging.utils.SimpleString.toSimpleString;
import org.jboss.messaging.utils.TokenBucketLimiterImpl;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-import java.io.File;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
/*
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
@@ -237,7 +239,7 @@
public void createQueue(final SimpleString address, final SimpleString queueName, final boolean durable) throws MessagingException
{
- createQueue(address, queueName, durable, false);
+ internalCreateQueue(address, queueName, null, durable, false);
}
public void createQueue(final String address, final String queueName, final boolean durable) throws MessagingException
@@ -245,42 +247,37 @@
createQueue(toSimpleString(address), toSimpleString(queueName), durable);
}
- public void createQueue(final SimpleString address,
- final SimpleString queueName,
- final boolean durable,
- final boolean temporary) throws MessagingException
+ public void createQueue(SimpleString address, SimpleString queueName, SimpleString filterString, boolean durable) throws MessagingException
{
- createQueue(address, queueName, null, durable, temporary);
+ internalCreateQueue(address, queueName, filterString, durable, false);
}
- public void createQueue(final String address, final String queueName, final boolean durable, final boolean temporary) throws MessagingException
+ public void createQueue(String address, String queueName, String filterString, boolean durable) throws MessagingException
{
- createQueue(toSimpleString(address), toSimpleString(queueName), durable, temporary);
+ createQueue(toSimpleString(address), toSimpleString(queueName), toSimpleString(filterString), durable);
}
+
+ public void createTemporaryQueue(SimpleString address, SimpleString queueName) throws MessagingException
+ {
+ internalCreateQueue(address, queueName, null, false, true);
+ }
- public void createQueue(final SimpleString address,
- final SimpleString queueName,
- final SimpleString filterString,
- final boolean durable,
- final boolean temp) throws MessagingException
+ public void createTemporaryQueue(String address, String queueName) throws MessagingException
{
- checkClosed();
-
- CreateQueueMessage request = new CreateQueueMessage(address, queueName, filterString, durable, temp);
-
- channel.sendBlocking(request);
+ internalCreateQueue(toSimpleString(address), toSimpleString(queueName), null, false, true);
}
+
+ public void createTemporaryQueue(SimpleString address, SimpleString queueName, SimpleString filter) throws MessagingException
+ {
+ internalCreateQueue(address, queueName, filter, false, true);
+ }
- public void createQueue(final String address,
- final String queueName,
- final String filterString,
- final boolean durable,
- final boolean temporary) throws MessagingException
+ public void createTemporaryQueue(String address, String queueName, String filter) throws MessagingException
{
- createQueue(toSimpleString(address), toSimpleString(queueName), toSimpleString(filterString), durable, temporary);
+ internalCreateQueue(toSimpleString(address), toSimpleString(queueName), toSimpleString(filter), false, true);
}
- public void deleteQueue(final SimpleString queueName) throws MessagingException
+public void deleteQueue(final SimpleString queueName) throws MessagingException
{
checkClosed();
@@ -1279,6 +1276,26 @@
return producer;
}
+ private void internalCreateQueue(final SimpleString address,
+ final SimpleString queueName,
+ final SimpleString filterString,
+ final boolean durable,
+ final boolean temp) throws MessagingException
+ {
+ checkClosed();
+
+
+ if (durable && temp)
+ {
+ throw new MessagingException(MessagingException.INTERNAL_ERROR,
+ "Queue can not be both durable and temporay");
+ }
+
+ CreateQueueMessage request = new CreateQueueMessage(address, queueName, filterString, durable, temp);
+
+ channel.sendBlocking(request);
+ }
+
private void checkXA() throws XAException
{
if (!xa)
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -660,7 +660,7 @@
//When the backup activates the queue might already exist, so we catch this and ignore
try
{
- session.createQueue(managementNotificationAddress, notifQueueName, filter, false, false);
+ session.createQueue(managementNotificationAddress, notifQueueName, filter, false);
}
catch (MessagingException me)
{
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -1292,6 +1292,7 @@
{
securityStore.check(address, CheckType.CREATE_NON_DURABLE_QUEUE, this);
}
+
server.createQueue(address, name, filterString, durable, temporary);
if (temporary)
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -528,7 +528,7 @@
queueName = new SimpleString(UUID.randomUUID().toString());
- session.createQueue(dest.getSimpleAddress(), queueName, coreFilterString, false, true);
+ session.createTemporaryQueue(dest.getSimpleAddress(), queueName, coreFilterString);
consumer = session.createConsumer(queueName, null, false);
@@ -555,7 +555,7 @@
if (!subResponse.isExists())
{
- session.createQueue(dest.getSimpleAddress(), queueName, coreFilterString, true, false);
+ session.createQueue(dest.getSimpleAddress(), queueName, coreFilterString, true);
}
else
{
@@ -589,7 +589,7 @@
session.deleteQueue(queueName);
// Create the new one
- session.createQueue(dest.getSimpleAddress(), queueName, coreFilterString, true, false);
+ session.createQueue(dest.getSimpleAddress(), queueName, coreFilterString, true);
}
}
@@ -682,7 +682,7 @@
SimpleString simpleAddress = queue.getSimpleAddress();
- session.createQueue(simpleAddress, simpleAddress, null, false, true);
+ session.createTemporaryQueue(simpleAddress, simpleAddress);
connection.addTemporaryQueue(simpleAddress);
@@ -713,7 +713,7 @@
//We create a dummy subscription on the topic, that never receives messages - this is so we can perform JMS checks when routing messages to a topic that
//does not exist - otherwise we would not be able to distinguish from a non existent topic and one with no subscriptions - core has no notion of a topic
- session.createQueue(simpleAddress, simpleAddress, REJECTING_FILTER, false, true);
+ session.createQueue(simpleAddress, simpleAddress, REJECTING_FILTER, false);
connection.addTemporaryQueue(simpleAddress);
Modified: trunk/src/main/org/jboss/messaging/ra/inflow/JBMMessageHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/ra/inflow/JBMMessageHandler.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/src/main/org/jboss/messaging/ra/inflow/JBMMessageHandler.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -117,7 +117,7 @@
if (!subResponse.isExists())
{
- session.createQueue(activation.getAddress(), queueName, selectorString, true, false);
+ session.createQueue(activation.getAddress(), queueName, selectorString, true);
}
else
{
@@ -142,7 +142,7 @@
session.deleteQueue(queueName);
// Create the new one
- session.createQueue(activation.getAddress(), queueName, selectorString, true, false);
+ session.createQueue(activation.getAddress(), queueName, selectorString, true);
}
}
consumer = session.createConsumer(queueName, null, false);
@@ -153,7 +153,7 @@
if (activation.isTopic())
{
queueName = new SimpleString(UUID.randomUUID().toString());
- session.createQueue(activation.getAddress(), queueName, selectorString, false, false);
+ session.createQueue(activation.getAddress(), queueName, selectorString, false);
}
else
{
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/MessageHeaderTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -870,6 +870,10 @@
this.message = message;
}
+ public void createQueue(SimpleString address, SimpleString queueName, SimpleString filterString, boolean durable) throws MessagingException
+ {
+ }
+
public void createQueue(SimpleString address, SimpleString queueName, boolean durable) throws MessagingException
{
}
@@ -886,14 +890,26 @@
{
}
- public void createQueue(SimpleString address, SimpleString queueName, SimpleString filterString, boolean durable, boolean temporary) throws MessagingException
+ public void createQueue(String address, String queueName, String filterString, boolean durable) throws MessagingException
{
}
- public void createQueue(String address, String queueName, String filterString, boolean durable, boolean temporary) throws MessagingException
+ public void createTemporaryQueue(SimpleString address, SimpleString queueName) throws MessagingException
{
}
+ public void createTemporaryQueue(String address, String queueName) throws MessagingException
+ {
+ }
+
+ public void createTemporaryQueue(SimpleString address, SimpleString queueName, SimpleString filter) throws MessagingException
+ {
+ }
+
+ public void createTemporaryQueue(String address, String queueName, String filter) throws MessagingException
+ {
+ }
+
public void deleteQueue(SimpleString queueName) throws MessagingException
{
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/DuplicateDetectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/DuplicateDetectionTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/DuplicateDetectionTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -71,7 +71,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -141,11 +141,11 @@
final SimpleString queueName3 = new SimpleString("DuplicateDetectionTestQueue3");
- session.createQueue(queueName1, queueName1, null, false, false);
+ session.createQueue(queueName1, queueName1, null, false);
- session.createQueue(queueName2, queueName2, null, false, false);
+ session.createQueue(queueName2, queueName2, null, false);
- session.createQueue(queueName3, queueName3, null, false, false);
+ session.createQueue(queueName3, queueName3, null, false);
ClientProducer producer1 = session.createProducer(queueName1);
ClientConsumer consumer1 = session.createConsumer(queueName1);
@@ -292,7 +292,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -340,7 +340,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -382,7 +382,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -440,7 +440,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -501,7 +501,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -576,7 +576,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -653,7 +653,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -729,7 +729,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -822,7 +822,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -858,7 +858,7 @@
session.start();
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
producer = session.createProducer(queueName);
@@ -905,7 +905,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -937,7 +937,7 @@
session.start();
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
producer = session.createProducer(queueName);
@@ -983,7 +983,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -1017,7 +1017,7 @@
session.start();
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
producer = session.createProducer(queueName);
@@ -1072,7 +1072,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -1117,7 +1117,7 @@
session.start();
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
producer = session.createProducer(queueName);
@@ -1171,7 +1171,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -1207,7 +1207,7 @@
session.start();
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
producer = session.createProducer(queueName);
@@ -1254,7 +1254,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -1292,7 +1292,7 @@
session.start();
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
producer = session.createProducer(queueName);
@@ -1339,7 +1339,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -1381,7 +1381,7 @@
session.start();
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
producer = session.createProducer(queueName);
@@ -1434,7 +1434,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -1474,7 +1474,7 @@
session.start();
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
producer = session.createProducer(queueName);
@@ -1533,7 +1533,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -1571,7 +1571,7 @@
session.start();
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
producer = session.createProducer(queueName);
@@ -1630,7 +1630,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -1670,7 +1670,7 @@
session.start();
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
producer = session.createProducer(queueName);
@@ -1729,7 +1729,7 @@
final SimpleString queueName = new SimpleString("DuplicateDetectionTestQueue");
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
@@ -1768,7 +1768,7 @@
session.start();
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
producer = session.createProducer(queueName);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -157,7 +157,7 @@
session.start(xid, XAResource.TMNOFLAGS);
}
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
ClientProducer producer = session.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -166,7 +166,7 @@
callback.session = session;
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -228,7 +228,7 @@
ClientSession session = sf.createSession(null, null, false, true, false, false, 0);
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
messagingService.getServer().getPostOffice().getPagingManager().getGlobalSize();
@@ -456,8 +456,8 @@
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
- session.createQueue(ADDRESS, queue[0], null, true, false);
- session.createQueue(ADDRESS, queue[1], null, true, false);
+ session.createQueue(ADDRESS, queue[0], null, true);
+ session.createQueue(ADDRESS, queue[1], null, true);
int numberOfIntegers = 100000;
@@ -542,8 +542,8 @@
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
- session.createQueue(ADDRESS, queue[0], null, true, false);
- session.createQueue(ADDRESS, queue[1], null, true, false);
+ session.createQueue(ADDRESS, queue[0], null, true);
+ session.createQueue(ADDRESS, queue[1], null, true);
int numberOfIntegers = 100000;
@@ -689,7 +689,7 @@
session.start(xid, XAResource.TMNOFLAGS);
}
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
int numberOfIntegers = 50000;
@@ -847,7 +847,7 @@
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
ClientProducer producer = session.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientAutogroupIdTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientAutogroupIdTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientAutogroupIdTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -71,7 +71,7 @@
sf.setAutoGroup(true);
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(groupTestQ, groupTestQ, null, false, false);
+ session.createQueue(groupTestQ, groupTestQ, null, false);
ClientProducer producer = session.createProducer(groupTestQ);
@@ -127,7 +127,7 @@
sf.setAutoGroup(true);
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(groupTestQ, groupTestQ, null, false, false);
+ session.createQueue(groupTestQ, groupTestQ, null, false);
ClientProducer producer = session.createProducer(groupTestQ);
ClientProducer producer2 = session.createProducer(groupTestQ);
@@ -193,7 +193,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(groupTestQ, groupTestQ, null, false, false);
+ session.createQueue(groupTestQ, groupTestQ, null, false);
ClientProducer producer = session.createProducer(groupTestQ);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientConsumerTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientConsumerTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -72,7 +72,7 @@
ClientSession session = sf.createSession(false, true, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -108,7 +108,7 @@
ClientSession session = sf.createSession(false, true, false, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -144,7 +144,7 @@
ClientSession session = sf.createSession(false, true, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -184,7 +184,7 @@
ClientSession session = sf.createSession(false, true, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientMessageCounterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientMessageCounterTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientMessageCounterTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -72,7 +72,7 @@
ClientSession session = sf.createSession(null, null, false, false, false, false, 0);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientMessageHandlerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientMessageHandlerTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientMessageHandlerTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -72,7 +72,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -134,7 +134,7 @@
final ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -229,7 +229,7 @@
final ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -318,7 +318,7 @@
final ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientQueueBrowserTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientQueueBrowserTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientQueueBrowserTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -74,7 +74,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -120,7 +120,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -166,7 +166,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -202,7 +202,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -239,7 +239,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -292,7 +292,7 @@
ClientSession session = sf.createSession(null, null, false, true, true, preACK, 0);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -327,7 +327,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientRequestorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientRequestorTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientRequestorTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -76,7 +76,7 @@
session.start();
- session.createQueue(requestAddress, requestQueue, null, false, true);
+ session.createTemporaryQueue(requestAddress, requestQueue);
ClientConsumer requestConsumer = session.createConsumer(requestQueue);
requestConsumer.setMessageHandler(new SimpleMessageHandler(key, session));
@@ -104,7 +104,7 @@
session.start();
- session.createQueue(requestAddress, requestQueue, null, false, true);
+ session.createTemporaryQueue(requestAddress, requestQueue);
ClientConsumer requestConsumer = session.createConsumer(requestQueue);
requestConsumer.setMessageHandler(new SimpleMessageHandler(key, session));
@@ -137,7 +137,7 @@
session.start();
- session.createQueue(requestAddress, requestQueue, null, false, true);
+ session.createTemporaryQueue(requestAddress, requestQueue);
ClientConsumer requestConsumer = session.createConsumer(requestQueue);
requestConsumer.setMessageHandler(new MessageHandler()
@@ -189,7 +189,7 @@
session.start();
- session.createQueue(requestAddress, requestQueue, null, false, true);
+ session.createTemporaryQueue(requestAddress, requestQueue);
ClientConsumer requestConsumer = session.createConsumer(requestQueue);
requestConsumer.setMessageHandler(new SimpleMessageHandler(key, session));
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientRoutingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientRoutingTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientRoutingTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -179,7 +179,7 @@
messagingService.start();
ClientSessionFactory cf = createInVMFactory();
ClientSession sendSession = cf.createSession(false, true, true);
- sendSession.createQueue(addressA, queueA, new SimpleString("foo = 'bar'"), false, false);
+ sendSession.createQueue(addressA, queueA, new SimpleString("foo = 'bar'"), false);
int numMessages = 300;
ClientProducer p = sendSession.createProducer(addressA);
for (int i = 0; i < numMessages; i++)
@@ -219,9 +219,9 @@
messagingService.start();
ClientSessionFactory cf = createInVMFactory();
ClientSession sendSession = cf.createSession(false, true, true);
- sendSession.createQueue(addressA, queueA, new SimpleString("foo = 'bar'"), false, false);
- sendSession.createQueue(addressA, queueB, new SimpleString("x = 1"), false, false);
- sendSession.createQueue(addressA, queueC, new SimpleString("b = false"), false, false);
+ sendSession.createQueue(addressA, queueA, new SimpleString("foo = 'bar'"), false);
+ sendSession.createQueue(addressA, queueB, new SimpleString("x = 1"), false);
+ sendSession.createQueue(addressA, queueC, new SimpleString("b = false"), false);
int numMessages = 300;
ClientProducer p = sendSession.createProducer(addressA);
for (int i = 0; i < numMessages; i++)
@@ -282,7 +282,7 @@
messagingService.start();
ClientSessionFactory cf = createInVMFactory();
ClientSession sendSession = cf.createSession(false, true, true);
- sendSession.createQueue(addressA, queueA, false, true);
+ sendSession.createTemporaryQueue(addressA, queueA);
int numMessages = 300;
ClientProducer p = sendSession.createProducer(addressA);
for (int i = 0; i < numMessages; i++)
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionCreateAndDeleteQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionCreateAndDeleteQueueTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionCreateAndDeleteQueueTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -68,7 +68,7 @@
public void testTemporaryFalse() throws Exception
{
ClientSession session = createInVMFactory().createSession(false, true, true);
- session.createQueue(address, queueName, false, false);
+ session.createQueue(address, queueName, false);
Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
Queue q = (Queue) binding.getBindable();
assertFalse(q.isTemporary());
@@ -79,7 +79,7 @@
public void testTemporaryTrue() throws Exception
{
ClientSession session = createInVMFactory().createSession(false, true, true);
- session.createQueue(address, queueName, true, true);
+ session.createTemporaryQueue(address, queueName);
Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
Queue q = (Queue) binding.getBindable();
assertTrue(q.isTemporary());
@@ -91,7 +91,7 @@
{
ClientSession session = createInVMFactory().createSession(false, true, true);
SimpleString filterString = new SimpleString("x=y");
- session.createQueue(address, queueName, filterString, false, false);
+ session.createQueue(address, queueName, filterString, false);
Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
Queue q = (Queue) binding.getBindable();
assertEquals(q.getFilter().getFilterString(), filterString);
@@ -106,7 +106,7 @@
messagingService.getServer().getAddressSettingsRepository().addMatch(address.toString(), addressSettings);
ClientSession session = createInVMFactory().createSession(false, true, true);
SimpleString filterString = new SimpleString("x=y");
- session.createQueue(address, queueName, filterString, false, false);
+ session.createQueue(address, queueName, filterString, false);
Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
assertTrue(binding.getBindable() instanceof SoloQueueImpl);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionStopStartTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionStopStartTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionStopStartTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -72,7 +72,7 @@
final ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -117,7 +117,7 @@
final ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -165,7 +165,7 @@
final ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -254,7 +254,7 @@
final ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -344,7 +344,7 @@
final ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -446,7 +446,7 @@
final ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -548,7 +548,7 @@
sf.setConsumerWindowSize(10);
final ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -602,7 +602,7 @@
final ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
@@ -644,7 +644,7 @@
final ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -191,7 +191,7 @@
service.start();
ClientSessionFactory cf = createInVMFactory();
ClientSession clientSession = cf.createSession(false, true, true);
- clientSession.createQueue("a1", queueName, "foo=bar", false, false);
+ clientSession.createQueue("a1", queueName, "foo=bar", false);
clientSession.createConsumer(queueName);
clientSession.createConsumer(queueName);
SessionQueueQueryResponseMessage resp = clientSession.queueQuery(new SimpleString(queueName));
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/CoreClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/CoreClientTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/CoreClientTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -83,7 +83,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientProducer producer = session.createProducer(QUEUE);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/DeadLetterAddressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/DeadLetterAddressTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/DeadLetterAddressTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -63,8 +63,8 @@
addressSettings.setDeadLetterAddress(dla);
messagingService.getServer().getAddressSettingsRepository().addMatch(qName.toString(), addressSettings);
SimpleString dlq = new SimpleString("DLQ1");
- clientSession.createQueue(dla, dlq, null, false, false);
- clientSession.createQueue(qName, qName, null, false, false);
+ clientSession.createQueue(dla, dlq, null, false);
+ clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
producer.send(createTextMessage("heyho!", clientSession));
clientSession.start();
@@ -97,9 +97,9 @@
messagingService.getServer().getAddressSettingsRepository().addMatch(qName.toString(), addressSettings);
SimpleString dlq = new SimpleString("DLQ1");
SimpleString dlq2 = new SimpleString("DLQ2");
- clientSession.createQueue(dla, dlq, null, false, false);
- clientSession.createQueue(dla, dlq2, null, false, false);
- clientSession.createQueue(qName, qName, null, false, false);
+ clientSession.createQueue(dla, dlq, null, false);
+ clientSession.createQueue(dla, dlq2, null, false);
+ clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
producer.send(createTextMessage("heyho!", clientSession));
clientSession.start();
@@ -137,7 +137,7 @@
AddressSettings addressSettings = new AddressSettings();
addressSettings.setMaxDeliveryAttempts(1);
messagingService.getServer().getAddressSettingsRepository().addMatch(qName.toString(), addressSettings);
- clientSession.createQueue(qName, qName, null, false, false);
+ clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
producer.send(createTextMessage("heyho!", clientSession));
clientSession.start();
@@ -167,8 +167,8 @@
addressSettings.setDeadLetterAddress(dla);
messagingService.getServer().getAddressSettingsRepository().addMatch(qName.toString(), addressSettings);
SimpleString dlq = new SimpleString("DLQ1");
- clientSession.createQueue(dla, dlq, null, false, false);
- clientSession.createQueue(qName, qName, null, false, false);
+ clientSession.createQueue(dla, dlq, null, false);
+ clientSession.createQueue(qName, qName, null, false);
ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(INVM_CONNECTOR_FACTORY));
ClientSession sendSession = sessionFactory.createSession(false, true, true);
ClientProducer producer = sendSession.createProducer(qName);
Added: trunk/tests/src/org/jboss/messaging/tests/integration/client/DurableQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/DurableQueueTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/DurableQueueTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -0,0 +1,181 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2009, 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.client;
+
+import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
+
+import org.jboss.messaging.core.client.ClientConsumer;
+import org.jboss.messaging.core.client.ClientMessage;
+import org.jboss.messaging.core.client.ClientProducer;
+import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
+import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.TransportConfiguration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.remoting.RemotingConnection;
+import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
+import org.jboss.messaging.core.server.Messaging;
+import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
+import org.jboss.messaging.tests.util.UnitTestCase;
+import org.jboss.messaging.utils.SimpleString;
+
+/**
+ * A TemporaryQueueTest
+ *
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ */
+public class DurableQueueTest extends UnitTestCase
+{
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private MessagingServiceImpl service;
+
+ private ClientSession session;
+
+ private ClientSessionFactoryImpl sf;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ public void testConsumeFromDurableQueue() throws Exception
+ {
+ SimpleString queue = randomSimpleString();
+ SimpleString address = randomSimpleString();
+
+ session.createQueue(address, queue, true);
+
+ ClientProducer producer = session.createProducer(address);
+ producer.send(session.createClientMessage(false));
+
+ session.start();
+ ClientConsumer consumer = session.createConsumer(queue);
+ ClientMessage message = consumer.receive(500);
+ assertNotNull(message);
+ message.acknowledge();
+
+ consumer.close();
+ session.deleteQueue(queue);
+
+ session.close();
+ }
+
+ public void testConsumeFromDurableQueueAfterServerRestart() throws Exception
+ {
+ SimpleString queue = randomSimpleString();
+ SimpleString address = randomSimpleString();
+
+ session.createQueue(address, queue, true);
+
+ ClientProducer producer = session.createProducer(address);
+ producer.send(session.createClientMessage(true));
+
+ session.close();
+
+ service.stop();
+ service.start();
+
+ sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
+ session = sf.createSession(false, true, true);
+
+ session.start();
+ ClientConsumer consumer = session.createConsumer(queue);
+ ClientMessage message = consumer.receive(500);
+ assertNotNull(message);
+ message.acknowledge();
+
+ consumer.close();
+ session.deleteQueue(queue);
+
+ session.close();
+ }
+
+ public void testProduceAndConsumeFromDurableQueueAfterServerRestart() throws Exception
+ {
+ SimpleString queue = randomSimpleString();
+ SimpleString address = randomSimpleString();
+
+ session.createQueue(address, queue, true);
+
+ session.close();
+
+ service.stop();
+ service.start();
+
+ sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
+ session = sf.createSession(false, true, true);
+
+ ClientProducer producer = session.createProducer(address);
+ producer.send(session.createClientMessage(true));
+
+ session.start();
+ ClientConsumer consumer = session.createConsumer(queue);
+ ClientMessage message = consumer.receive(500);
+ assertNotNull(message);
+ message.acknowledge();
+
+ consumer.close();
+ session.deleteQueue(queue);
+
+ session.close();
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ Configuration config = new ConfigurationImpl();
+ config.setSecurityEnabled(false);
+ service = Messaging.newMessagingService(config);
+ service.start();
+
+ sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
+ session = sf.createSession(false, true, true);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ session.close();
+
+ service.stop();
+
+ super.tearDown();
+ }
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ExpiryAddressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ExpiryAddressTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ExpiryAddressTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -57,8 +57,8 @@
AddressSettings addressSettings = new AddressSettings();
addressSettings.setExpiryAddress(ea);
messagingService.getServer().getAddressSettingsRepository().addMatch(qName.toString(), addressSettings);
- clientSession.createQueue(ea, eq, null, false, false);
- clientSession.createQueue(qName, qName, null, false, false);
+ clientSession.createQueue(ea, eq, null, false);
+ clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
@@ -92,9 +92,9 @@
AddressSettings addressSettings = new AddressSettings();
addressSettings.setExpiryAddress(ea);
messagingService.getServer().getAddressSettingsRepository().addMatch(qName.toString(), addressSettings);
- clientSession.createQueue(ea, eq, null, false, false);
- clientSession.createQueue(ea, eq2, null, false, false);
- clientSession.createQueue(qName, qName, null, false, false);
+ clientSession.createQueue(ea, eq, null, false);
+ clientSession.createQueue(ea, eq2, null, false);
+ clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
clientMessage.setExpiration(System.currentTimeMillis());
@@ -153,9 +153,9 @@
SimpleString qName = new SimpleString("q1");
SimpleString eq = new SimpleString("EQ1");
SimpleString eq2 = new SimpleString("EQ2");
- clientSession.createQueue(ea, eq, null, false, false);
- clientSession.createQueue(ea, eq2, null, false, false);
- clientSession.createQueue(qName, qName, null, false, false);
+ clientSession.createQueue(ea, eq, null, false);
+ clientSession.createQueue(ea, eq2, null, false);
+ clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
clientMessage.setExpiration(System.currentTimeMillis());
@@ -176,8 +176,8 @@
addressSettings.setExpiryAddress(ea);
messagingService.getServer().getAddressSettingsRepository().addMatch(qName.toString(), addressSettings);
SimpleString eq = new SimpleString("EA1");
- clientSession.createQueue(ea, eq, null, false, false);
- clientSession.createQueue(qName, qName, null, false, false);
+ clientSession.createQueue(ea, eq, null, false);
+ clientSession.createQueue(qName, qName, null, false);
ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(INVM_CONNECTOR_FACTORY));
ClientSession sendSession = sessionFactory.createSession(false, true, true);
ClientProducer producer = sendSession.createProducer(qName);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageGroupingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageGroupingTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageGroupingTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -564,7 +564,7 @@
// then we create a client as normal
ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(INVM_CONNECTOR_FACTORY));
clientSession = sessionFactory.createSession(false, true, true);
- clientSession.createQueue(qName, qName, null, false, false);
+ clientSession.createQueue(qName, qName, null, false);
}
private static class DummyMessageHandler implements MessageHandler
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -98,7 +98,7 @@
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -221,7 +221,7 @@
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -362,7 +362,7 @@
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -494,7 +494,7 @@
ClientSession session = sf.createSession(null, null, false, false, true, false, 0);
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -571,7 +571,7 @@
ClientSession session = sf.createSession(null, null, false, false, false, false, 0);
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -688,7 +688,7 @@
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -834,7 +834,7 @@
for (int i = 0; i < NUMBER_OF_BINDINGS; i++)
{
- session.createQueue(ADDRESS, new SimpleString("someQueue" + i), null, true, false);
+ session.createQueue(ADDRESS, new SimpleString("someQueue" + i), null, true);
}
ClientProducer producer = session.createProducer(ADDRESS);
Added: trunk/tests/src/org/jboss/messaging/tests/integration/client/TemporaryQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/TemporaryQueueTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/TemporaryQueueTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -0,0 +1,242 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2009, 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.client;
+
+import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
+
+import org.jboss.messaging.core.client.ClientConsumer;
+import org.jboss.messaging.core.client.ClientMessage;
+import org.jboss.messaging.core.client.ClientProducer;
+import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
+import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.TransportConfiguration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.remoting.RemotingConnection;
+import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
+import org.jboss.messaging.core.server.Messaging;
+import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
+import org.jboss.messaging.core.server.impl.ServerSessionImpl;
+import org.jboss.messaging.tests.util.UnitTestCase;
+import org.jboss.messaging.utils.SimpleString;
+
+/**
+ * A TemporaryQueueTest
+ *
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ */
+/**
+ * A TemporaryQueueTest
+ *
+ * @author jmesnil
+ *
+ *
+ */
+public class TemporaryQueueTest extends UnitTestCase
+{
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private MessagingServiceImpl service;
+
+ private ClientSession session;
+
+ private ClientSessionFactoryImpl sf;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ public void testConsumeFromTemporaryQueue() throws Exception
+ {
+ SimpleString queue = randomSimpleString();
+ SimpleString address = randomSimpleString();
+
+ session.createTemporaryQueue(address, queue);
+
+ ClientProducer producer = session.createProducer(address);
+ producer.send(session.createClientMessage(false));
+
+ session.start();
+ ClientConsumer consumer = session.createConsumer(queue);
+ ClientMessage message = consumer.receive(500);
+ assertNotNull(message);
+ message.acknowledge();
+
+ consumer.close();
+ session.deleteQueue(queue);
+
+ session.close();
+ }
+
+ public void testConsumeFromTemporaryQueueCreatedByOtherSession() throws Exception
+ {
+ SimpleString queue = randomSimpleString();
+ SimpleString address = randomSimpleString();
+
+ session.createTemporaryQueue(address, queue);
+
+ ClientProducer producer = session.createProducer(address);
+ producer.send(session.createClientMessage(false));
+
+ ClientSession session2 = sf.createSession(false, true, true);
+ session2.start();
+
+ ClientConsumer consumer = session2.createConsumer(queue);
+ ClientMessage message = consumer.receive(500);
+ assertNotNull(message);
+
+ session2.close();
+ session.close();
+ }
+
+ public void _testDeleteTemporaryQueueAfterConnectionIsClosed() throws Exception
+ {
+ SimpleString queue = randomSimpleString();
+ SimpleString address = randomSimpleString();
+
+ session.createTemporaryQueue(address, queue);
+
+ session.close();
+
+ session = sf.createSession(false, true, true);
+ session.start();
+
+ try
+ {
+ session.createConsumer(queue);
+ fail("temp queue must not exist after the remoting connection is closed");
+ }
+ catch (MessagingException e)
+ {
+ assertEquals(MessagingException.QUEUE_DOES_NOT_EXIST, e.getCode());
+ }
+
+ session.close();
+ }
+
+ /**
+ * @see ServerSessionImpl#doHandleCreateQueue()
+ */
+ public void _testDeleteTemporaryQueueAfterConnectionIsClosed_2() throws Exception
+ {
+ SimpleString queue = randomSimpleString();
+ SimpleString address = randomSimpleString();
+
+ session.createTemporaryQueue(address, queue);
+ assertEquals(1, service.getServer().getConnectionCount());
+
+ // we create a second session. the temp queue must be present
+ // even after we closed the session which created it
+ ClientSession session2 = sf.createSession(false, true, true);
+
+ session.close();
+
+ // let some time for the server to clean the connections
+ Thread.sleep(1000);
+
+ session2.start();
+
+ ClientConsumer consumer = session2.createConsumer(queue);
+ ClientMessage message = consumer.receive(500);
+ assertNotNull(message);
+
+ session2.close();
+ }
+
+ public void testDeleteTemporaryQueueWhenClientCrash() throws Exception
+ {
+ SimpleString queue = randomSimpleString();
+ SimpleString address = randomSimpleString();
+
+ session.createTemporaryQueue(address, queue);
+
+ assertEquals(1, service.getServer().getConnectionCount());
+
+ RemotingConnection remotingConnection = service.getServer()
+ .getRemotingService()
+ .getConnections()
+ .iterator()
+ .next();
+ remotingConnection.fail(new MessagingException(MessagingException.INTERNAL_ERROR, "simulate a client failure"));
+
+ // let some time for the server to clean the connections
+ Thread.sleep(1000);
+
+ assertEquals(0, service.getServer().getConnectionCount());
+
+ sf.close();
+ sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
+ session = sf.createSession(false, true, true);
+ session.start();
+ try
+ {
+ session.createConsumer(queue);
+ fail("temp queue must not exist after the server detected the client crash");
+ }
+ catch (MessagingException e)
+ {
+ assertEquals(MessagingException.QUEUE_DOES_NOT_EXIST, e.getCode());
+ }
+
+ session.close();
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ Configuration config = new ConfigurationImpl();
+ config.setSecurityEnabled(false);
+ service = Messaging.newMessagingService(config);
+ service.start();
+
+ sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
+ session = sf.createSession(false, true, true);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ session.close();
+
+ service.stop();
+
+ super.tearDown();
+ }
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/TransactionDurabilityTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/TransactionDurabilityTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/TransactionDurabilityTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -82,9 +82,9 @@
ClientSession session2 = sf.createSession(false, false, false);
- session1.createQueue(testAddress, queue1, null, true, false);
+ session1.createQueue(testAddress, queue1, null, true);
- session1.createQueue(testAddress, queue2, null, true, false);
+ session1.createQueue(testAddress, queue2, null, true);
ClientProducer producer = session1.createProducer(testAddress);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/WildCardRoutingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/WildCardRoutingTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/WildCardRoutingTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -52,9 +52,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -79,7 +79,7 @@
SimpleString addressAC = new SimpleString("a.c");
SimpleString address = new SimpleString("a.*");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -111,8 +111,8 @@
SimpleString address = new SimpleString("a.*");
SimpleString queueName = new SimpleString("Q");
SimpleString queueName2 = new SimpleString("Q2");
- clientSession.createQueue(address, queueName, null, false, false);
- clientSession.createQueue(address, queueName2, null, false, false);
+ clientSession.createQueue(address, queueName, null, false);
+ clientSession.createQueue(address, queueName2, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -151,9 +151,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -180,12 +180,12 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
clientSession.start();
producer.send(createTextMessage("m1", clientSession));
producer2.send(createTextMessage("m2", clientSession));
@@ -209,9 +209,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -256,16 +256,16 @@
SimpleString queueName8 = new SimpleString("Q8");
SimpleString queueName9 = new SimpleString("Q9");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(addressAD, queueName3, null, false, false);
- clientSession.createQueue(addressAE, queueName4, null, false, false);
- clientSession.createQueue(addressAF, queueName5, null, false, false);
- clientSession.createQueue(addressAG, queueName6, null, false, false);
- clientSession.createQueue(addressAH, queueName7, null, false, false);
- clientSession.createQueue(addressAJ, queueName8, null, false, false);
- clientSession.createQueue(addressAK, queueName9, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(addressAD, queueName3, null, false);
+ clientSession.createQueue(addressAE, queueName4, null, false);
+ clientSession.createQueue(addressAF, queueName5, null, false);
+ clientSession.createQueue(addressAG, queueName6, null, false);
+ clientSession.createQueue(addressAH, queueName7, null, false);
+ clientSession.createQueue(addressAJ, queueName8, null, false);
+ clientSession.createQueue(addressAK, queueName9, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer();
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
@@ -353,16 +353,16 @@
SimpleString queueName8 = new SimpleString("Q8");
SimpleString queueName9 = new SimpleString("Q9");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(addressAD, queueName3, null, false, false);
- clientSession.createQueue(addressAE, queueName4, null, false, false);
- clientSession.createQueue(addressAF, queueName5, null, false, false);
- clientSession.createQueue(addressAG, queueName6, null, false, false);
- clientSession.createQueue(addressAH, queueName7, null, false, false);
- clientSession.createQueue(addressAJ, queueName8, null, false, false);
- clientSession.createQueue(addressAK, queueName9, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(addressAD, queueName3, null, false);
+ clientSession.createQueue(addressAE, queueName4, null, false);
+ clientSession.createQueue(addressAF, queueName5, null, false);
+ clientSession.createQueue(addressAG, queueName6, null, false);
+ clientSession.createQueue(addressAH, queueName7, null, false);
+ clientSession.createQueue(addressAJ, queueName8, null, false);
+ clientSession.createQueue(addressAK, queueName9, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer();
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
@@ -437,9 +437,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -466,9 +466,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -496,9 +496,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -525,9 +525,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -554,9 +554,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -579,9 +579,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -606,9 +606,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -631,9 +631,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -656,9 +656,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -681,9 +681,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -706,9 +706,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
ClientProducer producer = clientSession.createProducer(addressAB);
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
@@ -731,9 +731,9 @@
SimpleString queueName1 = new SimpleString("Q1");
SimpleString queueName2 = new SimpleString("Q2");
SimpleString queueName = new SimpleString("Q");
- clientSession.createQueue(addressAB, queueName1, null, false, false);
- clientSession.createQueue(addressAC, queueName2, null, false, false);
- clientSession.createQueue(address, queueName, null, false, false);
+ clientSession.createQueue(addressAB, queueName1, null, false);
+ clientSession.createQueue(addressAC, queueName2, null, false);
+ clientSession.createQueue(address, queueName, null, false);
assertEquals(2, messagingService.getServer().getPostOffice().getBindingsForAddress(addressAB).getBindings().size());
assertEquals(2, messagingService.getServer().getPostOffice().getBindingsForAddress(addressAC).getBindings().size());
assertEquals(1, messagingService.getServer().getPostOffice().getBindingsForAddress(address).getBindings().size());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientCrashTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientCrashTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -97,7 +97,7 @@
Process p = SpawnedVMSupport.spawnVM(CrashClient.class.getName());
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
ClientConsumer consumer = session.createConsumer(QUEUE);
ClientProducer producer = session.createProducer(QUEUE);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientExitTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -112,7 +112,7 @@
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName()));
session = sf.createSession(false, true, true);
- session.createQueue(QUEUE, QUEUE, null, false, false);
+ session.createQueue(QUEUE, QUEUE, null, false);
consumer = session.createConsumer(QUEUE);
session.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -255,7 +255,7 @@
filterString = FILTER_PROP.toString() + "='" + filterVal + "'";
}
- session.createQueue(address, queueName, filterString, durable, false);
+ session.createQueue(address, queueName, filterString, durable);
session.close();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -95,7 +95,7 @@
ClientSession session1 = sf1.createSession(false, true, true);
- session1.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session1.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session1.createProducer(ADDRESS);
@@ -181,7 +181,7 @@
ClientSession session1 = sf1.createSession(false, true, true);
- session1.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session1.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session1.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -73,7 +73,7 @@
log.info("Created session");
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -90,7 +90,7 @@
ClientSession session1 = sf1.createSession(false, true, true);
- session1.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session1.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session1.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -92,7 +92,7 @@
ClientSession session1 = sf1.createSession(false, true, true);
- session1.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session1.createQueue(ADDRESS, ADDRESS, null, false);
session1.start();
@@ -193,7 +193,7 @@
log.info("created session");
- session1.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session1.createQueue(ADDRESS, ADDRESS, null, false);
log.info("created queue");
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -92,11 +92,11 @@
ClientSession session1 = sf1.createSession(false, true, true);
- session1.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session1.createQueue(ADDRESS, ADDRESS, null, false);
SimpleString replyTo = new SimpleString("replyto");
- session1.createQueue(replyTo, new SimpleString("replyto"), null, false, false);
+ session1.createQueue(replyTo, new SimpleString("replyto"), null, false);
ClientProducer producer = session1.createProducer(ADDRESS);
@@ -181,11 +181,11 @@
ClientSession session1 = sf1.createSession(false, true, true);
- session1.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session1.createQueue(ADDRESS, ADDRESS, null, false);
SimpleString replyTo = new SimpleString("replyto");
- session1.createQueue(replyTo, new SimpleString("replyto"), null, false, false);
+ session1.createQueue(replyTo, new SimpleString("replyto"), null, false);
ClientProducer producer = session1.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -86,7 +86,7 @@
ClientSession session1 = sf1.createSession(false, true, true);
- session1.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session1.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session1.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -80,7 +80,7 @@
ClientSession session1 = sf1.createSession(false, true, true, true);
- session1.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session1.createQueue(ADDRESS, ADDRESS, null, false);
session1.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -95,7 +95,7 @@
ClientSession session1 = sf1.createSession(false, true, true);
- session1.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session1.createQueue(ADDRESS, ADDRESS, null, false);
session1.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -136,7 +136,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/JustReplicationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/JustReplicationTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/JustReplicationTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -148,7 +148,7 @@
try
{
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
ClientProducer producer = session.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -280,7 +280,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, subName, null, false, false);
+ session.createQueue(ADDRESS, subName, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -340,7 +340,7 @@
sessConsume.start();
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -424,7 +424,7 @@
ClientSession sessConsume = createAutoCommitSession(sf);
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -515,7 +515,7 @@
sessConsume.start();
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -622,7 +622,7 @@
ClientSession sessConsume = sf.createSession(false, false, false);
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -764,7 +764,7 @@
sessConsume.start();
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -820,7 +820,7 @@
ClientSession sessConsume = sf.createSession(false, true, true);
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -883,7 +883,7 @@
sessConsume.start();
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -957,7 +957,7 @@
ClientSession sessConsume = sf.createSession(false, false, false);
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -1021,7 +1021,7 @@
{
ClientSession sessCreate = sf.createSession(false, true, true);
- sessCreate.createQueue(ADDRESS, new SimpleString(threadNum + ADDRESS.toString()), null, false, false);
+ sessCreate.createQueue(ADDRESS, new SimpleString(threadNum + ADDRESS.toString()), null, false);
ClientSession sess = sf.createSession(false, true, true);
@@ -1055,7 +1055,7 @@
{
ClientSession sessCreate = sf.createSession(false, true, true);
- sessCreate.createQueue(ADDRESS, new SimpleString(threadNum + ADDRESS.toString()), null, false, false);
+ sessCreate.createQueue(ADDRESS, new SimpleString(threadNum + ADDRESS.toString()), null, false);
ClientSession sess = sf.createSession(false, true, true);
@@ -1089,7 +1089,7 @@
{
ClientSession s = sf.createSession(false, false, false);
- s.createQueue(ADDRESS, new SimpleString(threadNum + ADDRESS.toString()), null, false, false);
+ s.createQueue(ADDRESS, new SimpleString(threadNum + ADDRESS.toString()), null, false);
final int numConsumers = 100;
@@ -1240,7 +1240,7 @@
{
ClientSession sessCreate = sf.createSession(false, true, true);
- sessCreate.createQueue(ADDRESS, new SimpleString(threadNum + ADDRESS.toString()), null, false, false);
+ sessCreate.createQueue(ADDRESS, new SimpleString(threadNum + ADDRESS.toString()), null, false);
ClientSession sess = sf.createSession(false, true, true);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -167,7 +167,7 @@
if (!CREATE_AT_START)
{
- sessConsume.createQueue(ADDRESS, subName, null, true, false);
+ sessConsume.createQueue(ADDRESS, subName, null, true);
}
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -356,7 +356,7 @@
for (int i = 0; i < NUM_SESSIONS; i++)
{
SimpleString subName = createSubName(threadNum, i);
- session.createQueue(ADDRESS, subName, null, true, false);
+ session.createQueue(ADDRESS, subName, null, true);
}
}
session.close();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -130,7 +130,7 @@
session = sf1.createSession(null, null, false, true, true, false, 0);
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -439,7 +439,7 @@
ClientSession session = factory.createSession(false, true, true, false);
try
{
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
final CountDownLatch startFlag = new CountDownLatch(1);
final CountDownLatch alignSemaphore = new CountDownLatch(numberOfThreads);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PreserveOrderDuringFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PreserveOrderDuringFailoverTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PreserveOrderDuringFailoverTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -92,7 +92,7 @@
final RemotingConnection conn1 = ((ClientSessionImpl)session).getConnection();
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
Interceptor failInterceptor = new Interceptor()
{
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -282,7 +282,7 @@
sessConsume.start();
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -396,7 +396,7 @@
ClientSession sessConsume = sf.createSession(false, true, true);
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -510,7 +510,7 @@
sessConsume.start();
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -659,7 +659,7 @@
ClientSession sessConsume = sf.createSession(false, false, false);
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -817,7 +817,7 @@
sessConsume.start();
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -904,7 +904,7 @@
ClientSession sessConsume = sf.createSession(false, true, true);
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -1005,7 +1005,7 @@
sessConsume.start();
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -1140,7 +1140,7 @@
ClientSession sessConsume = sf.createSession(false, false, false);
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -1266,7 +1266,7 @@
{
ClientSession sessCreate = sf.createSession(false, true, true);
- sessCreate.createQueue(ADDRESS, ADDRESS, null, false, false);
+ sessCreate.createQueue(ADDRESS, ADDRESS, null, false);
ClientSession sess = sf.createSession(false, true, true);
@@ -1300,7 +1300,7 @@
{
ClientSession sessCreate = sf.createSession(false, true, true);
- sessCreate.createQueue(ADDRESS, ADDRESS, null, false, false);
+ sessCreate.createQueue(ADDRESS, ADDRESS, null, false);
ClientSession sess = sf.createSession(false, true, true);
@@ -1334,7 +1334,7 @@
{
ClientSession s = sf.createSession(false, false, false);
- s.createQueue(ADDRESS, ADDRESS, null, false, false);
+ s.createQueue(ADDRESS, ADDRESS, null, false);
final int numConsumers = 100;
@@ -1366,7 +1366,7 @@
{
ClientSession sessCreate = sf.createSession(false, true, true);
- sessCreate.createQueue(ADDRESS, new SimpleString(ADDRESS.toString()), null, false, false);
+ sessCreate.createQueue(ADDRESS, new SimpleString(ADDRESS.toString()), null, false);
ClientSession sess = sf.createSession(false, true, true);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -92,7 +92,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
final int numIterations = 100;
@@ -173,7 +173,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -262,7 +262,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -341,7 +341,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -411,7 +411,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -505,7 +505,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -101,7 +101,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
final int numIterations = 10;
@@ -178,7 +178,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -90,7 +90,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -145,7 +145,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -223,7 +223,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -304,7 +304,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -372,7 +372,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -452,7 +452,7 @@
SimpleString queueName = new SimpleString("subscription" + i);
- sess.createQueue(ADDRESS, queueName, null, false, false);
+ sess.createQueue(ADDRESS, queueName, null, false);
ClientConsumer consumer = sess.createConsumer(queueName);
@@ -611,7 +611,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
@@ -677,7 +677,7 @@
try
{
- session.createQueue(new SimpleString("blah"), new SimpleString("blah"), null, false, false);
+ session.createQueue(new SimpleString("blah"), new SimpleString("blah"), null, false);
fail("Should throw exception");
}
@@ -725,7 +725,7 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -83,7 +83,7 @@
{
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -94,7 +94,7 @@
ClientSession session = sf1.createSession(false, true, true);
- session.createQueue(ADDRESS, ADDRESS, null, false, false);
+ session.createQueue(ADDRESS, ADDRESS, null, false);
ClientProducer producer = session.createProducer(ADDRESS);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -171,7 +171,7 @@
ClientSession sessConsume = createTransactionalSession(sf);
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -265,7 +265,7 @@
ClientSession sessConsume = createTransactionalSession(sf);
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -377,7 +377,7 @@
sessConsume.start();
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -450,7 +450,7 @@
ClientSession sessConsume = sf.createSession(true, false, false);
- sessConsume.createQueue(ADDRESS, subName, null, false, false);
+ sessConsume.createQueue(ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareAddressControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareAddressControlWrapperTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareAddressControlWrapperTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -109,7 +109,7 @@
backupParams));
session = sf.createSession(false, true, true);
- session.createQueue(address, address, null, false, false);
+ session.createQueue(address, address, null, false);
}
@Override
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -224,7 +224,7 @@
session = sf.createSession(false, true, true);
- session.createQueue(address, address, null, false, false);
+ session.createQueue(address, address, null, false);
}
@Override
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -193,7 +193,7 @@
{
SimpleString otherQueue = randomSimpleString();
- session.createQueue(otherQueue, otherQueue, null, false, true);
+ session.createQueue(otherQueue, otherQueue, null, false);
ClientProducer producer = session.createProducer(address);
QueueControlMBean liveQueueControl = createQueueControl(address, address, liveMBeanServer);
@@ -239,7 +239,7 @@
SimpleString otherQueue = randomSimpleString();
- session.createQueue(otherQueue, otherQueue, null, false, true);
+ session.createQueue(otherQueue, otherQueue, null, false);
QueueControlMBean liveQueueControl = createQueueControl(address, address, liveMBeanServer);
QueueControlMBean backupQueueControl = createQueueControl(address, address, backupMBeanServer);
@@ -276,7 +276,7 @@
{
SimpleString otherQueue = randomSimpleString();
- session.createQueue(otherQueue, otherQueue, null, false, true);
+ session.createQueue(otherQueue, otherQueue, null, false);
QueueControlMBean liveQueueControl = createQueueControl(address, address, liveMBeanServer);
QueueControlMBean backupQueueControl = createQueueControl(address, address, backupMBeanServer);
@@ -497,7 +497,7 @@
session = sf.createSession(false, true, true);
- session.createQueue(address, address, null, false, false);
+ session.createQueue(address, address, null, false);
}
@Override
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/divert/DivertTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/divert/DivertTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/divert/DivertTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -84,9 +84,9 @@
final SimpleString queueName2 = new SimpleString("queue2");
- session.createQueue(new SimpleString(forwardAddress), queueName1, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress), queueName1, null, false);
- session.createQueue(new SimpleString(testAddress), queueName2, null, false, false);
+ session.createQueue(new SimpleString(testAddress), queueName2, null, false);
session.start();
@@ -176,13 +176,13 @@
final SimpleString queueName4 = new SimpleString("queue4");
- session.createQueue(new SimpleString(forwardAddress), queueName1, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress), queueName1, null, false);
- session.createQueue(new SimpleString(testAddress), queueName2, null, false, false);
+ session.createQueue(new SimpleString(testAddress), queueName2, null, false);
- session.createQueue(new SimpleString(testAddress), queueName3, null, false, false);
+ session.createQueue(new SimpleString(testAddress), queueName3, null, false);
- session.createQueue(new SimpleString(testAddress), queueName4, null, false, false);
+ session.createQueue(new SimpleString(testAddress), queueName4, null, false);
session.start();
@@ -296,7 +296,7 @@
final SimpleString queueName1 = new SimpleString("queue1");
- session.createQueue(new SimpleString(forwardAddress), queueName1, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress), queueName1, null, false);
session.start();
@@ -371,11 +371,11 @@
final SimpleString queueName4 = new SimpleString("queue4");
- session.createQueue(new SimpleString(forwardAddress), queueName1, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress), queueName1, null, false);
- session.createQueue(new SimpleString(testAddress), queueName2, null, false, false);
- session.createQueue(new SimpleString(testAddress), queueName3, null, false, false);
- session.createQueue(new SimpleString(testAddress), queueName4, null, false, false);
+ session.createQueue(new SimpleString(testAddress), queueName2, null, false);
+ session.createQueue(new SimpleString(testAddress), queueName3, null, false);
+ session.createQueue(new SimpleString(testAddress), queueName4, null, false);
session.start();
@@ -470,13 +470,13 @@
final SimpleString queueName4 = new SimpleString("queue4");
- session.createQueue(new SimpleString(forwardAddress1), queueName1, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress1), queueName1, null, false);
- session.createQueue(new SimpleString(forwardAddress2), queueName2, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress2), queueName2, null, false);
- session.createQueue(new SimpleString(forwardAddress3), queueName3, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress3), queueName3, null, false);
- session.createQueue(new SimpleString(testAddress), queueName4, null, false, false);
+ session.createQueue(new SimpleString(testAddress), queueName4, null, false);
session.start();
@@ -604,13 +604,13 @@
final SimpleString queueName4 = new SimpleString("queue4");
- session.createQueue(new SimpleString(forwardAddress1), queueName1, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress1), queueName1, null, false);
- session.createQueue(new SimpleString(forwardAddress2), queueName2, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress2), queueName2, null, false);
- session.createQueue(new SimpleString(forwardAddress3), queueName3, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress3), queueName3, null, false);
- session.createQueue(new SimpleString(testAddress), queueName4, null, false, false);
+ session.createQueue(new SimpleString(testAddress), queueName4, null, false);
session.start();
@@ -727,13 +727,13 @@
final SimpleString queueName4 = new SimpleString("queue4");
- session.createQueue(new SimpleString(forwardAddress1), queueName1, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress1), queueName1, null, false);
- session.createQueue(new SimpleString(forwardAddress2), queueName2, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress2), queueName2, null, false);
- session.createQueue(new SimpleString(forwardAddress3), queueName3, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress3), queueName3, null, false);
- session.createQueue(new SimpleString(testAddress), queueName4, null, false, false);
+ session.createQueue(new SimpleString(testAddress), queueName4, null, false);
session.start();
@@ -839,13 +839,13 @@
final SimpleString queueName4 = new SimpleString("queue4");
- session.createQueue(new SimpleString(forwardAddress1), queueName1, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress1), queueName1, null, false);
- session.createQueue(new SimpleString(forwardAddress2), queueName2, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress2), queueName2, null, false);
- session.createQueue(new SimpleString(forwardAddress3), queueName3, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress3), queueName3, null, false);
- session.createQueue(new SimpleString(testAddress), queueName4, null, false, false);
+ session.createQueue(new SimpleString(testAddress), queueName4, null, false);
session.start();
@@ -983,13 +983,13 @@
final SimpleString queueName4 = new SimpleString("queue4");
- session.createQueue(new SimpleString(forwardAddress1), queueName1, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress1), queueName1, null, false);
- session.createQueue(new SimpleString(forwardAddress2), queueName2, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress2), queueName2, null, false);
- session.createQueue(new SimpleString(forwardAddress3), queueName3, null, false, false);
+ session.createQueue(new SimpleString(forwardAddress3), queueName3, null, false);
- session.createQueue(new SimpleString(testAddress), queueName4, null, false, false);
+ session.createQueue(new SimpleString(testAddress), queueName4, null, false);
session.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/divert/PersistentDivertTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/divert/PersistentDivertTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/divert/PersistentDivertTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -98,13 +98,13 @@
final SimpleString queueName4 = new SimpleString("queue4");
- session.createQueue(new SimpleString(forwardAddress1), queueName1, null, true, false);
+ session.createQueue(new SimpleString(forwardAddress1), queueName1, null, true);
- session.createQueue(new SimpleString(forwardAddress2), queueName2, null, true, false);
+ session.createQueue(new SimpleString(forwardAddress2), queueName2, null, true);
- session.createQueue(new SimpleString(forwardAddress3), queueName3, null, true, false);
+ session.createQueue(new SimpleString(forwardAddress3), queueName3, null, true);
- session.createQueue(new SimpleString(testAddress), queueName4, null, true, false);
+ session.createQueue(new SimpleString(testAddress), queueName4, null, true);
session.start();
@@ -236,13 +236,13 @@
final SimpleString queueName4 = new SimpleString("queue4");
- session.createQueue(new SimpleString(forwardAddress1), queueName1, null, true, false);
+ session.createQueue(new SimpleString(forwardAddress1), queueName1, null, true);
- session.createQueue(new SimpleString(forwardAddress2), queueName2, null, true, false);
+ session.createQueue(new SimpleString(forwardAddress2), queueName2, null, true);
- session.createQueue(new SimpleString(forwardAddress3), queueName3, null, true, false);
+ session.createQueue(new SimpleString(forwardAddress3), queueName3, null, true);
- session.createQueue(new SimpleString(testAddress), queueName4, null, true, false);
+ session.createQueue(new SimpleString(testAddress), queueName4, null, true);
ClientProducer producer = session.createProducer(new SimpleString(testAddress));
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -148,7 +148,7 @@
SimpleString jmsQueueName = new SimpleString(JBossQueue.JMS_QUEUE_ADDRESS_PREFIX + "myqueue");
- coreSession.createQueue(jmsQueueName, jmsQueueName, null, false, false);
+ coreSession.createQueue(jmsQueueName, jmsQueueName, null, false);
Queue queue = sess.createQueue("myqueue");
@@ -256,7 +256,7 @@
SimpleString jmsQueueName = new SimpleString(JBossQueue.JMS_QUEUE_ADDRESS_PREFIX + "myqueue");
- coreSessionLive.createQueue(jmsQueueName, jmsQueueName, null, false, false);
+ coreSessionLive.createQueue(jmsQueueName, jmsQueueName, null, false);
Queue queue = sessLive.createQueue("myqueue");
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/NotificationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/NotificationTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/NotificationTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -218,7 +218,7 @@
notifQueue = randomSimpleString();
- session.createQueue(DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS, notifQueue, null, false, true);
+ session.createQueue(DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS, notifQueue, null, false);
notifConsumer = session.createConsumer(notifQueue);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -84,16 +84,15 @@
SimpleString queue = randomSimpleString();
SimpleString filter = new SimpleString("color = 'blue'");
boolean durable = randomBoolean();
- boolean temporary = false;
- session.createQueue(address, queue, filter, durable, temporary);
+ session.createQueue(address, queue, filter, durable);
QueueControlMBean queueControl = createManagementControl(address, queue);
assertEquals(queue.toString(), queueControl.getName());
assertEquals(address.toString(), queueControl.getAddress());
assertEquals(filter.toString(), queueControl.getFilter());
assertEquals(durable, queueControl.isDurable());
- assertEquals(temporary, queueControl.isTemporary());
+ assertEquals(false, queueControl.isTemporary());
assertEquals(false, queueControl.isBackup());
session.deleteQueue(queue);
@@ -104,7 +103,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
assertEquals(queue.toString(), queueControl.getName());
@@ -119,7 +118,7 @@
SimpleString queue = randomSimpleString();
final SimpleString deadLetterAddress = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
assertNull(queueControl.getDeadLetterAddress());
@@ -144,7 +143,7 @@
SimpleString queue = randomSimpleString();
String deadLetterAddress = randomString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
queueControl.setDeadLetterAddress(deadLetterAddress);
@@ -160,7 +159,7 @@
SimpleString queue = randomSimpleString();
final SimpleString expiryAddress = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
assertNull(queueControl.getExpiryAddress());
@@ -185,7 +184,7 @@
SimpleString queue = randomSimpleString();
String expiryAddress = randomString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
queueControl.setExpiryAddress(expiryAddress);
@@ -200,7 +199,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
@@ -220,7 +219,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
assertEquals(0, queueControl.getMessageCount());
@@ -241,7 +240,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
assertEquals(0, queueControl.getMessagesAdded());
@@ -265,7 +264,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
assertEquals(0, queueControl.getScheduledCount());
@@ -292,7 +291,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
int intValue = randomInt();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
@@ -324,7 +323,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
ClientProducer producer = session.createProducer(address);
producer.send(session.createClientMessage(false));
@@ -350,7 +349,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
int intValue = randomInt();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
@@ -382,7 +381,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
ClientProducer producer = session.createProducer(address);
@@ -421,8 +420,8 @@
SimpleString otherAddress = randomSimpleString();
SimpleString otherQueue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
- session.createQueue(otherAddress, otherQueue, null, false, true);
+ session.createQueue(address, queue, null, false);
+ session.createQueue(otherAddress, otherQueue, null, false);
ClientProducer producer = session.createProducer(address);
// send on queue
@@ -461,7 +460,7 @@
SimpleString queue = randomSimpleString();
SimpleString unknownQueue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
+ session.createQueue(address, queue, null, false);
ClientProducer producer = session.createProducer(address);
// send on queue
@@ -510,8 +509,8 @@
SimpleString otherAddress = randomSimpleString();
SimpleString otherQueue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
- session.createQueue(otherAddress, otherQueue, null, false, true);
+ session.createQueue(address, queue, null, false);
+ session.createQueue(otherAddress, otherQueue, null, false);
ClientProducer producer = session.createProducer(address);
// send on queue
@@ -558,8 +557,8 @@
SimpleString otherAddress = randomSimpleString();
SimpleString otherQueue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
- session.createQueue(otherAddress, otherQueue, null, false, true);
+ session.createQueue(address, queue, null, false);
+ session.createQueue(otherAddress, otherQueue, null, false);
ClientProducer producer = session.createProducer(address);
// send 2 messages on queue
@@ -594,7 +593,7 @@
SimpleString queue = randomSimpleString();
SimpleString unknownQueue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
+ session.createQueue(address, queue, null, false);
ClientProducer producer = session.createProducer(address);
// send 2 messages on queue
@@ -637,7 +636,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
+ session.createQueue(address, queue, null, false);
ClientProducer producer = session.createProducer(address);
// send 2 messages on queue
@@ -675,7 +674,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
+ session.createQueue(address, queue, null, false);
ClientProducer producer = session.createProducer(address);
// send on queue
@@ -715,7 +714,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
+ session.createQueue(address, queue, null, false);
ClientProducer producer = session.createProducer(address);
// send 2 messages on queue
@@ -750,7 +749,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
+ session.createQueue(address, queue, null, false);
ClientProducer producer = session.createProducer(address);
// send on queue
@@ -780,7 +779,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
+ session.createQueue(address, queue, null, false);
ClientProducer producer = session.createProducer(address);
// send on queue
@@ -822,8 +821,8 @@
SimpleString expiryAddress = randomSimpleString();
SimpleString expiryQueue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
- session.createQueue(expiryAddress, expiryQueue, null, false, true);
+ session.createQueue(address, queue, null, false);
+ session.createQueue(expiryAddress, expiryQueue, null, false);
ClientProducer producer = session.createProducer(address);
// send on queue
@@ -860,8 +859,8 @@
SimpleString deadLetterAddress = randomSimpleString();
SimpleString deadLetterQueue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
- session.createQueue(deadLetterAddress, deadLetterQueue, null, false, true);
+ session.createQueue(address, queue, null, false);
+ session.createQueue(deadLetterAddress, deadLetterQueue, null, false);
ClientProducer producer = session.createProducer(address);
// send 2 messages on queue
@@ -903,7 +902,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
+ session.createQueue(address, queue, null, false);
ClientProducer producer = session.createProducer(address);
ClientMessage message = session.createClientMessage(false);
@@ -937,7 +936,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, true);
+ session.createQueue(address, queue, null, false);
ClientProducer producer = session.createProducer(address);
ClientMessage message = session.createClientMessage(false);
@@ -974,7 +973,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
MessagingServerControlMBean serverControl = createMessagingServerControl(mbeanServer);
@@ -1025,7 +1024,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
MessagingServerControlMBean serverControl = createMessagingServerControl(mbeanServer);
@@ -1076,7 +1075,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
String history = queueControl.listMessageCounterAsHTML();
@@ -1091,7 +1090,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
MessagingServerControlMBean serverControl = createMessagingServerControl(mbeanServer);
@@ -1110,7 +1109,7 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- session.createQueue(address, queue, null, false, false);
+ session.createQueue(address, queue, null, false);
QueueControlMBean queueControl = createManagementControl(address, queue);
MessagingServerControlMBean serverControl = createMessagingServerControl(mbeanServer);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityNotificationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityNotificationTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityNotificationTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -119,7 +119,7 @@
try
{
- guestSession.createQueue(address, queue, true, false);
+ guestSession.createQueue(address, queue, true);
fail("session creation must fail and a notification of security violation must be sent");
}
catch (Exception e)
@@ -169,7 +169,7 @@
adminSession = sf.createSession("admin", "admin", false, true, true, false, 1);
adminSession.start();
- adminSession.createQueue(DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS, notifQueue, null, false, true);
+ adminSession.createTemporaryQueue(DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS, notifQueue);
notifConsumer = adminSession.createConsumer(notifQueue);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/paging/PageCrashTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -162,7 +162,7 @@
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
+ session.createQueue(ADDRESS, ADDRESS, null, true);
ClientProducer producer = session.createProducer(ADDRESS);
Added: trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingServiceIntegrationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingServiceIntegrationTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingServiceIntegrationTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -0,0 +1,933 @@
+/*
+ * 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.paging;
+
+import java.util.HashMap;
+
+import junit.framework.AssertionFailedError;
+
+import org.jboss.messaging.core.buffers.ChannelBuffers;
+import org.jboss.messaging.core.client.ClientConsumer;
+import org.jboss.messaging.core.client.ClientMessage;
+import org.jboss.messaging.core.client.ClientProducer;
+import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.client.ClientSessionFactory;
+import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
+import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.core.server.Queue;
+import org.jboss.messaging.core.settings.impl.AddressSettings;
+import org.jboss.messaging.tests.util.ServiceTestBase;
+import org.jboss.messaging.utils.DataConstants;
+import org.jboss.messaging.utils.SimpleString;
+
+/**
+ * A PagingServiceIntegrationTest
+ *
+ * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
+ *
+ * Created Dec 5, 2008 8:25:58 PM
+ *
+ *
+ */
+public class PagingServiceIntegrationTest extends ServiceTestBase
+{
+
+ // Constants -----------------------------------------------------
+ private static final Logger log = Logger.getLogger(PagingServiceIntegrationTest.class);
+
+ private static final int RECEIVE_TIMEOUT = 30000;
+
+ // Attributes ----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ static final SimpleString ADDRESS = new SimpleString("SimpleAddress");
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ public void testSendReceivePaging() throws Exception
+ {
+ clearData();
+
+ Configuration config = createDefaultConfig();
+
+ config.setPagingMaxGlobalSizeBytes(100 * 1024);
+ config.setPagingGlobalWatermarkSize(10 * 1024);
+
+ MessagingService messagingService = createService(true, config, new HashMap<String, AddressSettings>());
+
+ messagingService.start();
+
+ final int numberOfIntegers = 256;
+
+ final int numberOfMessages = 10000;
+
+ try
+ {
+ ClientSessionFactory sf = createInVMFactory();
+
+ sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnAcknowledge(true);
+
+ ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
+
+ session.createQueue(ADDRESS, ADDRESS, null, true);
+
+ ClientProducer producer = session.createProducer(ADDRESS);
+
+ ClientMessage message = null;
+
+ byte[] body = null;
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ message = session.createClientMessage(true);
+
+ MessagingBuffer bodyLocal = message.getBody();
+
+ for (int j = 1; j <= numberOfIntegers; j++)
+ {
+ bodyLocal.writeInt(j);
+ }
+
+ if (body == null)
+ {
+ body = bodyLocal.array();
+ }
+
+ message.putIntProperty(new SimpleString("id"), i);
+
+ producer.send(message);
+ }
+
+ session.close();
+
+ messagingService.stop();
+
+ messagingService = createService(true, config, new HashMap<String, AddressSettings>());
+ messagingService.start();
+
+ sf = createInVMFactory();
+
+ assertTrue(messagingService.getServer().getPostOffice().getPagingManager().getGlobalSize() > 0);
+
+ session = sf.createSession(null, null, false, true, true, false, 0);
+
+ ClientConsumer consumer = session.createConsumer(ADDRESS);
+
+ session.start();
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ ClientMessage message2 = consumer.receive(RECEIVE_TIMEOUT);
+
+ assertNotNull(message2);
+
+ assertEquals(i, ((Integer)message2.getProperty(new SimpleString("id"))).intValue());
+
+ message2.acknowledge();
+
+ assertNotNull(message2);
+
+ try
+ {
+ assertEqualsByteArrays(body.length, body, message2.getBody().array());
+ }
+ catch (AssertionFailedError e)
+ {
+ log.info("Expected buffer:" + dumbBytesHex(body, 40));
+ log.info("Arriving buffer:" + dumbBytesHex(message2.getBody().array(), 40));
+ throw e;
+ }
+ }
+
+ consumer.close();
+
+ session.close();
+
+ assertEquals(0, messagingService.getServer().getPostOffice().getPagingManager().getGlobalSize());
+
+ }
+ finally
+ {
+ try
+ {
+ messagingService.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
+
+ }
+
+ /**
+ * - Make a destination in page mode
+ * - Add stuff to a transaction
+ * - Consume the entire destination (not in page mode any more)
+ * - Add stuff to a transaction again
+ * - Check order
+ *
+ */
+ public void testDepageDuringTransaction() throws Exception
+ {
+ clearData();
+
+ Configuration config = createDefaultConfig();
+
+ config.setPagingMaxGlobalSizeBytes(100 * 1024);
+ config.setPagingGlobalWatermarkSize(10 * 1024);
+
+ MessagingService messagingService = createService(true, config, new HashMap<String, AddressSettings>());
+
+ messagingService.start();
+
+ final int numberOfIntegers = 256;
+
+ try
+ {
+ ClientSessionFactory sf = createInVMFactory();
+
+ sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnAcknowledge(true);
+
+ ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
+
+ session.createQueue(ADDRESS, ADDRESS, null, true);
+
+ ClientProducer producer = session.createProducer(ADDRESS);
+
+ MessagingBuffer bodyLocal = ChannelBuffers.buffer(DataConstants.SIZE_INT * numberOfIntegers);
+
+ ClientMessage message = null;
+
+ int numberOfMessages = 0;
+ while (true)
+ {
+ message = session.createClientMessage(true);
+ message.setBody(bodyLocal);
+
+ // Stop sending message as soon as we start paging
+ if (messagingService.getServer().getPostOffice().getPagingManager().isPaging(ADDRESS))
+ {
+ break;
+ }
+ numberOfMessages++;
+
+ producer.send(message);
+ }
+
+ assertTrue(messagingService.getServer().getPostOffice().getPagingManager().isPaging(ADDRESS));
+
+ session.start();
+
+ ClientSession sessionTransacted = sf.createSession(null, null, false, false, false, false, 0);
+
+ ClientProducer producerTransacted = sessionTransacted.createProducer(ADDRESS);
+
+ for (int i = 0; i < 10; i++)
+ {
+ message = session.createClientMessage(true);
+ message.setBody(bodyLocal);
+ message.putIntProperty(new SimpleString("id"), i);
+
+ // Consume messages to force an eventual out of order delivery
+ if (i == 5)
+ {
+ ClientConsumer consumer = session.createConsumer(ADDRESS);
+ for (int j = 0; j < numberOfMessages; j++)
+ {
+ ClientMessage msg = consumer.receive(RECEIVE_TIMEOUT);
+ msg.acknowledge();
+ assertNotNull(msg);
+ }
+
+ assertNull(consumer.receive(100));
+ consumer.close();
+ }
+
+ Integer messageID = (Integer)message.getProperty(new SimpleString("id"));
+ assertNotNull(messageID);
+ assertEquals(messageID.intValue(), i);
+
+ producerTransacted.send(message);
+ }
+
+ ClientConsumer consumer = session.createConsumer(ADDRESS);
+
+ assertNull(consumer.receive(100));
+
+ sessionTransacted.commit();
+
+ sessionTransacted.close();
+
+ for (int i = 0; i < 10; i++)
+ {
+ message = consumer.receive(RECEIVE_TIMEOUT);
+
+ assertNotNull(message);
+
+ Integer messageID = (Integer)message.getProperty(new SimpleString("id"));
+
+ assertNotNull(messageID);
+ assertEquals("message received out of order", messageID.intValue(), i);
+
+ message.acknowledge();
+ }
+
+ assertNull(consumer.receive(100));
+
+ consumer.close();
+
+ session.close();
+
+ assertEquals(0, messagingService.getServer().getPostOffice().getPagingManager().getGlobalSize());
+
+ }
+ finally
+ {
+ try
+ {
+ messagingService.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
+
+ }
+
+ public void testPageOnSchedulingNoRestart() throws Exception
+ {
+ internalTestPageOnScheduling(false);
+ }
+
+ public void testPageOnSchedulingRestart() throws Exception
+ {
+ internalTestPageOnScheduling(true);
+ }
+
+ public void internalTestPageOnScheduling(final boolean restart) throws Exception
+ {
+ clearData();
+
+ Configuration config = createDefaultConfig();
+
+ config.setPagingMaxGlobalSizeBytes(100 * 1024);
+ config.setPagingGlobalWatermarkSize(10 * 1024);
+
+ MessagingService messagingService = createService(true, config, new HashMap<String, AddressSettings>());
+
+ messagingService.start();
+
+ final int numberOfIntegers = 256;
+
+ final int numberOfMessages = 10000;
+
+ try
+ {
+ ClientSessionFactory sf = createInVMFactory();
+
+ sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnAcknowledge(true);
+
+ ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
+
+ session.createQueue(ADDRESS, ADDRESS, null, true);
+
+ ClientProducer producer = session.createProducer(ADDRESS);
+
+ ClientMessage message = null;
+
+ byte[] body = null;
+
+ long scheduledTime = System.currentTimeMillis() + 5000;
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ message = session.createClientMessage(true);
+
+ MessagingBuffer bodyLocal = message.getBody();
+
+ for (int j = 1; j <= numberOfIntegers; j++)
+ {
+ bodyLocal.writeInt(j);
+ }
+
+
+ if (body == null)
+ {
+ body = bodyLocal.array();
+ }
+
+ message.setBody(bodyLocal);
+ message.putIntProperty(new SimpleString("id"), i);
+
+ // Worse scenario possible... only schedule what's on pages
+ if (messagingService.getServer().getPostOffice().getPagingManager().isPaging(ADDRESS))
+ {
+ message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, scheduledTime);
+ }
+
+ producer.send(message);
+ }
+
+ if (restart)
+ {
+ session.close();
+
+ messagingService.stop();
+
+ messagingService = createService(true, config, new HashMap<String, AddressSettings>());
+ messagingService.start();
+
+ sf = createInVMFactory();
+
+ session = sf.createSession(null, null, false, true, true, false, 0);
+ }
+
+ ClientConsumer consumer = session.createConsumer(ADDRESS);
+
+ session.start();
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ ClientMessage message2 = consumer.receive(RECEIVE_TIMEOUT);
+
+ assertNotNull(message2);
+
+ message2.acknowledge();
+
+ assertNotNull(message2);
+
+ Long scheduled = (Long)message2.getProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME);
+ if (scheduled != null)
+ {
+ assertTrue("Scheduling didn't work", System.currentTimeMillis() >= scheduledTime);
+ }
+
+ try
+ {
+ assertEqualsByteArrays(body.length, body, message2.getBody().array());
+ }
+ catch (AssertionFailedError e)
+ {
+ log.info("Expected buffer:" + dumbBytesHex(body, 40));
+ log.info("Arriving buffer:" + dumbBytesHex(message2.getBody().array(), 40));
+ throw e;
+ }
+ }
+
+ consumer.close();
+
+ session.close();
+
+ assertEquals(0, messagingService.getServer().getPostOffice().getPagingManager().getGlobalSize());
+
+ }
+ finally
+ {
+ try
+ {
+ messagingService.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
+
+ }
+
+ public void testRollbackOnSend() throws Exception
+ {
+ clearData();
+
+ Configuration config = createDefaultConfig();
+
+ config.setPagingMaxGlobalSizeBytes(100 * 1024);
+ config.setPagingGlobalWatermarkSize(10 * 1024);
+
+ MessagingService messagingService = createService(true, config, new HashMap<String, AddressSettings>());
+
+ messagingService.start();
+
+ final int numberOfIntegers = 256;
+
+ final int numberOfMessages = 10;
+
+ try
+ {
+ ClientSessionFactory sf = createInVMFactory();
+
+ sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnAcknowledge(true);
+
+ ClientSession session = sf.createSession(null, null, false, false, true, false, 0);
+
+ session.createQueue(ADDRESS, ADDRESS, null, true);
+
+ ClientProducer producer = session.createProducer(ADDRESS);
+
+ long initialSize = messagingService.getServer().getPostOffice().getPagingManager().getGlobalSize();
+
+ ClientMessage message = null;
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ message = session.createClientMessage(true);
+
+ MessagingBuffer bodyLocal = message.getBody();
+
+ for (int j = 1; j <= numberOfIntegers; j++)
+ {
+ bodyLocal.writeInt(j);
+ }
+
+
+ message.putIntProperty(new SimpleString("id"), i);
+
+ producer.send(message);
+ }
+
+ session.rollback();
+
+ ClientConsumer consumer = session.createConsumer(ADDRESS);
+
+ session.start();
+
+ assertNull(consumer.receive(100));
+
+ session.close();
+
+ assertEquals(initialSize, messagingService.getServer().getPostOffice().getPagingManager().getGlobalSize());
+ }
+ finally
+ {
+ try
+ {
+ messagingService.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
+
+ }
+
+ public void testCommitOnSend() throws Exception
+ {
+ clearData();
+
+ Configuration config = createDefaultConfig();
+
+ config.setPagingMaxGlobalSizeBytes(100 * 1024);
+ config.setPagingGlobalWatermarkSize(10 * 1024);
+
+ MessagingService messagingService = createService(true, config, new HashMap<String, AddressSettings>());
+
+ messagingService.start();
+
+ final int numberOfIntegers = 10;
+
+ final int numberOfMessages = 10;
+
+ try
+ {
+ ClientSessionFactory sf = createInVMFactory();
+
+ sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnAcknowledge(true);
+
+ ClientSession session = sf.createSession(null, null, false, false, false, false, 0);
+
+ session.createQueue(ADDRESS, ADDRESS, null, true);
+
+ ClientProducer producer = session.createProducer(ADDRESS);
+
+ long initialSize = messagingService.getServer().getPostOffice().getPagingManager().getGlobalSize();
+
+ ClientMessage message = null;
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ message = session.createClientMessage(true);
+
+ MessagingBuffer bodyLocal = message.getBody();
+
+ for (int j = 1; j <= numberOfIntegers; j++)
+ {
+ bodyLocal.writeInt(j);
+ }
+
+ message.putIntProperty(new SimpleString("id"), i);
+
+ producer.send(message);
+ }
+
+ session.commit();
+
+ ClientConsumer consumer = session.createConsumer(ADDRESS);
+
+ session.start();
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ ClientMessage msg = consumer.receive(500);
+ assertNotNull(msg);
+ msg.acknowledge();
+ }
+
+ session.commit();
+
+ session.close();
+
+ assertEquals(initialSize, messagingService.getServer().getPostOffice().getPagingManager().getGlobalSize());
+ }
+ finally
+ {
+ try
+ {
+ messagingService.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
+
+ }
+
+ public void testPageMultipleDestinations() throws Exception
+ {
+ internalTestPageMultipleDestinations(false);
+ }
+
+ public void testPageMultipleDestinationsTransacted() throws Exception
+ {
+ internalTestPageMultipleDestinations(true);
+ }
+
+ public void testDropMessagesQueueMax() throws Exception
+ {
+ testDropMessages(false);
+ }
+
+ public void testDropMessagesGlobalMax() throws Exception
+ {
+ testDropMessages(true);
+ }
+
+ private void testDropMessages(boolean global) throws Exception
+ {
+ clearData();
+
+ Configuration config = createDefaultConfig();
+
+ HashMap<String, AddressSettings> settings = new HashMap<String, AddressSettings>();
+
+ AddressSettings set = new AddressSettings();
+ set.setDropMessagesWhenFull(true);
+
+ settings.put(ADDRESS.toString(), set);
+
+ if (global)
+ {
+ set.setMaxSizeBytes(-1);
+ config.setPagingMaxGlobalSizeBytes(10 * 1024);
+ }
+ else
+ {
+ config.setPagingMaxGlobalSizeBytes(-1);
+ set.setMaxSizeBytes(10 * 1024);
+ }
+
+ config.setPagingGlobalWatermarkSize(10 * 1024);
+
+ MessagingService messagingService = createService(true, config, settings);
+
+ messagingService.start();
+
+ final int numberOfMessages = 1000;
+
+ try
+ {
+ ClientSessionFactory sf = createInVMFactory();
+
+ sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnAcknowledge(true);
+
+ ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
+
+ session.createQueue(ADDRESS, ADDRESS, null, true);
+
+ ClientProducer producer = session.createProducer(ADDRESS);
+
+ ClientMessage message = null;
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ MessagingBuffer bodyLocal = ChannelBuffers.wrappedBuffer(new byte[1024]);
+
+ message = session.createClientMessage(true);
+ message.setBody(bodyLocal);
+
+ producer.send(message);
+ }
+
+ session = sf.createSession(null, null, false, true, true, false, 0);
+
+ ClientConsumer consumer = session.createConsumer(ADDRESS);
+
+ session.start();
+
+ for (int i = 0; i < 9; i++)
+ {
+ ClientMessage message2 = consumer.receive(RECEIVE_TIMEOUT);
+
+ assertNotNull(message2);
+
+ message2.acknowledge();
+ }
+
+ assertNull(consumer.receive(100));
+
+ assertEquals(0, messagingService.getServer().getPostOffice().getPagingManager().getGlobalSize());
+ assertEquals(0, messagingService.getServer()
+ .getPostOffice()
+ .getPagingManager()
+ .getPageStore(ADDRESS)
+ .getAddressSize());
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ MessagingBuffer bodyLocal = ChannelBuffers.wrappedBuffer(new byte[1024]);
+
+ message = session.createClientMessage(true);
+ message.setBody(bodyLocal);
+
+ producer.send(message);
+ }
+
+ for (int i = 0; i < 9; i++)
+ {
+ ClientMessage message2 = consumer.receive(RECEIVE_TIMEOUT);
+
+ assertNotNull(message2);
+
+ message2.acknowledge();
+ }
+
+ assertNull(consumer.receive(100));
+
+ session.close();
+
+ session = sf.createSession(false, true, true);
+
+ producer = session.createProducer(ADDRESS);
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ MessagingBuffer bodyLocal = ChannelBuffers.wrappedBuffer(new byte[1024]);
+
+ message = session.createClientMessage(true);
+ message.setBody(bodyLocal);
+
+ producer.send(message);
+ }
+
+ session.commit();
+
+ consumer = session.createConsumer(ADDRESS);
+
+ session.start();
+
+ for (int i = 0; i < 9; i++)
+ {
+ ClientMessage message2 = consumer.receive(RECEIVE_TIMEOUT);
+
+ assertNotNull(message2);
+
+ message2.acknowledge();
+ }
+
+ session.commit();
+
+ assertNull(consumer.receive(100));
+
+ session.close();
+
+ assertEquals(0, messagingService.getServer().getPostOffice().getPagingManager().getGlobalSize());
+ assertEquals(0, messagingService.getServer()
+ .getPostOffice()
+ .getPagingManager()
+ .getPageStore(ADDRESS)
+ .getAddressSize());
+
+ }
+ finally
+ {
+ try
+ {
+ messagingService.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
+
+ }
+
+ private void internalTestPageMultipleDestinations(boolean transacted) throws Exception
+ {
+ Configuration config = createDefaultConfig();
+
+ final int NUMBER_OF_BINDINGS = 100;
+
+ int NUMBER_OF_MESSAGES = 2;
+
+ config.setPagingMaxGlobalSizeBytes(100 * 1024);
+ config.setPagingGlobalWatermarkSize(10 * 1024);
+
+ MessagingService messagingService = createService(true, config, new HashMap<String, AddressSettings>());
+
+ messagingService.start();
+
+ try
+ {
+ ClientSessionFactory sf = createInVMFactory();
+
+ sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnAcknowledge(true);
+
+ ClientSession session = sf.createSession(null, null, false, !transacted, true, false, 0);
+
+ for (int i = 0; i < NUMBER_OF_BINDINGS; i++)
+ {
+ session.createQueue(ADDRESS, new SimpleString("someQueue" + i), null, true);
+ }
+
+ ClientProducer producer = session.createProducer(ADDRESS);
+
+ ClientMessage message = null;
+
+ MessagingBuffer bodyLocal = ChannelBuffers.wrappedBuffer(new byte[1024]);
+
+ message = session.createClientMessage(true);
+ message.setBody(bodyLocal);
+
+ for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
+ {
+ producer.send(message);
+
+ if (transacted)
+ {
+ session.commit();
+ }
+ }
+
+ session.close();
+
+ messagingService.stop();
+
+ messagingService = createService(true, config, new HashMap<String, AddressSettings>());
+ messagingService.start();
+
+ sf = createInVMFactory();
+
+ assertTrue(messagingService.getServer().getPostOffice().getPagingManager().getGlobalSize() > 0);
+
+ session = sf.createSession(null, null, false, true, true, false, 0);
+
+ session.start();
+
+ for (int msg = 0; msg < NUMBER_OF_MESSAGES; msg++)
+ {
+
+ for (int i = 0; i < NUMBER_OF_BINDINGS; i++)
+ {
+ ClientConsumer consumer = session.createConsumer(new SimpleString("someQueue" + i));
+
+ ClientMessage message2 = consumer.receive(RECEIVE_TIMEOUT);
+
+ assertNotNull(message2);
+
+ message2.acknowledge();
+
+ assertNotNull(message2);
+
+ consumer.close();
+
+ }
+ }
+
+ session.close();
+
+ for (int i = 0; i < NUMBER_OF_BINDINGS; i++)
+ {
+ Queue queue = (Queue)messagingService.getServer()
+ .getPostOffice()
+ .getBinding(new SimpleString("someQueue" + i))
+ .getBindable();
+
+ assertEquals("Queue someQueue" + i + " was supposed to be empty", 0, queue.getMessageCount());
+ assertEquals("Queue someQueue" + i + " was supposed to be empty", 0, queue.getDeliveringCount());
+ }
+
+ assertEquals("There are pending messages on the server", 0, messagingService.getServer()
+ .getPostOffice()
+ .getPagingManager()
+ .getGlobalSize());
+
+ }
+ finally
+ {
+ try
+ {
+ messagingService.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
+
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/DelayedMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/DelayedMessageTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/DelayedMessageTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -93,7 +93,7 @@
ClientSessionFactory sessionFactory = createInVMFactory();
ClientSession session = sessionFactory.createSession(false, false, false);
- session.createQueue(qName, qName, null, true, false);
+ session.createQueue(qName, qName, null, true);
session.close();
ClientSession session1 = sessionFactory.createSession(false, true, true);
@@ -162,7 +162,7 @@
ClientSession session = sessionFactory.createSession(false, false, false);
- session.createQueue(qName, qName, null, true, false);
+ session.createQueue(qName, qName, null, true);
session.close();
ClientSession session1 = sessionFactory.createSession(false, true, true);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -143,7 +143,7 @@
// then we create a client as normal
ClientSessionFactory sessionFactory = createInVMFactory();
ClientSession session = sessionFactory.createSession(false, true, false);
- session.createQueue(atestq, atestq, null, true, true);
+ session.createQueue(atestq, atestq, null, true);
ClientProducer producer = session.createProducer(atestq);
ClientMessage message = createDurableMessage(session, "m1");
long time = System.currentTimeMillis();
@@ -179,8 +179,8 @@
// then we create a client as normal
ClientSessionFactory sessionFactory = createInVMFactory();
ClientSession session = sessionFactory.createSession(false, true, false);
- session.createQueue(atestq, atestq, null, true, true);
- session.createQueue(atestq, atestq2, null, true, true);
+ session.createQueue(atestq, atestq, null, true);
+ session.createQueue(atestq, atestq2, null, true);
ClientProducer producer = session.createProducer(atestq);
ClientMessage message = createDurableMessage(session, "m1");
producer.send(message);
@@ -228,8 +228,8 @@
// then we create a client as normal
ClientSessionFactory sessionFactory = createInVMFactory();
ClientSession session = sessionFactory.createSession(false, true, false);
- session.createQueue(atestq, atestq, null, true, true);
- session.createQueue(atestq, atestq2, null, true, true);
+ session.createQueue(atestq, atestq, null, true);
+ session.createQueue(atestq, atestq2, null, true);
ClientProducer producer = session.createProducer(atestq);
ClientMessage message = createDurableMessage(session, "m1");
producer.send(message);
@@ -287,7 +287,7 @@
// then we create a client as normal
ClientSessionFactory sessionFactory = createInVMFactory();
ClientSession session = sessionFactory.createSession(false, true, false);
- session.createQueue(atestq, atestq, null, true, true);
+ session.createQueue(atestq, atestq, null, true);
ClientProducer producer = session.createProducer(atestq);
ClientMessage message = session.createClientMessage(JBossTextMessage.TYPE,
false,
@@ -336,7 +336,7 @@
ClientSessionFactory sessionFactory = createInVMFactory();
ClientSession session = sessionFactory.createSession(false, true, false);
- session.createQueue(atestq, atestq, null, true, true);
+ session.createQueue(atestq, atestq, null, true);
ClientProducer producer = session.createProducer(atestq);
ClientMessage m1 = createDurableMessage(session, "m1");
ClientMessage m2 = createDurableMessage(session, "m2");
@@ -416,7 +416,7 @@
ClientSessionFactory sessionFactory = createInVMFactory();
ClientSession session = sessionFactory.createSession(false, true, false);
- session.createQueue(atestq, atestq, null, true, true);
+ session.createQueue(atestq, atestq, null, true);
ClientProducer producer = session.createProducer(atestq);
ClientMessage m1 = createDurableMessage(session, "m1");
ClientMessage m2 = createDurableMessage(session, "m2");
@@ -497,7 +497,7 @@
ClientSessionFactory sessionFactory = createInVMFactory();
ClientSession session = sessionFactory.createSession(false, true, false);
- session.createQueue(atestq, atestq, null, true, true);
+ session.createQueue(atestq, atestq, null, true);
ClientProducer producer = session.createProducer(atestq);
ClientMessage m1 = createDurableMessage(session, "m1");
ClientMessage m2 = createDurableMessage(session, "m2");
@@ -571,7 +571,7 @@
ClientSessionFactory sessionFactory = createInVMFactory();
ClientSession session = sessionFactory.createSession(true, false, false);
- session.createQueue(atestq, atestq, null, true, false);
+ session.createQueue(atestq, atestq, null, true);
session.start(xid, XAResource.TMNOFLAGS);
ClientProducer producer = session.createProducer(atestq);
ClientMessage message = createDurableMessage(session, "testINVMCoreClient");
@@ -633,7 +633,7 @@
ClientSessionFactory sessionFactory = createInVMFactory();
ClientSession session = sessionFactory.createSession(tx, false, false);
- session.createQueue(atestq, atestq, null, true, false);
+ session.createQueue(atestq, atestq, null, true);
ClientProducer producer = session.createProducer(atestq);
ClientConsumer consumer = session.createConsumer(atestq);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/security/SecurityTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -345,7 +345,7 @@
securityManager.addRole("auser", "arole");
ClientSessionFactory cf = createInVMFactory();
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
- session.createQueue(addressA, queueA, false, true);
+ session.createQueue(addressA, queueA, false);
session.close();
}
finally
@@ -379,7 +379,7 @@
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
try
{
- session.createQueue(addressA, queueA, false, true);
+ session.createQueue(addressA, queueA, false);
fail("should throw exception");
}
catch (MessagingException e)
@@ -416,7 +416,7 @@
securityManager.addRole("auser", "arole");
ClientSessionFactory cf = createInVMFactory();
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
- session.createQueue(addressA, queueA, false, true);
+ session.createQueue(addressA, queueA, false);
session.deleteQueue(queueA);
session.close();
}
@@ -448,7 +448,7 @@
securityManager.addRole("auser", "arole");
ClientSessionFactory cf = createInVMFactory();
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
- session.createQueue(addressA, queueA, false, true);
+ session.createQueue(addressA, queueA, false);
try
{
session.deleteQueue(queueA);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/security/SimpleClient.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/security/SimpleClient.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/security/SimpleClient.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -65,7 +65,7 @@
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(connectorFactoryClassName));
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(queueName, queueName, null, false, false);
+ session.createQueue(queueName, queueName, null, false);
ClientProducer producer = session.createProducer(queueName);
ClientConsumer consumer = session.createConsumer(queueName);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/server/ExpiryRunnerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/server/ExpiryRunnerTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/server/ExpiryRunnerTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -91,7 +91,7 @@
public void testExpireFromMultipleQueues() throws Exception
{
ClientProducer producer = clientSession.createProducer(qName);
- clientSession.createQueue(qName2, qName2, null, false, false);
+ clientSession.createQueue(qName2, qName2, null, false);
AddressSettings addressSettings = new AddressSettings();
addressSettings.setExpiryAddress(expiryAddress);
messagingService.getServer().getAddressSettingsRepository().addMatch(qName2.toString(), addressSettings);
@@ -189,7 +189,7 @@
public void testExpireToMultipleQueues() throws Exception
{
- clientSession.createQueue(qName, qName2, null, false, false);
+ clientSession.createQueue(qName, qName2, null, false);
AddressSettings addressSettings = new AddressSettings();
addressSettings.setExpiryAddress(expiryAddress);
messagingService.getServer().getAddressSettingsRepository().addMatch(qName2.toString(), addressSettings);
@@ -301,14 +301,14 @@
ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(INVM_CONNECTOR_FACTORY));
sessionFactory.setBlockOnAcknowledge(true);
clientSession = sessionFactory.createSession(false, true, true);
- clientSession.createQueue(qName, qName, null, false, false);
+ clientSession.createQueue(qName, qName, null, false);
expiryAddress = new SimpleString("EA");
expiryQueue = new SimpleString("expiryQ");
AddressSettings addressSettings = new AddressSettings();
addressSettings.setExpiryAddress(expiryAddress);
messagingService.getServer().getAddressSettingsRepository().addMatch(qName.toString(), addressSettings);
messagingService.getServer().getAddressSettingsRepository().addMatch(qName2.toString(), addressSettings);
- clientSession.createQueue(expiryAddress, expiryQueue, null, false, false);
+ clientSession.createQueue(expiryAddress, expiryQueue, null, false);
}
@Override
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/server/PredefinedQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/server/PredefinedQueueTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/server/PredefinedQueueTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -93,7 +93,7 @@
try
{
- session.createQueue(testAddress, queueName1, null, false, false);
+ session.createQueue(testAddress, queueName1, null, false);
fail("Should throw exception");
}
@@ -103,7 +103,7 @@
}
try
{
- session.createQueue(testAddress, queueName2, null, false, false);
+ session.createQueue(testAddress, queueName2, null, false);
fail("Should throw exception");
}
@@ -113,7 +113,7 @@
}
try
{
- session.createQueue(testAddress, queueName3, null, false, false);
+ session.createQueue(testAddress, queueName3, null, false);
fail("Should throw exception");
}
@@ -229,11 +229,11 @@
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(testAddress, queueName1, null, true, false);
+ session.createQueue(testAddress, queueName1, null, true);
- session.createQueue(testAddress, queueName2, null, true, false);
+ session.createQueue(testAddress, queueName2, null, true);
- session.createQueue(testAddress, queueName3, null, true, false);
+ session.createQueue(testAddress, queueName3, null, true);
session.close();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/server/SoloQueueRecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/server/SoloQueueRecoveryTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/server/SoloQueueRecoveryTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -211,7 +211,7 @@
sessionFactory.setAckBatchSize(0);
clientSession = sessionFactory.createSession(false, true, true);
clientSessionXa = sessionFactory.createSession(true, false, false);
- clientSession.createQueue(address, qName1, null, true, false);
+ clientSession.createQueue(address, qName1, null, true);
}
private void restartServer() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/server/SoloQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/server/SoloQueueTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/server/SoloQueueTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -579,6 +579,6 @@
clientSession = sessionFactory.createSession(false, true, true);
clientSessionTxReceives = sessionFactory.createSession(false, true, false);
clientSessionTxSends = sessionFactory.createSession(false, false, true);
- clientSession.createQueue(address, qName1, null, true, false);
+ clientSession.createQueue(address, qName1, null, true);
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaRecoveryTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -256,7 +256,7 @@
addSettings();
- clientSession.createQueue(pageQueue, pageQueue, null, true, true);
+ clientSession.createQueue(pageQueue, pageQueue, null, true);
clientSession.start(xid, XAResource.TMNOFLAGS);
@@ -339,7 +339,7 @@
addSettings();
- clientSession.createQueue(pageQueue, pageQueue, null, true, true);
+ clientSession.createQueue(pageQueue, pageQueue, null, true);
long initialPageSize = this.messagingService.getServer().getPostOffice().getPagingManager().getGlobalSize();
@@ -1029,7 +1029,7 @@
ClientSession clientSession2 = sessionFactory.createSession(false, true, true);
ClientProducer clientProducer2 = clientSession2.createProducer(atestq);
SimpleString anewtestq = new SimpleString("anewtestq");
- clientSession.createQueue(anewtestq, anewtestq, null, true, true);
+ clientSession.createQueue(anewtestq, anewtestq, null, true);
ClientProducer clientProducer3 = clientSession2.createProducer(anewtestq);
clientProducer2.send(m1);
clientProducer2.send(m2);
@@ -1119,7 +1119,7 @@
ClientSession clientSession2 = sessionFactory.createSession(false, true, true);
ClientProducer clientProducer2 = clientSession2.createProducer(atestq);
SimpleString anewtestq = new SimpleString("anewtestq");
- clientSession.createQueue(anewtestq, anewtestq, null, true, true);
+ clientSession.createQueue(anewtestq, anewtestq, null, true);
ClientProducer clientProducer3 = clientSession2.createProducer(anewtestq);
clientProducer2.send(m1);
clientProducer2.send(m2);
@@ -1275,7 +1275,7 @@
clientSession = sessionFactory.createSession(true, false, commitACKs);
if (createQueue)
{
- clientSession.createQueue(atestq, atestq, null, true, true);
+ clientSession.createQueue(atestq, atestq, null, true);
}
clientProducer = clientSession.createProducer(atestq);
clientConsumer = clientSession.createConsumer(atestq);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -87,7 +87,7 @@
sessionFactory = createInVMFactory();
clientSession = sessionFactory.createSession(true, false, false);
- clientSession.createQueue(atestq, atestq, null, true, true);
+ clientSession.createQueue(atestq, atestq, null, true);
}
@Override
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/xa/XaTimeoutTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -83,7 +83,7 @@
//then we create a client as normal
sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(INVM_CONNECTOR_FACTORY));
clientSession = sessionFactory.createSession(true, false, false);
- clientSession.createQueue(atestq, atestq, null, true, true);
+ clientSession.createQueue(atestq, atestq, null, true);
clientProducer = clientSession.createProducer(atestq);
clientConsumer = clientSession.createConsumer(atestq);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -243,7 +243,7 @@
{
{
ClientSession session = factory.createSession(false, false, false);
- session.createQueue(adr, adr, null, true, false);
+ session.createQueue(adr, adr, null, true);
session.close();
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java 2009-03-26 09:02:25 UTC (rev 6168)
+++ trunk/tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java 2009-03-26 09:17:47 UTC (rev 6169)
@@ -94,7 +94,7 @@
SimpleString address = new SimpleString("page-adr");
- session.createQueue(address, address, null, true, false);
+ session.createQueue(address, address, null, true);
ClientProducer prod = session.createProducer(address);
@@ -222,8 +222,8 @@
SimpleString address = new SimpleString("page-adr");
SimpleString queue[] = new SimpleString[] { new SimpleString("queue1"), new SimpleString("queue2") };
- session.createQueue(address, queue[0], null, true, false);
- session.createQueue(address, queue[1], null, true, false);
+ session.createQueue(address, queue[0], null, true);
+ session.createQueue(address, queue[1], null, true);
ClientProducer prod = session.createProducer(address);
More information about the jboss-cvs-commits
mailing list