JBoss hornetq SVN: r8627 - trunk/tests/src/org/hornetq/tests/integration/cluster/reattach.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-12-08 18:09:30 -0500 (Tue, 08 Dec 2009)
New Revision: 8627
Modified:
trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java
Log:
Clean up on test
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2009-12-08 22:48:43 UTC (rev 8626)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2009-12-08 23:09:30 UTC (rev 8627)
@@ -57,6 +57,8 @@
// Constants -----------------------------------------------------
+ final SimpleString ADDRESS = new SimpleString("address");
+
// Attributes ----------------------------------------------------
private final Logger log = Logger.getLogger(this.getClass());
@@ -97,6 +99,9 @@
final CountDownLatch ready = new CountDownLatch(1);
+
+ // this test will use a queue. Whenever the test wants a failure.. it can just send TRUE to failureQueue
+ // This Thread will be reading the queue
Thread failer = new Thread()
{
@Override
@@ -147,60 +152,7 @@
try
{
- int numberOfProducers = 1;
-
- final CountDownLatch align = new CountDownLatch(numberOfProducers);
- final CountDownLatch flagStart = new CountDownLatch(1);
-
- final ClientSessionFactory sessionFactory = sf;
-
- class ThreadProd extends Thread
- {
- Throwable throwable;
-
- int count;
-
- public ThreadProd(final int count)
- {
- this.count = count;
- }
-
- @Override
- public void run()
- {
- try
- {
- align.countDown();
- flagStart.await();
- doSend2(count, sessionFactory, failureQueue);
- }
- catch (Throwable e)
- {
- e.printStackTrace();
- throwable = e;
- }
- }
- }
-
- ThreadProd prod[] = new ThreadProd[numberOfProducers];
- for (int i = 0; i < prod.length; i++)
- {
- prod[i] = new ThreadProd(i);
- prod[i].start();
- }
-
- align.await();
- flagStart.countDown();
-
- for (ThreadProd prodT : prod)
- {
- prodT.join();
- if (prodT.throwable != null)
- {
- throw prodT.throwable;
- }
- }
-
+ doSend2(1, sf, failureQueue);
}
finally
{
@@ -229,8 +181,6 @@
}
- final SimpleString ADDRESS = new SimpleString("address");
-
public void doSend2(final int order, final ClientSessionFactory sf, final LinkedBlockingDeque<Boolean> failureQueue) throws Exception
{
long start = System.currentTimeMillis();
@@ -315,7 +265,6 @@
if (count % 100 == 0)
{
failureQueue.push(true);
- System.out.println("Received " + count);
}
if (count == numMessages)
15 years, 3 months
- 1
- 0
JBoss hornetq SVN: r8626 - trunk/tests/src/org/hornetq/tests/integration/cluster/reattach.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-12-08 17:48:43 -0500 (Tue, 08 Dec 2009)
New Revision: 8626
Modified:
trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java
Log:
tweaks on test
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2009-12-08 22:05:34 UTC (rev 8625)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2009-12-08 22:48:43 UTC (rev 8626)
@@ -291,26 +291,31 @@
final CountDownLatch latch = new CountDownLatch(1);
volatile int count;
+
+ Exception failure;
public void onMessage(final ClientMessage message)
{
- if (count == numMessages)
+ if (count >= numMessages)
{
- Assert.fail("Too many messages");
+ failure = new Exception("too many messages");
+ latch.countDown();
}
-
+
if (message.getIntProperty("count") != count)
{
- log.warn("Error on counter", new Exception("error on counter"));
- System.exit(-1);
+ failure = new Exception("counter " + count + " was not as expected (" + message.getIntProperty("count") + ")");
+ log.warn("Failure on receiving message ", failure);
+ failure.printStackTrace();
+ latch.countDown();
}
- Assert.assertEquals(count, message.getObjectProperty(new SimpleString("count")));
count++;
if (count % 100 == 0)
{
failureQueue.push(true);
+ System.out.println("Received " + count);
}
if (count == numMessages)
@@ -333,9 +338,14 @@
for (MyHandler handler : handlers)
{
- boolean ok = handler.latch.await(10000, TimeUnit.MILLISECONDS);
+ boolean ok = handler.latch.await(60000, TimeUnit.MILLISECONDS);
Assert.assertTrue(ok);
+
+ if (handler.failure != null)
+ {
+ throw handler.failure;
+ }
}
// failureQueue.push(true);
@@ -344,7 +354,6 @@
for (ClientSession session : sessions)
{
-
// failureQueue.push(true);
session.close();
}
15 years, 3 months
- 1
- 0
JBoss hornetq SVN: r8625 - trunk/tests/src/org/hornetq/tests/integration/cluster/reattach.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-12-08 17:05:34 -0500 (Tue, 08 Dec 2009)
New Revision: 8625
Added:
trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java
Log:
Adding test that reliably fail on the failover ordering issue
Added: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java (rev 0)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2009-12-08 22:05:34 UTC (rev 8625)
@@ -0,0 +1,393 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.hornetq.tests.integration.cluster.reattach;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.TimeUnit;
+
+import junit.framework.Assert;
+import junit.framework.TestSuite;
+
+import org.hornetq.core.client.ClientConsumer;
+import org.hornetq.core.client.ClientMessage;
+import org.hornetq.core.client.ClientProducer;
+import org.hornetq.core.client.ClientSession;
+import org.hornetq.core.client.ClientSessionFactory;
+import org.hornetq.core.client.MessageHandler;
+import org.hornetq.core.client.impl.ClientSessionInternal;
+import org.hornetq.core.exception.HornetQException;
+import org.hornetq.core.logging.Logger;
+import org.hornetq.core.remoting.impl.RemotingConnectionImpl;
+import org.hornetq.core.server.HornetQServer;
+import org.hornetq.jms.client.HornetQTextMessage;
+import org.hornetq.tests.util.ServiceTestBase;
+import org.hornetq.utils.SimpleString;
+
+/**
+ * A OrderReattachTest
+ *
+ * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
+ *
+ *
+ */
+public class OrderReattachTest extends ServiceTestBase
+{
+
+ // Disabled for now... under investigation (Clebert)
+ public static TestSuite suite()
+ {
+ TestSuite suite = new TestSuite();
+
+ return suite;
+ }
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+ private final Logger log = Logger.getLogger(this.getClass());
+
+ private HornetQServer server;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ public void testOrderOnSendInVM() throws Throwable
+ {
+ for (int i = 0; i < 500; i++)
+ {
+ log.info("#" + getName() + " # " + i);
+ doTestOrderOnSend(false);
+ tearDown();
+ setUp();
+ }
+ }
+
+ public void doTestOrderOnSend(final boolean isNetty) throws Throwable
+ {
+ server = createServer(false, isNetty);
+
+ server.start();
+
+ ClientSessionFactory sf = createFactory(isNetty);
+ sf.setReconnectAttempts(-1);
+ sf.setConfirmationWindowSize(100 * 1024 * 1024);
+ sf.setBlockOnNonDurableSend(false);
+ sf.setBlockOnAcknowledge(false);
+
+ final ClientSession session = sf.createSession(false, true, true);
+
+ final LinkedBlockingDeque<Boolean> failureQueue = new LinkedBlockingDeque<Boolean>();
+
+ final CountDownLatch ready = new CountDownLatch(1);
+
+ Thread failer = new Thread()
+ {
+ @Override
+ public void run()
+ {
+ ready.countDown();
+ while (true)
+ {
+ try
+ {
+ Boolean poll = false;
+ try
+ {
+ poll = failureQueue.poll(60, TimeUnit.SECONDS);
+ }
+ catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ break;
+ }
+
+ Thread.sleep(1);
+
+ final RemotingConnectionImpl conn = (RemotingConnectionImpl)((ClientSessionInternal)session).getConnection();
+
+ // True means... fail session
+ if (poll)
+ {
+ conn.fail(new HornetQException(HornetQException.NOT_CONNECTED, "poop"));
+ }
+ else
+ {
+ // false means... finish thread
+ break;
+ }
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ }
+ };
+
+ failer.start();
+
+ ready.await();
+
+ try
+ {
+ int numberOfProducers = 1;
+
+ final CountDownLatch align = new CountDownLatch(numberOfProducers);
+ final CountDownLatch flagStart = new CountDownLatch(1);
+
+ final ClientSessionFactory sessionFactory = sf;
+
+ class ThreadProd extends Thread
+ {
+ Throwable throwable;
+
+ int count;
+
+ public ThreadProd(final int count)
+ {
+ this.count = count;
+ }
+
+ @Override
+ public void run()
+ {
+ try
+ {
+ align.countDown();
+ flagStart.await();
+ doSend2(count, sessionFactory, failureQueue);
+ }
+ catch (Throwable e)
+ {
+ e.printStackTrace();
+ throwable = e;
+ }
+ }
+ }
+
+ ThreadProd prod[] = new ThreadProd[numberOfProducers];
+ for (int i = 0; i < prod.length; i++)
+ {
+ prod[i] = new ThreadProd(i);
+ prod[i].start();
+ }
+
+ align.await();
+ flagStart.countDown();
+
+ for (ThreadProd prodT : prod)
+ {
+ prodT.join();
+ if (prodT.throwable != null)
+ {
+ throw prodT.throwable;
+ }
+ }
+
+ }
+ finally
+ {
+ try
+ {
+ session.close();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
+ try
+ {
+ sf.close();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
+ failureQueue.put(false);
+
+ failer.join();
+ }
+
+ }
+
+ final SimpleString ADDRESS = new SimpleString("address");
+
+ public void doSend2(final int order, final ClientSessionFactory sf, final LinkedBlockingDeque<Boolean> failureQueue) throws Exception
+ {
+ long start = System.currentTimeMillis();
+
+ ClientSession s = sf.createSession(false, false, false);
+
+ final int numMessages = 500;
+
+ final int numSessions = 100;
+
+ Set<ClientConsumer> consumers = new HashSet<ClientConsumer>();
+ Set<ClientSession> sessions = new HashSet<ClientSession>();
+
+ for (int i = 0; i < numSessions; i++)
+ {
+ SimpleString subName = new SimpleString("sub" + i);
+
+ // failureQueue.push(true);
+
+ ClientSession sessConsume = sf.createSession(false, true, true);
+
+ sessConsume.createQueue(ADDRESS, subName, null, false);
+
+ ClientConsumer consumer = sessConsume.createConsumer(subName);
+
+ consumers.add(consumer);
+
+ sessions.add(sessConsume);
+ }
+
+ ClientSession sessSend = sf.createSession(false, true, true);
+
+ ClientProducer producer = sessSend.createProducer(ADDRESS);
+
+ for (int i = 0; i < numMessages; i++)
+ {
+ ClientMessage message = sessSend.createMessage(HornetQTextMessage.TYPE,
+ false,
+ 0,
+ System.currentTimeMillis(),
+ (byte)1);
+
+ if (i % 10 == 0)
+ {
+ // failureQueue.push(true);
+ }
+ message.putIntProperty(new SimpleString("count"), i);
+ producer.send(message);
+ }
+
+ for (ClientSession session : sessions)
+ {
+ session.start();
+ }
+
+ class MyHandler implements MessageHandler
+ {
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ volatile int count;
+
+ public void onMessage(final ClientMessage message)
+ {
+ if (count == numMessages)
+ {
+ Assert.fail("Too many messages");
+ }
+
+ if (message.getIntProperty("count") != count)
+ {
+ log.warn("Error on counter", new Exception("error on counter"));
+ System.exit(-1);
+ }
+ Assert.assertEquals(count, message.getObjectProperty(new SimpleString("count")));
+
+ count++;
+
+ if (count % 100 == 0)
+ {
+ failureQueue.push(true);
+ }
+
+ if (count == numMessages)
+ {
+ latch.countDown();
+ }
+ }
+ }
+
+ Set<MyHandler> handlers = new HashSet<MyHandler>();
+
+ for (ClientConsumer consumer : consumers)
+ {
+ MyHandler handler = new MyHandler();
+
+ consumer.setMessageHandler(handler);
+
+ handlers.add(handler);
+ }
+
+ for (MyHandler handler : handlers)
+ {
+ boolean ok = handler.latch.await(10000, TimeUnit.MILLISECONDS);
+
+ Assert.assertTrue(ok);
+ }
+
+ // failureQueue.push(true);
+
+ sessSend.close();
+
+ for (ClientSession session : sessions)
+ {
+
+ // failureQueue.push(true);
+ session.close();
+ }
+
+ for (int i = 0; i < numSessions; i++)
+ {
+
+ failureQueue.push(true);
+
+ SimpleString subName = new SimpleString("sub" + i);
+
+ s.deleteQueue(subName);
+ }
+
+ s.close();
+
+ long end = System.currentTimeMillis();
+
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ if (server != null && server.isStarted())
+ {
+ server.stop();
+ }
+
+ super.tearDown();
+ }
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
\ No newline at end of file
15 years, 3 months
- 1
- 0
JBoss hornetq SVN: r8624 - trunk/src/main/org/hornetq/core/persistence/impl/journal.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-12-08 14:14:50 -0500 (Tue, 08 Dec 2009)
New Revision: 8624
Modified:
trunk/src/main/org/hornetq/core/persistence/impl/journal/OperationContextImpl.java
Log:
just a minor tweak
Modified: trunk/src/main/org/hornetq/core/persistence/impl/journal/OperationContextImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/persistence/impl/journal/OperationContextImpl.java 2009-12-08 18:40:15 UTC (rev 8623)
+++ trunk/src/main/org/hornetq/core/persistence/impl/journal/OperationContextImpl.java 2009-12-08 19:14:50 UTC (rev 8624)
@@ -211,8 +211,7 @@
}
catch (Throwable e)
{
- e.printStackTrace();
- OperationContextImpl.log.warn("Error on executor's submit");
+ OperationContextImpl.log.warn("Error on executor's submit", e);
executorsPending.decrementAndGet();
task.onError(HornetQException.INTERNAL_ERROR,
"It wasn't possible to complete IO operation - " + e.getMessage());
15 years, 3 months
- 1
- 0
JBoss hornetq SVN: r8623 - in trunk: src/main/org/hornetq/core/remoting/impl/wireformat and 6 other directories.
by do-not-reply＠jboss.org
Author: timfox
Date: 2009-12-08 13:40:15 -0500 (Tue, 08 Dec 2009)
New Revision: 8623
Added:
trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java
Modified:
trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java
trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java
trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java
trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java
trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java
trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
trunk/src/main/org/hornetq/jms/client/HornetQConnection.java
trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java
trunk/src/main/org/hornetq/jms/client/HornetQSession.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-121 and https://jira.jboss.org/jira/browse/HORNETQ-238
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2009-12-08 17:05:54 UTC (rev 8622)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -27,6 +27,7 @@
import org.hornetq.core.remoting.Channel;
import org.hornetq.core.remoting.impl.wireformat.SessionConsumerCloseMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage;
+import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage;
import org.hornetq.utils.Future;
@@ -112,6 +113,8 @@
private boolean stopped = false;
private final AtomicLong forceDeliveryCount = new AtomicLong(0);
+
+ private final SessionQueueQueryResponseMessage queueInfo;
// Constructors
// ---------------------------------------------------------------------------------
@@ -125,7 +128,8 @@
final int ackBatchSize,
final TokenBucketLimiter rateLimiter,
final Executor executor,
- final Channel channel)
+ final Channel channel,
+ final SessionQueueQueryResponseMessage queueInfo)
{
this.id = id;
@@ -146,6 +150,8 @@
this.clientWindowSize = clientWindowSize;
this.ackBatchSize = ackBatchSize;
+
+ this.queueInfo = queueInfo;
}
// ClientConsumer implementation
@@ -424,6 +430,11 @@
// ClientConsumerInternal implementation
// --------------------------------------------------------------
+ public SessionQueueQueryResponseMessage getQueueInfo()
+ {
+ return queueInfo;
+ }
+
public long getID()
{
return id;
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java 2009-12-08 17:05:54 UTC (rev 8622)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -16,6 +16,7 @@
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.exception.HornetQException;
+import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage;
import org.hornetq.utils.SimpleString;
@@ -62,4 +63,6 @@
void stop() throws HornetQException;
void start();
+
+ SessionQueueQueryResponseMessage getQueueInfo();
}
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-12-08 17:05:54 UTC (rev 8622)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -922,6 +922,23 @@
for (Map.Entry<Long, ClientConsumerInternal> entry : consumers.entrySet())
{
+ SessionQueueQueryResponseMessage queueInfo = entry.getValue().getQueueInfo();
+
+ // We try and recreate any non durable queues, since they probably won't be there unless
+ // they are defined in hornetq-configuration.xml
+ // This allows e.g. JMS non durable subs and temporary queues to continue to be used after failover
+ if (!queueInfo.isDurable())
+ {
+ CreateQueueMessage createQueueRequest = new CreateQueueMessage(queueInfo.getAddress(),
+ queueInfo.getName(),
+ queueInfo.getFilterString(),
+ false,
+ queueInfo.isTemporary(),
+ false);
+
+ sendPacketWithoutLock(createQueueRequest);
+ }
+
SessionCreateConsumerMessage createConsumerRequest = new SessionCreateConsumerMessage(entry.getKey(),
entry.getValue()
.getQueueName(),
@@ -931,14 +948,8 @@
.isBrowseOnly(),
false);
- createConsumerRequest.setChannelID(channel.getID());
-
- Connection conn = channel.getConnection().getTransportConnection();
-
- HornetQBuffer buffer = createConsumerRequest.encode(channel.getConnection());
-
- conn.write(buffer, false);
-
+ sendPacketWithoutLock(createConsumerRequest);
+
int clientWindowSize = entry.getValue().getClientWindowSize();
if (clientWindowSize != 0)
@@ -946,11 +957,7 @@
SessionConsumerFlowCreditMessage packet = new SessionConsumerFlowCreditMessage(entry.getKey(),
clientWindowSize);
- packet.setChannelID(channel.getID());
-
- buffer = packet.encode(channel.getConnection());
-
- conn.write(buffer, false);
+ sendPacketWithoutLock(packet);
}
}
@@ -1006,6 +1013,17 @@
}
}
+ private void sendPacketWithoutLock(final Packet packet)
+ {
+ packet.setChannelID(channel.getID());
+
+ Connection conn = channel.getConnection().getTransportConnection();
+
+ HornetQBuffer buffer = packet.encode(channel.getConnection());
+
+ conn.write(buffer, false);
+ }
+
public void workDone()
{
workDone = true;
@@ -1478,7 +1496,7 @@
browseOnly,
true);
- channel.sendBlocking(request);
+ SessionQueueQueryResponseMessage queueInfo = (SessionQueueQueryResponseMessage)channel.sendBlocking(request);
// The actual windows size that gets used is determined by the user since
// could be overridden on the queue settings
@@ -1497,7 +1515,8 @@
false)
: null,
executor,
- channel);
+ channel,
+ queueInfo);
addConsumer(consumer);
@@ -1546,7 +1565,7 @@
throw new HornetQException(HornetQException.INTERNAL_ERROR, "Queue can not be both durable and temporay");
}
- CreateQueueMessage request = new CreateQueueMessage(address, queueName, filterString, durable, temp);
+ CreateQueueMessage request = new CreateQueueMessage(address, queueName, filterString, durable, temp, true);
channel.sendBlocking(request);
}
Modified: trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2009-12-08 17:05:54 UTC (rev 8622)
+++ trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -546,7 +546,7 @@
private void failoverOrReconnect(final Object connectionID, final HornetQException me)
{
Set<ClientSessionInternal> sessionsToClose = null;
-
+
synchronized (failoverLock)
{
if (connection == null || connection.getID() != connectionID)
@@ -555,6 +555,7 @@
// over then a async connection exception or disconnect
// came in for one of the already exitLoop connections, so we return true - we don't want to call the
// listeners again
+
return;
}
@@ -602,7 +603,7 @@
{
attemptReconnect = reconnectAttempts != 0;
}
-
+
if (attemptFailover || attemptReconnect)
{
lockChannel1();
Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java 2009-12-08 17:05:54 UTC (rev 8622)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -39,6 +39,8 @@
private boolean durable;
private boolean temporary;
+
+ private boolean requiresResponse;
// Static --------------------------------------------------------
@@ -48,7 +50,8 @@
final SimpleString queueName,
final SimpleString filterString,
final boolean durable,
- final boolean temporary)
+ final boolean temporary,
+ final boolean requiresResponse)
{
super(PacketImpl.CREATE_QUEUE);
@@ -57,6 +60,7 @@
this.filterString = filterString;
this.durable = durable;
this.temporary = temporary;
+ this.requiresResponse = requiresResponse;
}
public CreateQueueMessage()
@@ -103,6 +107,11 @@
{
return temporary;
}
+
+ public boolean isRequiresResponse()
+ {
+ return requiresResponse;
+ }
@Override
public void encodeRest(final HornetQBuffer buffer)
@@ -112,6 +121,7 @@
buffer.writeNullableSimpleString(filterString);
buffer.writeBoolean(durable);
buffer.writeBoolean(temporary);
+ buffer.writeBoolean(requiresResponse);
}
@Override
@@ -122,6 +132,7 @@
filterString = buffer.readNullableSimpleString();
durable = buffer.readBoolean();
temporary = buffer.readBoolean();
+ requiresResponse = buffer.readBoolean();
}
@Override
Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java 2009-12-08 17:05:54 UTC (rev 8622)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -25,6 +25,8 @@
*/
public class SessionQueueQueryResponseMessage extends PacketImpl
{
+ private SimpleString name;
+
private boolean exists;
private boolean durable;
@@ -36,31 +38,39 @@
private SimpleString filterString;
private SimpleString address;
+
+ private boolean temporary;
- public SessionQueueQueryResponseMessage(final boolean durable,
+ public SessionQueueQueryResponseMessage(final SimpleString name,
+ final SimpleString address,
+ final boolean durable,
+ final boolean temporary,
+ final SimpleString filterString,
final int consumerCount,
- final int messageCount,
- final SimpleString filterString,
- final SimpleString address)
+ final int messageCount)
{
- this(durable, consumerCount, messageCount, filterString, address, true);
+ this(name, address, durable, temporary, filterString, consumerCount, messageCount, true);
}
public SessionQueueQueryResponseMessage()
{
- this(false, 0, 0, null, null, false);
+ this(null, null, false, false, null, 0, 0, false);
}
- private SessionQueueQueryResponseMessage(final boolean durable,
+ private SessionQueueQueryResponseMessage(final SimpleString name,
+ final SimpleString address,
+ final boolean durable,
+ final boolean temporary,
+ final SimpleString filterString,
final int consumerCount,
final int messageCount,
- final SimpleString filterString,
- final SimpleString address,
final boolean exists)
{
super(PacketImpl.SESS_QUEUEQUERY_RESP);
this.durable = durable;
+
+ this.temporary = temporary;
this.consumerCount = consumerCount;
@@ -69,6 +79,8 @@
this.filterString = filterString;
this.address = address;
+
+ this.name = name;
this.exists = exists;
}
@@ -108,16 +120,28 @@
{
return address;
}
+
+ public SimpleString getName()
+ {
+ return name;
+ }
+
+ public boolean isTemporary()
+ {
+ return temporary;
+ }
@Override
public void encodeRest(final HornetQBuffer buffer)
{
buffer.writeBoolean(exists);
buffer.writeBoolean(durable);
+ buffer.writeBoolean(temporary);
buffer.writeInt(consumerCount);
buffer.writeInt(messageCount);
buffer.writeNullableSimpleString(filterString);
buffer.writeNullableSimpleString(address);
+ buffer.writeNullableSimpleString(name);
}
@Override
@@ -125,10 +149,12 @@
{
exists = buffer.readBoolean();
durable = buffer.readBoolean();
+ temporary = buffer.readBoolean();
consumerCount = buffer.readInt();
messageCount = buffer.readInt();
filterString = buffer.readNullableSimpleString();
address = buffer.readNullableSimpleString();
+ name = buffer.readNullableSimpleString();
}
@Override
Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2009-12-08 17:05:54 UTC (rev 8622)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -367,8 +367,7 @@
}
private void updateConnectors(final Map<String, DiscoveryEntry> connectors) throws Exception
- {
- System.out.println("ClusterConnectionImpl.updateConnectors");
+ {
Iterator<Map.Entry<String, MessageFlowRecord>> iter = records.entrySet().iterator();
while (iter.hasNext())
Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-12-08 17:05:54 UTC (rev 8622)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -376,7 +376,7 @@
public void handleCreateConsumer(final SessionCreateConsumerMessage packet)
{
SimpleString name = packet.getQueueName();
-
+
SimpleString filterString = packet.getFilterString();
boolean browseOnly = packet.isBrowseOnly();
@@ -437,7 +437,17 @@
managementService.sendNotification(notification);
}
- response = new NullResponseMessage();
+ //We send back queue information on the queue as a response- this allows the queue to
+ //be automaticall recreated on failover
+
+ if (packet.isRequiresResponse())
+ {
+ response = doExecuteQueueQuery(name);
+ }
+ else
+ {
+ response = null;
+ }
}
catch (Exception e)
{
@@ -451,7 +461,7 @@
response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR));
}
}
-
+
sendResponse(packet, response, false, false);
}
@@ -460,7 +470,7 @@
SimpleString address = packet.getAddress();
final SimpleString name = packet.getQueueName();
-
+
SimpleString filterString = packet.getFilterString();
boolean temporary = packet.isTemporary();
@@ -510,7 +520,14 @@
});
}
- response = new NullResponseMessage();
+ if (packet.isRequiresResponse())
+ {
+ response = new NullResponseMessage();
+ }
+ else
+ {
+ response = null;
+ }
}
catch (Exception e)
{
@@ -562,7 +579,7 @@
sendResponse(packet, response, false, false);
}
-
+
public void handleExecuteQueueQuery(final SessionQueueQueryMessage packet)
{
SimpleString name = packet.getQueueName();
@@ -571,35 +588,7 @@
try
{
- if (name == null)
- {
- throw new IllegalArgumentException("Queue name is null");
- }
-
- Binding binding = postOffice.getBinding(name);
-
- if (binding != null && binding.getType() == BindingType.LOCAL_QUEUE)
- {
- Queue queue = (Queue)binding.getBindable();
-
- Filter filter = queue.getFilter();
-
- SimpleString filterString = filter == null ? null : filter.getFilterString();
- response = new SessionQueueQueryResponseMessage(queue.isDurable(),
- queue.getConsumerCount(),
- queue.getMessageCount(),
- filterString,
- binding.getAddress());
- }
- // make an exception for the management address (see HORNETQ-29)
- else if (name.equals(managementAddress))
- {
- response = new SessionQueueQueryResponseMessage(true, -1, -1, null, managementAddress);
- }
- else
- {
- response = new SessionQueueQueryResponseMessage();
- }
+ response = doExecuteQueueQuery(name);
}
catch (Exception e)
{
@@ -1419,6 +1408,7 @@
if (consumer == null)
{
ServerSessionImpl.log.error("There is no consumer with id " + packet.getConsumerID());
+
return;
}
@@ -1710,6 +1700,46 @@
// Private
// ----------------------------------------------------------------------------
+ private SessionQueueQueryResponseMessage doExecuteQueueQuery(final SimpleString name) throws Exception
+ {
+ if (name == null)
+ {
+ throw new IllegalArgumentException("Queue name is null");
+ }
+
+ SessionQueueQueryResponseMessage response;
+
+ Binding binding = postOffice.getBinding(name);
+
+ if (binding != null && binding.getType() == BindingType.LOCAL_QUEUE)
+ {
+ Queue queue = (Queue)binding.getBindable();
+
+ Filter filter = queue.getFilter();
+
+ SimpleString filterString = filter == null ? null : filter.getFilterString();
+
+ response = new SessionQueueQueryResponseMessage(name,
+ binding.getAddress(),
+ queue.isDurable(),
+ queue.isTemporary(),
+ filterString,
+ queue.getConsumerCount(),
+ queue.getMessageCount());
+ }
+ // make an exception for the management address (see HORNETQ-29)
+ else if (name.equals(managementAddress))
+ {
+ response = new SessionQueueQueryResponseMessage(name, managementAddress, true, false, null, -1, -1);
+ }
+ else
+ {
+ response = new SessionQueueQueryResponseMessage();
+ }
+
+ return response;
+ }
+
private void sendResponse(final Packet confirmPacket,
final Packet response,
final boolean flush,
Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnection.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQConnection.java 2009-12-08 17:05:54 UTC (rev 8622)
+++ trunk/src/main/org/hornetq/jms/client/HornetQConnection.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -261,16 +261,26 @@
{
if (!tempQueues.isEmpty())
{
- if (initialSession == null)
- {
- initialSession = sessionFactory.createSession(username, password, false, true, true, false, 0);
- }
+// if (initialSession == null)
+// {
+// initialSession = sessionFactory.createSession(username, password, false, true, true, false, 0);
+// }
// Remove any temporary queues
for (SimpleString queueName : tempQueues)
{
- initialSession.deleteQueue(queueName);
+ if (!initialSession.isClosed())
+ {
+ try
+ {
+ initialSession.deleteQueue(queueName);
+ }
+ catch (HornetQException ignore)
+ {
+ //Exception on deleting queue shouldn't prevent close from completing
+ }
+ }
}
}
}
Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java 2009-12-08 17:05:54 UTC (rev 8622)
+++ trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -145,7 +145,7 @@
if (autoDeleteQueueName != null)
{
- // If non durable subscriber need to delete subscription too
+ // If non durable subscriber need to delete subscription too
session.deleteQueue(autoDeleteQueueName);
}
Modified: trunk/src/main/org/hornetq/jms/client/HornetQSession.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQSession.java 2009-12-08 17:05:54 UTC (rev 8622)
+++ trunk/src/main/org/hornetq/jms/client/HornetQSession.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -939,19 +939,7 @@
throw JMSExceptionHelper.convertFromHornetQException(e);
}
}
-
- public void deleteQueue(final SimpleString queueName) throws JMSException
- {
- try
- {
- session.deleteQueue(queueName);
- }
- catch (HornetQException e)
- {
- throw JMSExceptionHelper.convertFromHornetQException(e);
- }
- }
-
+
public void start() throws JMSException
{
try
@@ -983,6 +971,21 @@
// Package protected ---------------------------------------------
+ void deleteQueue(final SimpleString queueName) throws JMSException
+ {
+ if (!session.isClosed())
+ {
+ try
+ {
+ session.deleteQueue(queueName);
+ }
+ catch (HornetQException ignore)
+ {
+ //Exception on deleting queue shouldn't prevent close from completing
+ }
+ }
+ }
+
// Protected -----------------------------------------------------
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-12-08 17:05:54 UTC (rev 8622)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -1350,7 +1350,7 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- ClientSession session = sendAndConsume(sf);
+ ClientSession session = sendAndConsume(sf, true);
final CountDownLatch latch = new CountDownLatch(1);
@@ -1379,7 +1379,7 @@
sf = new ClientSessionFactoryImpl(getConnectorTransportConfiguration(false));
- session = sendAndConsume(sf);
+ session = sendAndConsume(sf, false);
session.close();
@@ -1757,8 +1757,28 @@
Assert.assertEquals(0, sf.numConnections());
}
- public void testSimpleSendAfterFailover() throws Exception
+ public void testSimpleSendAfterFailoverDurableTemporary() throws Exception
{
+ testSimpleSendAfterFailover(true, true);
+ }
+
+ public void testSimpleSendAfterFailoverNonDurableTemporary() throws Exception
+ {
+ testSimpleSendAfterFailover(false, true);
+ }
+
+ public void testSimpleSendAfterFailoverDurableNonTemporary() throws Exception
+ {
+ testSimpleSendAfterFailover(true, false);
+ }
+
+ public void testSimpleSendAfterFailoverNonDurableNonTemporary() throws Exception
+ {
+ testSimpleSendAfterFailover(false, false);
+ }
+
+ private void testSimpleSendAfterFailover(final boolean durable, final boolean temporary) throws Exception
+ {
ClientSessionFactoryInternal sf = getSessionFactory();
sf.setBlockOnNonDurableSend(true);
@@ -1767,8 +1787,15 @@
ClientSession session = sf.createSession(true, true, 0);
- session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true);
-
+ if (temporary)
+ {
+ session.createTemporaryQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null);
+ }
+ else
+ {
+ session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, durable);
+ }
+
final CountDownLatch latch = new CountDownLatch(1);
class MyListener extends BaseListener
@@ -2254,11 +2281,14 @@
// Private -------------------------------------------------------
- private ClientSession sendAndConsume(final ClientSessionFactory sf) throws Exception
+ private ClientSession sendAndConsume(final ClientSessionFactory sf, final boolean createQueue) throws Exception
{
ClientSession session = sf.createSession(false, true, true);
- session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, false);
+ if (createQueue)
+ {
+ session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, false);
+ }
ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
Added: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java (rev 0)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -0,0 +1,371 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.hornetq.tests.integration.jms.cluster;
+
+import javax.jms.BytesMessage;
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.Destination;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+
+import junit.framework.Assert;
+
+import org.hornetq.core.client.ClientSession;
+import org.hornetq.core.client.impl.ClientSessionInternal;
+import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.TransportConfiguration;
+import org.hornetq.core.config.impl.ConfigurationImpl;
+import org.hornetq.core.exception.HornetQException;
+import org.hornetq.core.logging.Logger;
+import org.hornetq.core.remoting.RemotingConnection;
+import org.hornetq.core.remoting.impl.invm.InVMRegistry;
+import org.hornetq.core.server.HornetQ;
+import org.hornetq.core.server.HornetQServer;
+import org.hornetq.jms.HornetQQueue;
+import org.hornetq.jms.HornetQTopic;
+import org.hornetq.jms.client.HornetQConnectionFactory;
+import org.hornetq.jms.client.HornetQSession;
+import org.hornetq.tests.util.RandomUtil;
+import org.hornetq.tests.util.UnitTestCase;
+import org.hornetq.utils.SimpleString;
+
+/**
+ *
+ * A JMSReconnectTest
+ *
+ * @author Tim Fox
+ *
+ *
+ */
+public class JMSReconnectTest extends UnitTestCase
+{
+ private static final Logger log = Logger.getLogger(JMSReconnectTest.class);
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private HornetQServer liveService;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ //In this test we re-attach to the same node without restarting the server
+ public void testReattachSameNode() throws Exception
+ {
+ testReconnectOrReattachSameNode(true);
+ }
+
+ //In this test, we reconnect to the same node without restarting the server
+ public void testReconnectSameNode() throws Exception
+ {
+ testReconnectOrReattachSameNode(false);
+ }
+
+ private void testReconnectOrReattachSameNode(boolean reattach) throws Exception
+ {
+ HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
+
+ jbcf.setBlockOnDurableSend(true);
+ jbcf.setBlockOnNonDurableSend(true);
+
+ jbcf.setReconnectAttempts(-1);
+
+ if (reattach)
+ {
+ jbcf.setConfirmationWindowSize(1024 * 1024);
+ }
+
+ // Note we set consumer window size to a value so we can verify that consumer credit re-sending
+ // works properly on failover
+ // The value is small enough that credits will have to be resent several time
+
+ final int numMessages = 10;
+
+ final int bodySize = 1000;
+
+ jbcf.setConsumerWindowSize(numMessages * bodySize / 10);
+
+ Connection conn = jbcf.createConnection();
+
+ MyExceptionListener listener = new MyExceptionListener();
+
+ conn.setExceptionListener(listener);
+
+ Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ ClientSession coreSession = ((HornetQSession)sess).getCoreSession();
+
+ RemotingConnection coreConn = ((ClientSessionInternal)coreSession).getConnection();
+
+ SimpleString jmsQueueName = new SimpleString(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + "myqueue");
+
+ coreSession.createQueue(jmsQueueName, jmsQueueName, null, true);
+
+ Queue queue = sess.createQueue("myqueue");
+
+ MessageProducer producer = sess.createProducer(queue);
+
+ producer.setDeliveryMode(DeliveryMode.PERSISTENT);
+
+ MessageConsumer consumer = sess.createConsumer(queue);
+
+ byte[] body = RandomUtil.randomBytes(bodySize);
+
+ for (int i = 0; i < numMessages; i++)
+ {
+ BytesMessage bm = sess.createBytesMessage();
+
+ bm.writeBytes(body);
+
+ producer.send(bm);
+ }
+
+ conn.start();
+
+ log.info("sent messages and started connection");
+
+ Thread.sleep(2000);
+
+ HornetQException me = new HornetQException(HornetQException.NOT_CONNECTED);
+
+ coreConn.fail(me);
+
+ //It should reconnect to the same node
+
+ for (int i = 0; i < numMessages; i++)
+ {
+ log.info("got message " + i);
+
+ BytesMessage bm = (BytesMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(bm);
+
+ Assert.assertEquals(body.length, bm.getBodyLength());
+ }
+
+ TextMessage tm = (TextMessage)consumer.receiveNoWait();
+
+ Assert.assertNull(tm);
+
+ conn.close();
+
+ Assert.assertNotNull(listener.e);
+
+ Assert.assertTrue(me == listener.e.getCause());
+ }
+
+ public void testReconnectSameNodeServerRestartedWithNonDurableSub() throws Exception
+ {
+ testReconnectSameNodeServerRestartedWithNonDurableSubOrTempQueue(true);
+ }
+
+ public void testReconnectSameNodeServerRestartedWithTempQueue() throws Exception
+ {
+ testReconnectSameNodeServerRestartedWithNonDurableSubOrTempQueue(false);
+ }
+
+ //Test that non durable JMS sub gets recreated in auto reconnect
+ private void testReconnectSameNodeServerRestartedWithNonDurableSubOrTempQueue(final boolean durableSub) throws Exception
+ {
+ HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
+
+ jbcf.setReconnectAttempts(-1);
+
+ Connection conn = jbcf.createConnection();
+
+ MyExceptionListener listener = new MyExceptionListener();
+
+ conn.setExceptionListener(listener);
+
+ Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ ClientSession coreSession = ((HornetQSession)sess).getCoreSession();
+
+ Destination dest;
+
+ if (durableSub)
+ {
+ coreSession.createQueue(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + "mytopic", "blahblah", null, false);
+
+ dest = new HornetQTopic("mytopic");
+ }
+ else
+ {
+ dest = sess.createTemporaryQueue();
+ }
+
+ MessageProducer producer = sess.createProducer(dest);
+
+ //Create a non durable subscriber
+ MessageConsumer consumer = sess.createConsumer(dest);
+
+ this.liveService.stop();
+
+ this.liveService.start();
+
+ //Allow client some time to reconnect
+ Thread.sleep(3000);
+
+ log.info("now sending some messages");
+
+ final int numMessages = 100;
+
+ byte[] body = RandomUtil.randomBytes(1000);
+
+ for (int i = 0; i < numMessages; i++)
+ {
+ BytesMessage bm = sess.createBytesMessage();
+
+ bm.writeBytes(body);
+
+ producer.send(bm);
+ }
+
+ conn.start();
+
+ for (int i = 0; i < numMessages; i++)
+ {
+ BytesMessage bm = (BytesMessage)consumer.receive(1000);
+
+ Assert.assertNotNull(bm);
+
+ Assert.assertEquals(body.length, bm.getBodyLength());
+ }
+
+ TextMessage tm = (TextMessage)consumer.receiveNoWait();
+
+ Assert.assertNull(tm);
+
+ conn.close();
+
+ Assert.assertNotNull(listener.e);
+ }
+
+ //If the server is shutdown after a non durable sub is created, then close on the connection should proceed normally
+ public void testNoReconnectCloseAfterFailToReconnectWithTopicConsumer() throws Exception
+ {
+ HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
+
+ jbcf.setReconnectAttempts(0);
+
+ Connection conn = jbcf.createConnection();
+
+ Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ ClientSession coreSession = ((HornetQSession)sess).getCoreSession();
+
+ coreSession.createQueue(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + "mytopic", "blahblah", null, false);
+
+ Topic topic = new HornetQTopic("mytopic");
+
+ //Create a non durable subscriber
+ MessageConsumer consumer = sess.createConsumer(topic);
+
+ Thread.sleep(2000);
+
+ this.liveService.stop();
+
+ this.liveService.start();
+
+ sess.close();
+
+ conn.close();
+ }
+
+ //If server is shutdown, and then connection is closed, after a temp queue has been created, the close should complete normally
+ public void testNoReconnectCloseAfterFailToReconnectWithTempQueue() throws Exception
+ {
+ HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
+
+ jbcf.setReconnectAttempts(0);
+
+ Connection conn = jbcf.createConnection();
+
+ Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ sess.createTemporaryQueue();
+
+ Thread.sleep(2000);
+
+ this.liveService.stop();
+
+ this.liveService.start();
+
+ sess.close();
+
+ conn.close();
+ }
+
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ Configuration liveConf = new ConfigurationImpl();
+ liveConf.setSecurityEnabled(false);
+ liveConf.getAcceptorConfigurations()
+ .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory"));
+ liveConf.setBindingsDirectory(getBindingsDir());
+ liveConf.setJournalMinFiles(2);
+ liveConf.setJournalDirectory(getJournalDir());
+ liveConf.setPagingDirectory(getPageDir());
+ liveConf.setLargeMessagesDirectory(getLargeMessagesDir());
+
+ liveService = HornetQ.newHornetQServer(liveConf, true);
+ liveService.start();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ liveService.stop();
+
+ Assert.assertEquals(0, InVMRegistry.instance.size());
+
+ liveService = null;
+
+ super.tearDown();
+ }
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+ private static class MyExceptionListener implements ExceptionListener
+ {
+ volatile JMSException e;
+
+ public void onException(final JMSException e)
+ {
+ this.e = e;
+ }
+ }
+
+}
Modified: trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java 2009-12-08 17:05:54 UTC (rev 8622)
+++ trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java 2009-12-08 18:40:15 UTC (rev 8623)
@@ -35,6 +35,7 @@
import org.hornetq.core.client.impl.ClientMessageInternal;
import org.hornetq.core.client.impl.LargeMessageBufferImpl;
import org.hornetq.core.exception.HornetQException;
+import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage;
import org.hornetq.tests.util.RandomUtil;
@@ -724,6 +725,12 @@
}
+ public SessionQueueQueryResponseMessage getQueueInfo()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
}
15 years, 3 months
- 1
- 0
JBoss hornetq SVN: r8622 - in trunk: examples/core/embedded and 33 other directories.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-12-08 12:05:54 -0500 (Tue, 08 Dec 2009)
New Revision: 8622
Modified:
trunk/docs/user-manual/en/duplicate-detection.xml
trunk/docs/user-manual/en/embedding-hornetq.xml
trunk/docs/user-manual/en/management.xml
trunk/docs/user-manual/en/using-core.xml
trunk/examples/core/embedded-remote/readme.html
trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java
trunk/examples/core/embedded/readme.html
trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java
trunk/examples/core/microcontainer/readme.html
trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java
trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java
trunk/src/main/org/hornetq/core/client/ClientSession.java
trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java
trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
trunk/src/main/org/hornetq/jms/client/HornetQMessage.java
trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java
trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java
trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java
trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java
trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java
trunk/tests/src/org/hornetq/tests/integration/client/AckBatchSizeTest.java
trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java
trunk/tests/src/org/hornetq/tests/integration/client/AddressSettingsTest.java
trunk/tests/src/org/hornetq/tests/integration/client/AutogroupIdTest.java
trunk/tests/src/org/hornetq/tests/integration/client/BlockingSendTest.java
trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java
trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java
trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java
trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java
trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java
trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java
trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java
trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java
trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java
trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java
trunk/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java
trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java
trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java
trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java
trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java
trunk/tests/src/org/hornetq/tests/integration/client/MessageRateTest.java
trunk/tests/src/org/hornetq/tests/integration/client/OrderTest.java
trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java
trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java
trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java
trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java
trunk/tests/src/org/hornetq/tests/integration/client/ReceiveTest.java
trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java
trunk/tests/src/org/hornetq/tests/integration/client/RoutingTest.java
trunk/tests/src/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java
trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java
trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
trunk/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java
trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java
trunk/tests/src/org/hornetq/tests/integration/client/SimpleSendMultipleQueues.java
trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java
trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java
trunk/tests/src/org/hornetq/tests/integration/client/TransactionalSendTest.java
trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java
trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java
trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java
trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java
trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java
trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java
trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java
trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java
trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/CoreMessagingProxy.java
trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java
trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java
trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java
trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java
trunk/tests/src/org/hornetq/tests/integration/scheduling/DelayedMessageTest.java
trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java
trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java
trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java
trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java
trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java
trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java
trunk/tests/src/org/hornetq/tests/stress/client/SendStressTest.java
trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java
trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java
trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java
trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java
trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java
Log:
HORNETQ-185: review core API
* renamed methods ClientSession.createClientMessage() to createMessage()
Modified: trunk/docs/user-manual/en/duplicate-detection.xml
===================================================================
--- trunk/docs/user-manual/en/duplicate-detection.xml 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/docs/user-manual/en/duplicate-detection.xml 2009-12-08 17:05:54 UTC (rev 8622)
@@ -74,7 +74,7 @@
<programlisting>
...
-ClientMessage message = session.createClientMessage(true);
+ClientMessage message = session.createMessage(true);
SimpleString myUniqueID = "This is my unique id"; // Could use a UUID for this
Modified: trunk/docs/user-manual/en/embedding-hornetq.xml
===================================================================
--- trunk/docs/user-manual/en/embedding-hornetq.xml 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/docs/user-manual/en/embedding-hornetq.xml 2009-12-08 17:05:54 UTC (rev 8622)
@@ -135,7 +135,7 @@
ClientProducer producer = session.createProducer("example");
-ClientMessage message = session.createClientMessage(true);
+ClientMessage message = session.createMessage(true);
message.getBody().writeString("Hello");
Modified: trunk/docs/user-manual/en/management.xml
===================================================================
--- trunk/docs/user-manual/en/management.xml 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/docs/user-manual/en/management.xml 2009-12-08 17:05:54 UTC (rev 8622)
@@ -619,7 +619,7 @@
<programlisting>
ClientSession session = ...
ClientRequestor requestor = new ClientRequestor(session, "hornetq.management");
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
ManagementHelper.putAttribute(message, "core.queue.exampleQueue", "messageCount");
ClientMessage reply = requestor.request(m);
int count = (Integer) ManagementHelper.getResult(reply);
Modified: trunk/docs/user-manual/en/using-core.xml
===================================================================
--- trunk/docs/user-manual/en/using-core.xml 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/docs/user-manual/en/using-core.xml 2009-12-08 17:05:54 UTC (rev 8622)
@@ -135,7 +135,7 @@
ClientProducer producer = session.createProducer("example");
-ClientMessage message = session.createClientMessage(true);
+ClientMessage message = session.createMessage(true);
message.getBody().writeString("Hello");
Modified: trunk/examples/core/embedded/readme.html
===================================================================
--- trunk/examples/core/embedded/readme.html 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/examples/core/embedded/readme.html 2009-12-08 17:05:54 UTC (rev 8622)
@@ -55,7 +55,7 @@
<li>Create and send a Message</li>
<pre class="prettyprint">
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putStringProperty(propName, "Hello sent at " + new Date());
System.out.println("Sending the message.");
producer.send(message);
Modified: trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java
===================================================================
--- trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -77,7 +77,7 @@
ClientProducer producer = session.createProducer(queueName);
// Step 6. Create and send a message
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
final String propName = "myprop";
Modified: trunk/examples/core/embedded-remote/readme.html
===================================================================
--- trunk/examples/core/embedded-remote/readme.html 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/examples/core/embedded-remote/readme.html 2009-12-08 17:05:54 UTC (rev 8622)
@@ -74,7 +74,7 @@
<li>Create and send a Message</li>
<pre class="prettyprint">
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putStringProperty(propName, "Hello sent at " + new Date());
System.out.println("Sending the message.");
producer.send(message);
Modified: trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java
===================================================================
--- trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -69,7 +69,7 @@
ClientProducer producer = session.createProducer(queueName);
// Step 7. Create and send a message
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
final String propName = "myprop";
Modified: trunk/examples/core/microcontainer/readme.html
===================================================================
--- trunk/examples/core/microcontainer/readme.html 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/examples/core/microcontainer/readme.html 2009-12-08 17:05:54 UTC (rev 8622)
@@ -44,7 +44,7 @@
<li>Create and send a Message</li>
<pre class="prettyprint">
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putStringProperty(propName, "Hello sent at " + new Date());
System.out.println("Sending the message.");
producer.send(message);
Modified: trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java
===================================================================
--- trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -69,7 +69,7 @@
ClientProducer producer = session.createProducer(queueName);
// Step 5. Create and send a message
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
final String propName = "myprop";
Modified: trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java
===================================================================
--- trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -391,7 +391,7 @@
ClientProducer producer = session.createProducer(perfParams.getAddress());
- ClientMessage message = session.createClientMessage(durable);
+ ClientMessage message = session.createMessage(durable);
byte[] payload = PerfBase.randomByteArray(messageSize);
Modified: trunk/src/main/org/hornetq/core/client/ClientSession.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/ClientSession.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/src/main/org/hornetq/core/client/ClientSession.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -448,7 +448,7 @@
* @param durable whether the created message is durable or not
* @return a ClientMessage
*/
- ClientMessage createClientMessage(boolean durable);
+ ClientMessage createMessage(boolean durable);
/**
* Create a ClientMessage.
@@ -457,7 +457,7 @@
* @param durable whether the created message is durable or not
* @return a ClientMessage
*/
- ClientMessage createClientMessage(byte type, boolean durable);
+ ClientMessage createMessage(byte type, boolean durable);
/**
* Create a ClientMessage with the given HornetQBuffer as its body.
@@ -468,7 +468,7 @@
* @param priority the message priority (between 0 and 9 inclusive)
* @return a ClientMessage
*/
- ClientMessage createClientMessage(byte type, boolean durable, long expiration, long timestamp, byte priority);
+ ClientMessage createMessage(byte type, boolean durable, long expiration, long timestamp, byte priority);
// Query operations ----------------------------------------------
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -573,7 +573,7 @@
rollbackOnly = false;
}
- public ClientMessage createClientMessage(final byte type,
+ public ClientMessage createMessage(final byte type,
final boolean durable,
final long expiration,
final long timestamp,
@@ -582,14 +582,14 @@
return new ClientMessageImpl(type, durable, expiration, timestamp, priority, initialMessagePacketSize);
}
- public ClientMessage createClientMessage(final byte type, final boolean durable)
+ public ClientMessage createMessage(final byte type, final boolean durable)
{
- return this.createClientMessage(type, durable, 0, System.currentTimeMillis(), (byte)4);
+ return this.createMessage(type, durable, 0, System.currentTimeMillis(), (byte)4);
}
- public ClientMessage createClientMessage(final boolean durable)
+ public ClientMessage createMessage(final boolean durable)
{
- return this.createClientMessage((byte)0, durable);
+ return this.createMessage((byte)0, durable);
}
public boolean isClosed()
Modified: trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -148,23 +148,23 @@
session.commit(xid, onePhase);
}
- public ClientMessage createClientMessage(final boolean durable)
+ public ClientMessage createMessage(final boolean durable)
{
- return session.createClientMessage(durable);
+ return session.createMessage(durable);
}
- public ClientMessage createClientMessage(final byte type,
+ public ClientMessage createMessage(final byte type,
final boolean durable,
final long expiration,
final long timestamp,
final byte priority)
{
- return session.createClientMessage(type, durable, expiration, timestamp, priority);
+ return session.createMessage(type, durable, expiration, timestamp, priority);
}
- public ClientMessage createClientMessage(final byte type, final boolean durable)
+ public ClientMessage createMessage(final byte type, final boolean durable)
{
- return session.createClientMessage(type, durable);
+ return session.createMessage(type, durable);
}
public ClientConsumer createConsumer(final SimpleString queueName,
Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -620,7 +620,7 @@
session.start();
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
ManagementHelper.putOperationInvocation(message,
ResourceNames.CORE_SERVER,
Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessage.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -237,7 +237,7 @@
*/
protected HornetQMessage(final byte type, final ClientSession session)
{
- message = session.createClientMessage(type, true, 0, System.currentTimeMillis(), (byte)4);
+ message = session.createMessage(type, true, 0, System.currentTimeMillis(), (byte)4);
}
Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -1261,7 +1261,7 @@
return false;
}
- public ClientMessage createClientMessage(final byte type,
+ public ClientMessage createMessage(final byte type,
final boolean durable,
final long expiration,
final long timestamp,
@@ -1270,12 +1270,12 @@
return message;
}
- public ClientMessage createClientMessage(final byte type, final boolean durable)
+ public ClientMessage createMessage(final byte type, final boolean durable)
{
return message;
}
- public ClientMessage createClientMessage(final boolean durable)
+ public ClientMessage createMessage(final boolean durable)
{
return message;
}
@@ -1369,14 +1369,6 @@
return null;
}
- /* (non-Javadoc)
- * @see org.hornetq.core.client.ClientSession#createClientMessage(boolean, org.hornetq.core.remoting.spi.HornetQBuffer)
- */
- public ClientMessage createClientMessage(final boolean durable, final HornetQBuffer buffer)
- {
- // TODO Auto-generated method stub
- return null;
- }
public void addFailureListener(final SessionFailureListener listener)
{
Modified: trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java
===================================================================
--- trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -279,7 +279,7 @@
private Object invokeSyncOperation(final String resourceName, final String operationName, final Object... parameters) throws Exception
{
- ClientMessage message = clientSession.createClientMessage(false);
+ ClientMessage message = clientSession.createMessage(false);
ManagementHelper.putOperationInvocation(message, resourceName, operationName, parameters);
ClientMessage reply;
try
Modified: trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -854,7 +854,7 @@
private ClientMessage createMessage(final ClientSession session, final int i)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putIntProperty(propKey, i);
Modified: trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -259,7 +259,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putStringProperty(InterceptorTest.key, "apple");
@@ -281,7 +281,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putStringProperty(InterceptorTest.key, "apple");
@@ -318,7 +318,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
producer.send(message);
}
@@ -352,7 +352,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putStringProperty(InterceptorTest.key, "apple");
@@ -374,7 +374,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putStringProperty(InterceptorTest.key, "apple");
@@ -409,7 +409,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
producer.send(message);
}
@@ -449,7 +449,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
producer.send(message);
}
@@ -472,7 +472,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
producer.send(message);
}
@@ -497,7 +497,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
producer.send(message);
}
@@ -538,7 +538,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
producer.send(message);
}
@@ -561,7 +561,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
producer.send(message);
}
@@ -586,7 +586,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
producer.send(message);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -90,16 +90,16 @@
String s4 = genString(10 * 64 * 1024);
- ClientMessage tm1 = session.createClientMessage(false);
+ ClientMessage tm1 = session.createMessage(false);
tm1.getBodyBuffer().writeString(s1);
- ClientMessage tm2 = session.createClientMessage(false);
+ ClientMessage tm2 = session.createMessage(false);
tm2.getBodyBuffer().writeString(s2);
- ClientMessage tm3 = session.createClientMessage(false);
+ ClientMessage tm3 = session.createMessage(false);
tm3.getBodyBuffer().writeString(s3);
- ClientMessage tm4 = session.createClientMessage(false);
+ ClientMessage tm4 = session.createMessage(false);
tm4.getBodyBuffer().writeString(s4);
producer.send(tm1);
@@ -155,15 +155,15 @@
String s4 = genString(10 * 64 * 1024);
- ClientMessage tm1 = session.createClientMessage(false);
+ ClientMessage tm1 = session.createMessage(false);
tm1.getBodyBuffer().writeUTF(s1);
- ClientMessage tm2 = session.createClientMessage(false);
+ ClientMessage tm2 = session.createMessage(false);
tm2.getBodyBuffer().writeUTF(s2);
try
{
- ClientMessage tm3 = session.createClientMessage(false);
+ ClientMessage tm3 = session.createMessage(false);
tm3.getBodyBuffer().writeUTF(s3);
Assert.fail("can not write UTF string bigger than 64K");
}
@@ -173,7 +173,7 @@
try
{
- ClientMessage tm4 = session.createClientMessage(false);
+ ClientMessage tm4 = session.createMessage(false);
tm4.getBodyBuffer().writeUTF(s4);
Assert.fail("can not write UTF string bigger than 64K");
}
Modified: trunk/tests/src/org/hornetq/tests/integration/client/AckBatchSizeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/AckBatchSizeTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/AckBatchSizeTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -50,7 +50,7 @@
{
ClientSessionFactory cf = createInVMFactory();
ClientSession session = cf.createSession(false, true, true);
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
// we need to set the destination so we can calculate the encodesize correctly
message.setDestination(address);
int encodeSize = message.getEncodeSize();
@@ -77,7 +77,7 @@
ClientProducer cp = sendSession.createProducer(addressA);
for (int i = 0; i < numMessages; i++)
{
- cp.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
}
ClientConsumer consumer = session.createConsumer(queueA);
@@ -127,7 +127,7 @@
ClientProducer cp = sendSession.createProducer(addressA);
for (int i = 0; i < numMessages; i++)
{
- cp.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
}
ClientConsumer consumer = session.createConsumer(queueA);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -59,7 +59,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- cp.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
}
session.start();
ClientMessage cm = null;
@@ -99,7 +99,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- cp.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
}
final CountDownLatch latch = new CountDownLatch(numMessages);
session.start();
@@ -142,7 +142,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- cp.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
}
final CountDownLatch latch = new CountDownLatch(numMessages);
session.start();
@@ -200,7 +200,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- cp.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
}
final CountDownLatch latch = new CountDownLatch(numMessages);
session.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/AddressSettingsTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/AddressSettingsTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/AddressSettingsTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -80,9 +80,9 @@
session.createQueue(dlaA, dlqA, false);
session.createQueue(dlaB, dlqB, false);
ClientSession sendSession = sf.createSession(false, true, true);
- ClientMessage cm = sendSession.createClientMessage(true);
+ ClientMessage cm = sendSession.createMessage(true);
cm.getBodyBuffer().writeString("A");
- ClientMessage cm2 = sendSession.createClientMessage(true);
+ ClientMessage cm2 = sendSession.createMessage(true);
cm2.getBodyBuffer().writeString("B");
ClientProducer cp1 = sendSession.createProducer(addressA);
ClientProducer cp2 = sendSession.createProducer(addressB);
@@ -143,9 +143,9 @@
session.createQueue(dlaA, dlqA, false);
session.createQueue(dlaB, dlqB, false);
ClientSession sendSession = sf.createSession(false, true, true);
- ClientMessage cm = sendSession.createClientMessage(true);
+ ClientMessage cm = sendSession.createMessage(true);
cm.getBodyBuffer().writeString("A");
- ClientMessage cm2 = sendSession.createClientMessage(true);
+ ClientMessage cm2 = sendSession.createMessage(true);
cm2.getBodyBuffer().writeString("B");
ClientProducer cp1 = sendSession.createProducer(addressA);
ClientProducer cp2 = sendSession.createProducer(addressB);
@@ -206,9 +206,9 @@
session.createQueue(dlaA, dlqA, false);
session.createQueue(dlaB, dlqB, false);
ClientSession sendSession = sf.createSession(false, true, true);
- ClientMessage cm = sendSession.createClientMessage(true);
+ ClientMessage cm = sendSession.createMessage(true);
cm.getBodyBuffer().writeString("A");
- ClientMessage cm2 = sendSession.createClientMessage(true);
+ ClientMessage cm2 = sendSession.createMessage(true);
cm2.getBodyBuffer().writeString("B");
ClientProducer cp1 = sendSession.createProducer(addressA);
ClientProducer cp2 = sendSession.createProducer(addressB);
@@ -275,11 +275,11 @@
session.createQueue(dlaB, dlqB, false);
session.createQueue(dlaC, dlqC, false);
ClientSession sendSession = sf.createSession(false, true, true);
- ClientMessage cm = sendSession.createClientMessage(true);
+ ClientMessage cm = sendSession.createMessage(true);
cm.getBodyBuffer().writeString("A");
- ClientMessage cm2 = sendSession.createClientMessage(true);
+ ClientMessage cm2 = sendSession.createMessage(true);
cm2.getBodyBuffer().writeString("B");
- ClientMessage cm3 = sendSession.createClientMessage(true);
+ ClientMessage cm3 = sendSession.createMessage(true);
cm3.getBodyBuffer().writeString("C");
ClientProducer cp1 = sendSession.createProducer(addressA2);
ClientProducer cp2 = sendSession.createProducer(addressB2);
@@ -355,9 +355,9 @@
session.createQueue(dlaB, dlqB, false);
session.createQueue(dlaC, dlqC, false);
ClientSession sendSession = sf.createSession(false, true, true);
- ClientMessage cm = sendSession.createClientMessage(true);
- ClientMessage cm2 = sendSession.createClientMessage(true);
- ClientMessage cm3 = sendSession.createClientMessage(true);
+ ClientMessage cm = sendSession.createMessage(true);
+ ClientMessage cm2 = sendSession.createMessage(true);
+ ClientMessage cm3 = sendSession.createMessage(true);
ClientProducer cp1 = sendSession.createProducer(addressA2);
ClientProducer cp2 = sendSession.createProducer(addressB2);
ClientProducer cp3 = sendSession.createProducer(addressC);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/AutogroupIdTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/AutogroupIdTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/AutogroupIdTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -79,7 +79,7 @@
for (int i = 0; i < numMessages; i++)
{
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
}
latch.await();
@@ -136,11 +136,11 @@
for (int i = 0; i < numMessages; i++)
{
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
}
for (int i = 0; i < numMessages; i++)
{
- producer2.send(session.createClientMessage(false));
+ producer2.send(session.createMessage(false));
}
latch.await();
@@ -194,7 +194,7 @@
for (int i = 0; i < numMessages; i++)
{
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
}
latch.await();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/BlockingSendTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/BlockingSendTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/BlockingSendTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -68,7 +68,7 @@
ClientProducer prod = session.createProducer("address");
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
prod.send(message);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -59,7 +59,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- cp.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
}
session.start();
for (int i = 0; i < numMessages; i++)
@@ -99,7 +99,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- cp.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
}
session.start();
for (int i = 0; i < numMessages; i++)
@@ -149,8 +149,8 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- cp.send(sendSession.createClientMessage(false));
- cp2.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
+ cp2.send(sendSession.createMessage(false));
}
session.start();
for (int i = 0; i < numMessages; i++)
@@ -201,7 +201,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- cp.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
}
final CountDownLatch latch = new CountDownLatch(numMessages);
session.start();
@@ -264,7 +264,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- cp.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
}
CountDownLatch latch = new CountDownLatch(numMessages);
session.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -110,7 +110,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
producer.send(message);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -58,7 +58,7 @@
int numMessage = 100;
for (int i = 0; i < numMessage; i++)
{
- ClientMessage cm = session.createClientMessage(false);
+ ClientMessage cm = session.createMessage(false);
cm.getBodyBuffer().writeInt(i);
cp.send(cm);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -347,7 +347,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.getBodyBuffer().writeBytes(bytes);
@@ -407,7 +407,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.getBodyBuffer().writeBytes(bytes);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -60,7 +60,7 @@
{
ClientSessionFactory cf = createFactory(isNetty());
ClientSession session = cf.createSession(false, true, true);
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
// we need to set the destination so we can calculate the encodesize correctly
message.setDestination(address);
int encodeSize = message.getEncodeSize();
@@ -96,7 +96,7 @@
receiveSession.start();
for (int i = 0; i < numMessage * 4; i++)
{
- cp.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
}
for (int i = 0; i < numMessage * 2; i++)
Modified: trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -85,7 +85,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -55,7 +55,7 @@
sendSession.createQueue(addressA, queueA, false);
for (int i = 0; i < numMessages; i++)
{
- ClientMessage cm = sendSession.createClientMessage(false);
+ ClientMessage cm = sendSession.createMessage(false);
cm.getBodyBuffer().writeInt(i);
cp.send(cm);
if (i % 10 == 0)
@@ -96,7 +96,7 @@
sendSession.createQueue(addressA, queueA, false);
for (int i = 0; i < numMessages; i++)
{
- ClientMessage cm = sendSession.createClientMessage(false);
+ ClientMessage cm = sendSession.createMessage(false);
cm.getBodyBuffer().writeInt(i);
cp.send(cm);
}
@@ -154,7 +154,7 @@
ClientProducer clientProducer = sendSession.createProducer(addressA);
for (int i = 0; i < numMessage; i++)
{
- ClientMessage cm = sendSession.createClientMessage(false);
+ ClientMessage cm = sendSession.createMessage(false);
cm.getBodyBuffer().writeInt(count.getAndIncrement());
clientProducer.send(cm);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -60,7 +60,7 @@
session.createQueue(address, queue, true);
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
session.start();
ClientConsumer consumer = session.createConsumer(queue);
@@ -82,7 +82,7 @@
session.createQueue(address, queue, true);
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(true));
+ producer.send(session.createMessage(true));
session.close();
@@ -120,7 +120,7 @@
session = sf.createSession(false, true, true);
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(true));
+ producer.send(session.createMessage(true));
session.start();
ClientConsumer consumer = session.createConsumer(queue);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -121,7 +121,7 @@
ClientProducer producer = session.createProducer(ADDRESS);
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.getBodyBuffer().writeString(body);
@@ -226,7 +226,7 @@
ClientProducer producer = session.createProducer(ADDRESS);
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.getBodyBuffer().writeString(body);
@@ -334,7 +334,7 @@
ClientProducer producer = session.createProducer(ADDRESS);
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.getBodyBuffer().writeString(body);
@@ -450,7 +450,7 @@
ClientProducer producer = session.createProducer(ADDRESS);
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(new byte[123]);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -67,7 +67,7 @@
ClientProducer producer = session.createProducer("fooQueue");
- ClientMessage msg = session.createClientMessage(false);
+ ClientMessage msg = session.createMessage(false);
msg.putStringProperty("someKey", "someValue");
Modified: trunk/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -53,7 +53,7 @@
public void testSimpleSendReceive() throws Exception
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
final String body = RandomUtil.randomString();
@@ -68,7 +68,7 @@
public void testSimpleSendReceiveWithEmptyBody() throws Exception
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
ClientMessage received = sendAndReceive(message);
@@ -79,7 +79,7 @@
public void testSendSameMessageMultipleTimes() throws Exception
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
final String body = RandomUtil.randomString();
@@ -103,7 +103,7 @@
public void testSendMessageResetSendAgainDifferentBody() throws Exception
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
String body = RandomUtil.randomString();
@@ -138,7 +138,7 @@
public void testCannotReadPastEndOfMessageBody() throws Exception
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
final String body = RandomUtil.randomString();
@@ -164,7 +164,7 @@
public void testCanReReadBodyAfterReaderReset() throws Exception
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
final String body = RandomUtil.randomString();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -180,7 +180,7 @@
for (int i = start; i < end; i++)
{
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.getProperties().putIntProperty(new SimpleString("key"), i);
msg.getBodyBuffer().writeUTF("message " + i);
prod.send(msg);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -2088,7 +2088,7 @@
for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
{
- ClientMessage clientFile = session.createClientMessage(true);
+ ClientMessage clientFile = session.createMessage(true);
clientFile.setBodyInputStream(UnitTestCase.createFakeLargeStream(SIZE));
producer.send(clientFile);
@@ -2192,7 +2192,7 @@
for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
{
- ClientMessage clientFile = session.createClientMessage(true);
+ ClientMessage clientFile = session.createMessage(true);
clientFile.setBodyInputStream(UnitTestCase.createFakeLargeStream(SIZE));
producer.send(clientFile);
@@ -2291,7 +2291,7 @@
session.createQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS, null, true);
- ClientMessage clientFile = session.createClientMessage(true);
+ ClientMessage clientFile = session.createMessage(true);
clientFile.setBodyInputStream(UnitTestCase.createFakeLargeStream(SIZE));
ClientProducer producer = session.createProducer(LargeMessageTest.ADDRESS);
@@ -2370,7 +2370,7 @@
for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
{
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.setBodyInputStream(UnitTestCase.createFakeLargeStream(SIZE));
msg.putIntProperty(new SimpleString("key"), i);
producer.send(msg);
@@ -2552,7 +2552,7 @@
for (int i = 0; i < 100; i++)
{
- message = session.createClientMessage(true);
+ message = session.createMessage(true);
// TODO: Why do I need to reset the writerIndex?
message.getBodyBuffer().writerIndex(0);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -62,7 +62,7 @@
session.createQueue(address, queue, !durable);
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(!durable));
+ producer.send(session.createMessage(!durable));
restart();
@@ -87,7 +87,7 @@
session.createQueue(address, queue, durable);
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(!durable));
+ producer.send(session.createMessage(!durable));
restart();
@@ -109,7 +109,7 @@
session.createQueue(address, queue, durable);
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(durable));
+ producer.send(session.createMessage(durable));
restart();
@@ -134,7 +134,7 @@
session.createQueue(address, queue, !durable);
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(durable));
+ producer.send(session.createMessage(durable));
restart();
@@ -162,7 +162,7 @@
session.createTemporaryQueue(address, queue);
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(durable));
+ producer.send(session.createMessage(durable));
restart();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -64,7 +64,7 @@
session.createQueue(address, queue, false);
ClientProducer producer = session.createProducer(address);
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.setExpiration(System.currentTimeMillis() + MessageExpirationTest.EXPIRATION);
producer.send(message);
@@ -89,7 +89,7 @@
ClientProducer producer = session.createProducer(address);
ClientConsumer consumer = session.createConsumer(queue);
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.setExpiration(System.currentTimeMillis() + MessageExpirationTest.EXPIRATION);
producer.send(message);
@@ -117,7 +117,7 @@
session.createQueue(address, queue, false);
ClientProducer producer = session.createProducer(address);
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.setExpiration(System.currentTimeMillis() + MessageExpirationTest.EXPIRATION);
producer.send(message);
@@ -156,7 +156,7 @@
session.createQueue(expiryAddress, expiryQueue, false);
ClientProducer producer = session.createProducer(address);
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.setExpiration(System.currentTimeMillis() + MessageExpirationTest.EXPIRATION);
producer.send(message);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageRateTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageRateTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageRateTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -69,7 +69,7 @@
long start = System.currentTimeMillis();
for (int i = 0; i < 10; i++)
{
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
}
long end = System.currentTimeMillis();
@@ -106,7 +106,7 @@
for (int i = 0; i < 12; i++)
{
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
}
session.start();
@@ -155,7 +155,7 @@
for (int i = 0; i < 12; i++)
{
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
}
ClientConsumer consumer = session.createConsumer(ADDRESS);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/OrderTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/OrderTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/OrderTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -89,7 +89,7 @@
for (int i = 0; i < 100; i++)
{
- ClientMessage msg = session.createClientMessage(i % 2 == 0);
+ ClientMessage msg = session.createMessage(i % 2 == 0);
msg.putIntProperty("id", i);
prod.send(msg);
}
@@ -181,7 +181,7 @@
for (int i = 0; i < numberOfMessages; i++)
{
- ClientMessage msg = session.createClientMessage(i % 2 == 0);
+ ClientMessage msg = session.createMessage(i % 2 == 0);
msg.putIntProperty("id", i);
prod.send(msg);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -125,7 +125,7 @@
for (int i = 0; i < numberOfMessages; i++)
{
- message = session.createClientMessage(true);
+ message = session.createMessage(true);
HornetQBuffer bodyLocal = message.getBodyBuffer();
@@ -269,7 +269,7 @@
int numberOfMessages = 0;
while (true)
{
- message = session.createClientMessage(true);
+ message = session.createMessage(true);
message.getBodyBuffer().writeBytes(body);
// Stop sending message as soon as we start paging
@@ -292,7 +292,7 @@
for (int i = 0; i < 10; i++)
{
- message = session.createClientMessage(true);
+ message = session.createMessage(true);
message.getBodyBuffer().writeBytes(body);
message.putIntProperty(new SimpleString("id"), i);
@@ -417,7 +417,7 @@
for (int i = 0; i < numberOfMessages; i++)
{
- message = session.createClientMessage(true);
+ message = session.createMessage(true);
message.getBodyBuffer().writeBytes(body);
message.putIntProperty(new SimpleString("id"), i);
@@ -546,7 +546,7 @@
for (int i = 0; i < numberOfMessages; i++)
{
- message = session.createClientMessage(true);
+ message = session.createMessage(true);
HornetQBuffer bodyLocal = message.getBodyBuffer();
@@ -623,7 +623,7 @@
for (int i = 0; i < numberOfMessages; i++)
{
- message = session.createClientMessage(true);
+ message = session.createMessage(true);
HornetQBuffer bodyLocal = message.getBodyBuffer();
@@ -717,7 +717,7 @@
{
byte[] body = new byte[1024];
- message = session.createClientMessage(true);
+ message = session.createMessage(true);
message.getBodyBuffer().writeBytes(body);
producer.send(message);
@@ -748,7 +748,7 @@
{
byte[] body = new byte[1024];
- message = session.createClientMessage(true);
+ message = session.createMessage(true);
message.getBodyBuffer().writeBytes(body);
producer.send(message);
@@ -775,7 +775,7 @@
{
byte[] body = new byte[1024];
- message = session.createClientMessage(true);
+ message = session.createMessage(true);
message.getBodyBuffer().writeBytes(body);
producer.send(message);
@@ -859,7 +859,7 @@
byte[] body = new byte[1024];
- message = session.createClientMessage(true);
+ message = session.createMessage(true);
message.getBodyBuffer().writeBytes(body);
for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
@@ -977,7 +977,7 @@
for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
{
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(new byte[512]);
producerPaged.send(msg);
@@ -1086,7 +1086,7 @@
for (int i = 0; i < NUMBER_MESSAGES_BEFORE_PAGING; i++)
{
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(new byte[512]);
producerA.send(msg);
@@ -1100,7 +1100,7 @@
for (int i = 0; i < NUMBER_MESSAGES_BEFORE_PAGING; i++)
{
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(new byte[512]);
producerA.send(msg);
@@ -1114,7 +1114,7 @@
for (int i = NUMBER_MESSAGES_BEFORE_PAGING * 2; i < NUMBER_OF_MESSAGES; i++)
{
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(new byte[512]);
producerA.send(msg);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -65,7 +65,7 @@
{
public void run() throws HornetQException
{
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
}
});
}
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -289,7 +289,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.getBodyBuffer().writeBytes(bytes);
@@ -389,7 +389,7 @@
byte[] bytes = new byte[0];
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.getBodyBuffer().writeBytes(bytes);
@@ -421,7 +421,7 @@
t.start();
- ClientMessage message2 = session.createClientMessage(false);
+ ClientMessage message2 = session.createMessage(false);
message2.getBodyBuffer().writeBytes(bytes);
@@ -475,7 +475,7 @@
byte[] bytes = new byte[0];
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.getBodyBuffer().writeBytes(bytes);
@@ -505,7 +505,7 @@
Assert.assertEquals(1, waiting);
- message = session.createClientMessage(false);
+ message = session.createMessage(false);
message.getBodyBuffer().writeBytes(bytes);
@@ -554,7 +554,7 @@
byte[] bytes = new byte[0];
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.getBodyBuffer().writeBytes(bytes);
@@ -602,7 +602,7 @@
session.close();
- message = session.createClientMessage(false);
+ message = session.createMessage(false);
message.getBodyBuffer().writeBytes(bytes);
@@ -650,7 +650,7 @@
byte[] bytes = new byte[2000];
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.getBodyBuffer().writeBytes(bytes);
@@ -723,7 +723,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.getBodyBuffer().writeBytes(bytes);
@@ -768,7 +768,7 @@
byte[] bytes = new byte[2000];
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.getBodyBuffer().writeBytes(bytes);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -80,7 +80,7 @@
cf.setConfirmationWindowSize(100);
ClientSession session = cf.createSession(false, true, true);
ClientProducer producer = session.createProducer(QUEUE);
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
byte[] body = new byte[1000];
message.getBodyBuffer().writeBytes(body);
producer.send(message);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ReceiveTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ReceiveTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ReceiveTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -47,7 +47,7 @@
session.createQueue(addressA, queueA, false);
ClientConsumer cc = session.createConsumer(queueA);
session.start();
- cp.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
Assert.assertNotNull(cc.receive());
session.close();
sendSession.close();
@@ -174,9 +174,9 @@
ClientConsumer cc = session.createConsumer(queueA);
ClientConsumer cc2 = session.createConsumer(queueA);
session.start();
- cp.send(sendSession.createClientMessage(false));
- cp.send(sendSession.createClientMessage(false));
- cp.send(sendSession.createClientMessage(false));
+ cp.send(sendSession.createMessage(false));
+ cp.send(sendSession.createMessage(false));
+ cp.send(sendSession.createMessage(false));
// at this point we know that the first consumer has a messge in ites buffer
Assert.assertNotNull(cc2.receive(5000));
Assert.assertNotNull(cc2.receive(5000));
Modified: trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -75,7 +75,7 @@
requestConsumer.setMessageHandler(new SimpleMessageHandler(key, session));
ClientRequestor requestor = new ClientRequestor(session, requestAddress);
- ClientMessage request = session.createClientMessage(false);
+ ClientMessage request = session.createMessage(false);
request.putLongProperty(key, value);
ClientMessage reply = requestor.request(request, 500);
@@ -103,14 +103,14 @@
requestConsumer.setMessageHandler(new SimpleMessageHandler(key, session));
ClientRequestor requestor = new ClientRequestor(session, requestAddress);
- ClientMessage request = session.createClientMessage(false);
+ ClientMessage request = session.createMessage(false);
request.putLongProperty(key, value);
ClientMessage reply = requestor.request(request, 500);
Assert.assertNotNull("reply was not received", reply);
Assert.assertEquals(value, reply.getObjectProperty(key));
- request = session.createClientMessage(false);
+ request = session.createMessage(false);
request.putLongProperty(key, value + 1);
reply = requestor.request(request, 500);
@@ -143,7 +143,7 @@
});
ClientRequestor requestor = new ClientRequestor(session, requestAddress);
- ClientMessage request = session.createClientMessage(false);
+ ClientMessage request = session.createMessage(false);
ClientMessage reply = requestor.request(request, 500);
Assert.assertNull(reply);
@@ -189,14 +189,14 @@
requestConsumer.setMessageHandler(new SimpleMessageHandler(key, session));
final ClientRequestor requestor = new ClientRequestor(session, requestAddress);
- ClientMessage request = session.createClientMessage(false);
+ ClientMessage request = session.createMessage(false);
request.putLongProperty(key, value);
ClientMessage reply = requestor.request(request, 500);
Assert.assertNotNull("reply was not received", reply);
Assert.assertEquals(value, reply.getObjectProperty(key));
- request = session.createClientMessage(false);
+ request = session.createMessage(false);
request.putLongProperty(key, value + 1);
requestor.close();
@@ -208,7 +208,7 @@
public void run() throws Exception
{
- requestor.request(session.createClientMessage(false), 500);
+ requestor.request(session.createMessage(false), 500);
}
});
}
@@ -265,7 +265,7 @@
{
try
{
- ClientMessage reply = session.createClientMessage(false);
+ ClientMessage reply = session.createMessage(false);
SimpleString replyTo = (SimpleString)request.getObjectProperty(ClientMessageImpl.REPLYTO_HEADER_NAME);
long value = (Long)request.getObjectProperty(key);
reply.putLongProperty(key, value);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/RoutingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/RoutingTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/RoutingTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -52,7 +52,7 @@
ClientProducer p = sendSession.createProducer(addressA);
for (int i = 0; i < numMessages; i++)
{
- p.send(sendSession.createClientMessage(false));
+ p.send(sendSession.createMessage(false));
}
ClientSession session = cf.createSession(false, true, true);
ClientConsumer c1 = session.createConsumer(queueA);
@@ -100,7 +100,7 @@
ClientProducer p = sendSession.createProducer(addressA);
for (int i = 0; i < numMessages; i++)
{
- p.send(sendSession.createClientMessage(false));
+ p.send(sendSession.createMessage(false));
}
ClientSession session = cf.createSession(false, true, true);
ClientConsumer c1 = session.createConsumer(queueA);
@@ -138,7 +138,7 @@
ClientProducer p = sendSession.createProducer(addressA);
for (int i = 0; i < numMessages; i++)
{
- p.send(sendSession.createClientMessage(false));
+ p.send(sendSession.createMessage(false));
}
ClientSession session = cf.createSession(false, true, true);
ClientConsumer c1 = session.createConsumer(queueA);
@@ -176,7 +176,7 @@
ClientProducer p = sendSession.createProducer(addressA);
for (int i = 0; i < numMessages; i++)
{
- ClientMessage clientMessage = sendSession.createClientMessage(false);
+ ClientMessage clientMessage = sendSession.createMessage(false);
clientMessage.putStringProperty(new SimpleString("foo"), new SimpleString("bar"));
p.send(clientMessage);
}
@@ -218,7 +218,7 @@
ClientProducer p = sendSession.createProducer(addressA);
for (int i = 0; i < numMessages; i++)
{
- ClientMessage clientMessage = sendSession.createClientMessage(false);
+ ClientMessage clientMessage = sendSession.createMessage(false);
if (i % 3 == 0)
{
clientMessage.putStringProperty(new SimpleString("foo"), new SimpleString("bar"));
@@ -279,7 +279,7 @@
ClientProducer p = sendSession.createProducer(addressA);
for (int i = 0; i < numMessages; i++)
{
- p.send(sendSession.createClientMessage(false));
+ p.send(sendSession.createMessage(false));
}
ClientSession session = cf.createSession(false, true, true);
ClientConsumer c1 = session.createConsumer(queueA);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -98,7 +98,7 @@
session.createQueue(ADDRESS, ADDRESS, true);
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
HornetQBuffer buffer = msg.getBodyBuffer();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -60,7 +60,7 @@
session.start();
- prod.send(session.createClientMessage(false));
+ prod.send(session.createMessage(false));
Assert.assertNotNull(cons.receive());
@@ -80,7 +80,7 @@
try
{
- prod.send(session.createClientMessage(false));
+ prod.send(session.createMessage(false));
Assert.fail("Should throw exception");
}
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -96,7 +96,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage msg = session.createClientMessage(false);
+ ClientMessage msg = session.createMessage(false);
prod.send(msg);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -546,7 +546,7 @@
{
ClientSessionFactory cf = createInVMFactory();
ClientSession session = cf.createSession(false, true, true);
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
// we need to set the destination so we can calculate the encodesize correctly
message.setDestination(address);
int encodeSize = message.getEncodeSize();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -225,8 +225,8 @@
clientSession.createConsumer(queueName);
clientSession.createConsumer(queueName);
ClientProducer cp = clientSession.createProducer("a1");
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
QueueQuery resp = clientSession.queueQuery(new SimpleString(queueName));
Assert.assertEquals(new SimpleString("a1"), resp.getAddress());
Assert.assertEquals(2, resp.getConsumerCount());
@@ -321,7 +321,7 @@
}
}
- public void testCreateClientMessageNonDurable() throws Exception
+ public void testCreateMessageNonDurable() throws Exception
{
HornetQServer server = createServer(false);
try
@@ -329,7 +329,7 @@
server.start();
ClientSessionFactory cf = createInVMFactory();
ClientSession clientSession = cf.createSession(false, true, true);
- ClientMessage clientMessage = clientSession.createClientMessage(false);
+ ClientMessage clientMessage = clientSession.createMessage(false);
Assert.assertFalse(clientMessage.isDurable());
clientSession.close();
}
@@ -342,7 +342,7 @@
}
}
- public void testCreateClientMessageDurable() throws Exception
+ public void testCreateMessageDurable() throws Exception
{
HornetQServer server = createServer(false);
try
@@ -350,7 +350,7 @@
server.start();
ClientSessionFactory cf = createInVMFactory();
ClientSession clientSession = cf.createSession(false, true, true);
- ClientMessage clientMessage = clientSession.createClientMessage(true);
+ ClientMessage clientMessage = clientSession.createMessage(true);
Assert.assertTrue(clientMessage.isDurable());
clientSession.close();
}
@@ -363,7 +363,7 @@
}
}
- public void testCreateClientMessageType() throws Exception
+ public void testCreateMessageType() throws Exception
{
HornetQServer server = createServer(false);
try
@@ -371,7 +371,7 @@
server.start();
ClientSessionFactory cf = createInVMFactory();
ClientSession clientSession = cf.createSession(false, true, true);
- ClientMessage clientMessage = clientSession.createClientMessage((byte)99, false);
+ ClientMessage clientMessage = clientSession.createMessage((byte)99, false);
Assert.assertEquals((byte)99, clientMessage.getType());
clientSession.close();
}
@@ -384,7 +384,7 @@
}
}
- public void testCreateClientMessageOverrides() throws Exception
+ public void testCreateMessageOverrides() throws Exception
{
HornetQServer server = createServer(false);
try
@@ -392,7 +392,7 @@
server.start();
ClientSessionFactory cf = createInVMFactory();
ClientSession clientSession = cf.createSession(false, true, true);
- ClientMessage clientMessage = clientSession.createClientMessage((byte)88, false, 100l, 300l, (byte)33);
+ ClientMessage clientMessage = clientSession.createMessage((byte)88, false, 100l, 300l, (byte)33);
Assert.assertEquals((byte)88, clientMessage.getType());
Assert.assertEquals(100l, clientMessage.getExpiration());
Assert.assertEquals(300l, clientMessage.getTimestamp());
@@ -481,16 +481,16 @@
ClientSession clientSession = cf.createSession(false, false, true);
clientSession.createQueue(queueName, queueName, false);
ClientProducer cp = clientSession.createProducer(queueName);
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
Queue q = (Queue)server.getPostOffice().getBinding(new SimpleString(queueName)).getBindable();
Assert.assertEquals(0, q.getMessageCount());
clientSession.commit();
@@ -516,21 +516,21 @@
ClientSession clientSession = cf.createSession(false, false, true);
clientSession.createQueue(queueName, queueName, false);
ClientProducer cp = clientSession.createProducer(queueName);
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
Queue q = (Queue)server.getPostOffice().getBinding(new SimpleString(queueName)).getBindable();
Assert.assertEquals(0, q.getMessageCount());
clientSession.rollback();
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
clientSession.commit();
Assert.assertEquals(2, q.getMessageCount());
clientSession.close();
@@ -557,16 +557,16 @@
ClientProducer cp = sendSession.createProducer(queueName);
ClientSession clientSession = cf.createSession(false, true, false);
clientSession.createQueue(queueName, queueName, false);
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
Queue q = (Queue)server.getPostOffice().getBinding(new SimpleString(queueName)).getBindable();
Assert.assertEquals(10, q.getMessageCount());
ClientConsumer cc = clientSession.createConsumer(queueName);
@@ -628,16 +628,16 @@
ClientProducer cp = sendSession.createProducer(queueName);
ClientSession clientSession = cf.createSession(false, true, false);
clientSession.createQueue(queueName, queueName, false);
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
- cp.send(clientSession.createClientMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
+ cp.send(clientSession.createMessage(false));
Queue q = (Queue)server.getPostOffice().getBinding(new SimpleString(queueName)).getBindable();
Assert.assertEquals(10, q.getMessageCount());
ClientConsumer cc = clientSession.createConsumer(queueName);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SimpleSendMultipleQueues.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SimpleSendMultipleQueues.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SimpleSendMultipleQueues.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -56,7 +56,7 @@
{
for (int i = 0; i < 1000; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
final String body = RandomUtil.randomString();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -78,7 +78,7 @@
session.createTemporaryQueue(address, queue);
ClientProducer producer = session.createProducer(address);
- ClientMessage msg = session.createClientMessage(false);
+ ClientMessage msg = session.createMessage(false);
producer.send(msg);
@@ -102,7 +102,7 @@
session.createTemporaryQueue(address, queue);
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
ClientSession session2 = sf.createSession(false, true, true);
session2.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -82,7 +82,7 @@
ClientProducer producer = session1.createProducer(testAddress);
- ClientMessage message = session1.createClientMessage(true);
+ ClientMessage message = session1.createMessage(true);
producer.send(message);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/TransactionalSendTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/TransactionalSendTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/client/TransactionalSendTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -48,7 +48,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
}
Queue q = (Queue)server.getPostOffice().getBinding(queueA).getBindable();
Assert.assertEquals(q.getMessageCount(), 0);
@@ -57,7 +57,7 @@
// now send some more
for (int i = 0; i < numMessages; i++)
{
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
}
Assert.assertEquals(q.getMessageCount(), numMessages);
session.commit();
@@ -86,7 +86,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
}
Queue q = (Queue)server.getPostOffice().getBinding(queueA).getBindable();
Assert.assertEquals(q.getMessageCount(), 0);
@@ -95,7 +95,7 @@
// now send some more
for (int i = 0; i < numMessages; i++)
{
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
}
Assert.assertEquals(q.getMessageCount(), 0);
session.commit();
Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -85,7 +85,7 @@
assertActiveConnections(1 + 1); // One local and one from the other vm
assertActiveSession(1 + 1);
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -56,7 +56,7 @@
ClientSession session = sf.createSession(false, true, true);
ClientProducer producer = session.createProducer(ClientCrashTest.QUEUE);
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -58,7 +58,7 @@
ClientProducer producer = session.createProducer(queueName);
ClientConsumer consumer = session.createConsumer(queueName);
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -172,7 +172,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(true);
+ ClientMessage message = session0.createMessage(true);
message.putIntProperty(propKey, i);
prod0.send(message);
@@ -299,7 +299,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
prod0.send(message);
@@ -415,7 +415,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
prod0.send(message);
@@ -543,7 +543,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
prod0.send(message);
@@ -656,7 +656,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
prod0.send(message);
@@ -677,7 +677,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
prod0.send(message);
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -151,7 +151,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
@@ -177,7 +177,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
@@ -296,7 +296,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
@@ -331,7 +331,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
@@ -363,7 +363,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
@@ -491,7 +491,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
@@ -626,7 +626,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
@@ -664,7 +664,7 @@
for (int i = numMessages; i < numMessages * 2; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
@@ -697,7 +697,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -174,7 +174,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
if (largeMessage)
{
@@ -368,7 +368,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
@@ -386,7 +386,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
@@ -533,7 +533,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putStringProperty(propKey, new SimpleString("bing"));
@@ -660,7 +660,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -157,7 +157,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
@@ -183,7 +183,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session0.createClientMessage(false);
+ ClientMessage message = session0.createMessage(false);
message.putIntProperty(propKey, i);
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -458,7 +458,7 @@
for (int i = msgStart; i < msgEnd; i++)
{
- ClientMessage message = session.createClientMessage(durable);
+ ClientMessage message = session.createMessage(durable);
if (filterVal != null)
{
@@ -509,7 +509,7 @@
for (int i = msgStart; i < msgEnd; i++)
{
- ClientMessage message = session.createClientMessage(durable);
+ ClientMessage message = session.createMessage(durable);
message.putStringProperty(key, val);
message.putIntProperty(ClusterTestBase.COUNT_PROP, i);
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -218,7 +218,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
message.getBodyBuffer().writeString("message" + i);
@@ -332,7 +332,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
message.getBodyBuffer().writeString("message" + i);
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -129,7 +129,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -191,7 +191,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
setBody(i, message);
@@ -292,7 +292,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -365,7 +365,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -389,7 +389,7 @@
Assert.assertEquals(HornetQException.TRANSACTION_ROLLED_BACK, e.getCode());
}
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
int counter = RandomUtil.randomInt();
message.putIntProperty("counter", counter);
@@ -445,7 +445,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -531,7 +531,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -615,7 +615,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session1.createClientMessage(i % 2 == 0);
+ ClientMessage message = session1.createMessage(i % 2 == 0);
setBody(i, message);
@@ -698,7 +698,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session1.createClientMessage(true);
+ ClientMessage message = session1.createMessage(true);
setBody(i, message);
@@ -797,7 +797,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -867,7 +867,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -940,7 +940,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -1014,7 +1014,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -1099,7 +1099,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session1.createClientMessage(i % 2 == 0);
+ ClientMessage message = session1.createMessage(i % 2 == 0);
setBody(i, message);
@@ -1185,7 +1185,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session1.createClientMessage(i % 2 == 0);
+ ClientMessage message = session1.createMessage(i % 2 == 0);
setBody(i, message);
@@ -1286,7 +1286,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session1.createClientMessage(i % 2 == 0);
+ ClientMessage message = session1.createMessage(i % 2 == 0);
setBody(i, message);
@@ -1441,7 +1441,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sendSession.createClientMessage(true);
+ ClientMessage message = sendSession.createMessage(true);
setBody(i, message);
@@ -1531,7 +1531,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -1611,7 +1611,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -1694,7 +1694,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -1726,7 +1726,7 @@
for (int i = numMessages; i < numMessages * 2; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -1793,7 +1793,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(i % 2 == 0);
+ ClientMessage message = session.createMessage(i % 2 == 0);
setBody(i, message);
@@ -1859,7 +1859,7 @@
@Override
public void run()
{
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
message.getBodyBuffer().writeString("message");
@@ -1929,7 +1929,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
if (i == 0)
{
@@ -2013,7 +2013,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session2.createClientMessage(true);
+ ClientMessage message = session2.createMessage(true);
if (i == 0)
{
@@ -2088,7 +2088,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
setBody(i, message);
@@ -2156,7 +2156,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session2.createClientMessage(true);
+ ClientMessage message = session2.createMessage(true);
setBody(i, message);
@@ -2266,7 +2266,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -116,7 +116,7 @@
{
session.commit();
}
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.putIntProperty(new SimpleString("key"), i);
prod.send(msg);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -76,7 +76,7 @@
for (int i = 0; i < 100; i++)
{
- ClientMessage msg = sessionOne.createClientMessage(true);
+ ClientMessage msg = sessionOne.createMessage(true);
msg.putIntProperty(new SimpleString("key"), i);
@@ -179,7 +179,7 @@
for (int i = 0; i < 100; i++)
{
- ClientMessage msg = sessionOne.createClientMessage(true);
+ ClientMessage msg = sessionOne.createMessage(true);
msg.putIntProperty(new SimpleString("key"), i);
producer.send(msg);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -1024,7 +1024,7 @@
ClientProducer producer = sess.createProducer(MultiThreadRandomReattachTestBase.ADDRESS);
- ClientMessage message = sess.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sess.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -1061,7 +1061,7 @@
ClientProducer producer = sess.createProducer(MultiThreadRandomReattachTestBase.ADDRESS);
- ClientMessage message = sess.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sess.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -1140,7 +1140,7 @@
ClientProducer producer = sess.createProducer(MultiThreadRandomReattachTestBase.ADDRESS);
- ClientMessage message = sess.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sess.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -1245,7 +1245,7 @@
{
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sessSend.createClientMessage(HornetQBytesMessage.TYPE,
+ ClientMessage message = sessSend.createMessage(HornetQBytesMessage.TYPE,
false,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -299,7 +299,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sessSend.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sessSend.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -413,7 +413,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sessSend.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sessSend.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -527,7 +527,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sessSend.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sessSend.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -540,7 +540,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sessSend.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sessSend.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -676,7 +676,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sessSend.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sessSend.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -689,7 +689,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sessSend.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sessSend.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -834,7 +834,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sessSend.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sessSend.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -921,7 +921,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sessSend.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sessSend.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -1022,7 +1022,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sessSend.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sessSend.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -1035,7 +1035,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sessSend.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sessSend.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -1155,7 +1155,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sessSend.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sessSend.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -1168,7 +1168,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = sessSend.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sessSend.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -1276,7 +1276,7 @@
ClientProducer producer = sess.createProducer(RandomReattachTest.ADDRESS);
- ClientMessage message = sess.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sess.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -1310,7 +1310,7 @@
ClientProducer producer = sess.createProducer(RandomReattachTest.ADDRESS);
- ClientMessage message = sess.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sess.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -1383,7 +1383,7 @@
ClientProducer producer = sess.createProducer(RandomReattachTest.ADDRESS);
- ClientMessage message = sess.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = sess.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -96,7 +96,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -170,7 +170,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -281,7 +281,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -376,7 +376,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -750,7 +750,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -818,7 +818,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -911,7 +911,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -990,7 +990,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -102,7 +102,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putIntProperty(propKey, i);
@@ -208,7 +208,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putIntProperty(propKey, i);
@@ -322,7 +322,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putIntProperty(propKey, i);
@@ -413,7 +413,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putIntProperty(propKey, i);
@@ -532,7 +532,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putIntProperty(propKey, i);
@@ -684,7 +684,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putIntProperty(propKey, i);
@@ -825,7 +825,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putIntProperty(propKey, i);
@@ -958,7 +958,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putStringProperty(new SimpleString("animal"), new SimpleString("giraffe"));
@@ -1021,7 +1021,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putStringProperty(new SimpleString("animal"), new SimpleString("antelope"));
@@ -1142,7 +1142,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putIntProperty(propKey, i);
@@ -1304,7 +1304,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putIntProperty(propKey, i);
Modified: trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -151,7 +151,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
if (largeMessage)
{
@@ -344,7 +344,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
message.putIntProperty(propKey, i);
Modified: trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -66,7 +66,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -565,7 +565,7 @@
LargeMessageTestBase.log.debug("NumberOfBytes = " + numberOfBytes);
for (int i = 0; i < numberOfMessages; i++)
{
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
// If the test is using more than 1M, we will only use the Streaming, as it require too much memory from the
// test
@@ -623,7 +623,7 @@
final boolean persistent) throws Exception
{
- ClientMessage clientMessage = session.createClientMessage(persistent);
+ ClientMessage clientMessage = session.createMessage(persistent);
clientMessage.setBodyInputStream(UnitTestCase.createFakeLargeStream(numberOfBytes));
Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -357,7 +357,7 @@
for (int i = 0; i < NUMBER_MESSAGES_BEFORE_PAGING; i++)
{
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(new byte[512]);
producer.send(msg);
}
@@ -366,21 +366,21 @@
AddressControl addressControl = createManagementControl(address);
Assert.assertEquals(0, addressControl.getNumberOfPages());
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(new byte[512]);
producer.send(msg);
session.commit();
Assert.assertEquals(1, addressControl.getNumberOfPages());
- msg = session.createClientMessage(true);
+ msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(new byte[512]);
producer.send(msg);
session.commit();
Assert.assertEquals(1, addressControl.getNumberOfPages());
- msg = session.createClientMessage(true);
+ msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(new byte[512]);
producer.send(msg);
Modified: trunk/tests/src/org/hornetq/tests/integration/management/CoreMessagingProxy.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/CoreMessagingProxy.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/management/CoreMessagingProxy.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -66,7 +66,7 @@
public Object retrieveAttributeValue(final String attributeName, final Class desiredType)
{
- ClientMessage m = session.createClientMessage(false);
+ ClientMessage m = session.createMessage(false);
ManagementHelper.putAttribute(m, resourceName, attributeName);
ClientMessage reply;
try
@@ -95,7 +95,7 @@
public Object invokeOperation(final String operationName, final Object... args) throws Exception
{
- ClientMessage m = session.createClientMessage(false);
+ ClientMessage m = session.createMessage(false);
ManagementHelper.putOperationInvocation(m, resourceName, operationName, args);
ClientMessage reply = requestor.request(m);
if (ManagementHelper.hasOperationSucceeded(reply))
Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -210,7 +210,7 @@
Assert.assertEquals(0, queueControl.getMessageCount());
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
Assert.assertEquals(1, queueControl.getMessageCount());
ManagementTestBase.consumeMessages(1, session, queue);
@@ -231,9 +231,9 @@
Assert.assertEquals(0, queueControl.getMessagesAdded());
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
Assert.assertEquals(1, queueControl.getMessagesAdded());
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
Assert.assertEquals(2, queueControl.getMessagesAdded());
ManagementTestBase.consumeMessages(2, session, queue);
@@ -255,7 +255,7 @@
Assert.assertEquals(0, queueControl.getScheduledCount());
ClientProducer producer = session.createProducer(address);
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, System.currentTimeMillis() + delay);
producer.send(message);
@@ -281,12 +281,12 @@
QueueControl queueControl = createManagementControl(address, queue);
ClientProducer producer = session.createProducer(address);
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, System.currentTimeMillis() + delay);
message.putIntProperty(new SimpleString("key"), intValue);
producer.send(message);
// unscheduled message
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
Map<String, Object>[] messages = queueControl.listScheduledMessages();
Assert.assertEquals(1, messages.length);
@@ -313,12 +313,12 @@
QueueControl queueControl = createManagementControl(address, queue);
ClientProducer producer = session.createProducer(address);
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, System.currentTimeMillis() + delay);
message.putIntProperty(new SimpleString("key"), intValue);
producer.send(message);
// unscheduled message
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
String jsonString = queueControl.listScheduledMessagesAsJSON();
Assert.assertNotNull(jsonString);
@@ -346,7 +346,7 @@
session.createQueue(address, queue, null, false);
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
QueueControl queueControl = createManagementControl(address, queue);
Assert.assertEquals(0, queueControl.getDeliveringCount());
@@ -374,7 +374,7 @@
QueueControl queueControl = createManagementControl(address, queue);
ClientProducer producer = session.createProducer(address);
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putIntProperty(new SimpleString("key"), intValue);
producer.send(message);
@@ -408,10 +408,10 @@
QueueControl queueControl = createManagementControl(address, queue);
ClientProducer producer = session.createProducer(address);
- ClientMessage matchingMessage = session.createClientMessage(false);
+ ClientMessage matchingMessage = session.createMessage(false);
matchingMessage.putLongProperty(key, matchingValue);
producer.send(matchingMessage);
- ClientMessage unmatchingMessage = session.createClientMessage(false);
+ ClientMessage unmatchingMessage = session.createMessage(false);
unmatchingMessage.putLongProperty(key, unmatchingValue);
producer.send(unmatchingMessage);
@@ -436,8 +436,8 @@
QueueControl queueControl = createManagementControl(address, queue);
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(false));
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
+ producer.send(session.createMessage(false));
Map<String, Object>[] messages = queueControl.listMessages(null);
Assert.assertEquals(2, messages.length);
@@ -459,8 +459,8 @@
QueueControl queueControl = createManagementControl(address, queue);
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(false));
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
+ producer.send(session.createMessage(false));
Map<String, Object>[] messages = queueControl.listMessages("");
Assert.assertEquals(2, messages.length);
@@ -487,10 +487,10 @@
QueueControl queueControl = createManagementControl(address, queue);
ClientProducer producer = session.createProducer(address);
- ClientMessage matchingMessage = session.createClientMessage(false);
+ ClientMessage matchingMessage = session.createMessage(false);
matchingMessage.putLongProperty(key, matchingValue);
producer.send(matchingMessage);
- ClientMessage unmatchingMessage = session.createClientMessage(false);
+ ClientMessage unmatchingMessage = session.createMessage(false);
unmatchingMessage.putLongProperty(key, unmatchingValue);
producer.send(unmatchingMessage);
@@ -530,7 +530,7 @@
ClientProducer producer = session.createProducer(address);
// send on queue
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
SimpleString key = RandomUtil.randomSimpleString();
long value = RandomUtil.randomLong();
message.putLongProperty(key, value);
@@ -569,7 +569,7 @@
ClientProducer producer = session.createProducer(address);
// send on queue
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
SimpleString key = RandomUtil.randomSimpleString();
long value = RandomUtil.randomLong();
message.putLongProperty(key, value);
@@ -619,10 +619,10 @@
ClientProducer producer = session.createProducer(address);
// send on queue
- ClientMessage matchingMessage = session.createClientMessage(false);
+ ClientMessage matchingMessage = session.createMessage(false);
matchingMessage.putLongProperty(key, matchingValue);
producer.send(matchingMessage);
- ClientMessage unmatchingMessage = session.createClientMessage(false);
+ ClientMessage unmatchingMessage = session.createMessage(false);
unmatchingMessage.putLongProperty(key, unmatchingValue);
producer.send(unmatchingMessage);
@@ -666,8 +666,8 @@
ClientProducer producer = session.createProducer(address);
// send 2 messages on queue
- producer.send(session.createClientMessage(false));
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
+ producer.send(session.createMessage(false));
QueueControl queueControl = createManagementControl(address, queue);
QueueControl otherQueueControl = createManagementControl(otherAddress, otherQueue);
@@ -701,7 +701,7 @@
ClientProducer producer = session.createProducer(address);
// send 2 messages on queue
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
QueueControl queueControl = createManagementControl(address, queue);
Assert.assertEquals(1, queueControl.getMessageCount());
@@ -748,10 +748,10 @@
ClientProducer producer = session.createProducer(address);
// send on queue
- ClientMessage matchingMessage = session.createClientMessage(false);
+ ClientMessage matchingMessage = session.createMessage(false);
matchingMessage.putLongProperty(key, matchingValue);
producer.send(matchingMessage);
- ClientMessage unmatchingMessage = session.createClientMessage(false);
+ ClientMessage unmatchingMessage = session.createMessage(false);
unmatchingMessage.putLongProperty(key, unmatchingValue);
producer.send(unmatchingMessage);
@@ -788,8 +788,8 @@
ClientProducer producer = session.createProducer(address);
// send on queue
- producer.send(session.createClientMessage(false));
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
+ producer.send(session.createMessage(false));
QueueControl queueControl = createManagementControl(address, queue);
Assert.assertEquals(2, queueControl.getMessageCount());
@@ -811,8 +811,8 @@
ClientProducer producer = session.createProducer(address);
// send on queue
- producer.send(session.createClientMessage(false));
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
+ producer.send(session.createMessage(false));
QueueControl queueControl = createManagementControl(address, queue);
Assert.assertEquals(2, queueControl.getMessageCount());
@@ -834,8 +834,8 @@
ClientProducer producer = session.createProducer(address);
// send 2 messages on queue
- producer.send(session.createClientMessage(false));
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
+ producer.send(session.createMessage(false));
QueueControl queueControl = createManagementControl(address, queue);
Assert.assertEquals(2, queueControl.getMessageCount());
@@ -869,9 +869,9 @@
ClientProducer producer = session.createProducer(address);
// send on queue
- ClientMessage matchingMessage = session.createClientMessage(false);
+ ClientMessage matchingMessage = session.createMessage(false);
matchingMessage.putLongProperty(key, matchingValue);
- ClientMessage unmatchingMessage = session.createClientMessage(false);
+ ClientMessage unmatchingMessage = session.createMessage(false);
unmatchingMessage.putLongProperty(key, unmatchingValue);
producer.send(matchingMessage);
producer.send(unmatchingMessage);
@@ -899,10 +899,10 @@
ClientProducer producer = session.createProducer(address);
// send on queue
- ClientMessage matchingMessage = session.createClientMessage(false);
+ ClientMessage matchingMessage = session.createMessage(false);
matchingMessage.putLongProperty(key, matchingValue);
producer.send(matchingMessage);
- ClientMessage unmatchingMessage = session.createClientMessage(false);
+ ClientMessage unmatchingMessage = session.createMessage(false);
unmatchingMessage.putLongProperty(key, unmatchingValue);
producer.send(unmatchingMessage);
@@ -942,7 +942,7 @@
ClientProducer producer = session.createProducer(address);
// send on queue
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
QueueControl queueControl = createManagementControl(address, queue);
QueueControl expiryQueueControl = createManagementControl(expiryAddress, expiryQueue);
@@ -980,8 +980,8 @@
ClientProducer producer = session.createProducer(address);
// send 2 messages on queue
- producer.send(session.createClientMessage(false));
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
+ producer.send(session.createMessage(false));
QueueControl queueControl = createManagementControl(address, queue);
QueueControl deadLetterQueueControl = createManagementControl(deadLetterAddress, deadLetterQueue);
@@ -1021,7 +1021,7 @@
session.createQueue(address, queue, null, false);
ClientProducer producer = session.createProducer(address);
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.setPriority(originalPriority);
producer.send(message);
@@ -1055,7 +1055,7 @@
session.createQueue(address, queue, null, false);
ClientProducer producer = session.createProducer(address);
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
producer.send(message);
QueueControl queueControl = createManagementControl(address, queue);
@@ -1103,7 +1103,7 @@
Assert.assertEquals(0, info.getCount());
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
jsonString = queueControl.listMessageCounter();
@@ -1113,7 +1113,7 @@
Assert.assertEquals(1, info.getCount());
Assert.assertEquals(1, info.getCountDelta());
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
jsonString = queueControl.listMessageCounter();
@@ -1155,7 +1155,7 @@
Assert.assertEquals(0, info.getCount());
ClientProducer producer = session.createProducer(address);
- producer.send(session.createClientMessage(false));
+ producer.send(session.createMessage(false));
Thread.sleep(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD * 2);
jsonString = queueControl.listMessageCounter();
Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -92,7 +92,7 @@
ClientRequestor requestor = new ClientRequestor(session, ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS);
- ClientMessage mngmntMessage = session.createClientMessage(false);
+ ClientMessage mngmntMessage = session.createMessage(false);
ManagementHelper.putAttribute(mngmntMessage, ResourceNames.CORE_SERVER, "started");
ClientMessage reply = requestor.request(mngmntMessage, 500);
if (expectSuccess)
Modified: trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -163,7 +163,7 @@
ClientProducer producer = session.createProducer(PageCrashTest.ADDRESS);
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
message.getBodyBuffer().writeBytes(new byte[1024]);
PagingStore store = server.getPostOffice().getPagingManager().getPageStore(PageCrashTest.ADDRESS);
Modified: trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -109,7 +109,7 @@
ClientMessage message = null;
- message = session.createClientMessage(true);
+ message = session.createMessage(true);
message.getBodyBuffer().writeBytes(new byte[1024]);
for (int i = 0; i < 200; i++)
Modified: trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -85,7 +85,7 @@
boolean durable = false;
for (int i = 0; i < ReplicationOrderTest.NUM; i++)
{
- ClientMessage msg = session.createClientMessage(durable);
+ ClientMessage msg = session.createMessage(durable);
msg.putIntProperty("counter", i);
producer.send(msg);
if (transactional)
Modified: trunk/tests/src/org/hornetq/tests/integration/scheduling/DelayedMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/scheduling/DelayedMessageTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/scheduling/DelayedMessageTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -213,7 +213,7 @@
private ClientMessage createDurableMessage(final ClientSession session, final String body)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
true,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -280,7 +280,7 @@
ClientSession session = sessionFactory.createSession(false, true, false);
session.createQueue(atestq, atestq, null, true);
ClientProducer producer = session.createProducer(atestq);
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
@@ -768,7 +768,7 @@
private ClientMessage createDurableMessage(final ClientSession session, final String body)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
true,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -491,7 +491,7 @@
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
session.createQueue(SecurityTest.addressA, SecurityTest.queueA, true);
ClientProducer cp = session.createProducer(SecurityTest.addressA);
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
session.close();
}
finally
@@ -527,7 +527,7 @@
ClientProducer cp = session.createProducer(SecurityTest.addressA);
try
{
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
}
catch (HornetQException e)
{
@@ -565,7 +565,7 @@
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
session.createQueue(SecurityTest.addressA, SecurityTest.queueA, true);
ClientProducer cp = session.createProducer(SecurityTest.addressA);
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
session.close();
Queue binding = (Queue)server.getPostOffice().getBinding(new SimpleString(SecurityTest.queueA)).getBindable();
@@ -607,7 +607,7 @@
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
senSession.createQueue(SecurityTest.addressA, SecurityTest.queueA, true);
ClientProducer cp = senSession.createProducer(SecurityTest.addressA);
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
ClientConsumer cc = session.createConsumer(SecurityTest.queueA);
session.close();
senSession.close();
@@ -648,7 +648,7 @@
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
senSession.createQueue(SecurityTest.addressA, SecurityTest.queueA, true);
ClientProducer cp = senSession.createProducer(SecurityTest.addressA);
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
try
{
ClientConsumer cc = session.createConsumer(SecurityTest.queueA);
@@ -699,7 +699,7 @@
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
senSession.createQueue(SecurityTest.addressA, SecurityTest.queueA, true);
ClientProducer cp = senSession.createProducer(SecurityTest.addressA);
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
try
{
ClientConsumer cc = session.createConsumer(SecurityTest.queueA);
@@ -761,7 +761,7 @@
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
senSession.createQueue(SecurityTest.addressA, SecurityTest.queueA, true);
ClientProducer cp = senSession.createProducer(SecurityTest.addressA);
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
try
{
session.createConsumer(SecurityTest.queueA);
@@ -835,7 +835,7 @@
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
senSession.createQueue(SecurityTest.addressA, SecurityTest.queueA, true);
ClientProducer cp = senSession.createProducer(SecurityTest.addressA);
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
try
{
session.createConsumer(SecurityTest.queueA);
@@ -929,7 +929,7 @@
cf.setBlockOnNonDurableSend(true);
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
ClientProducer cp = session.createProducer(configuration.getManagementAddress());
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
session.close();
}
finally
@@ -962,10 +962,10 @@
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
session.createQueue(configuration.getManagementAddress().toString(), SecurityTest.queueA, true);
ClientProducer cp = session.createProducer(configuration.getManagementAddress());
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
try
{
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
}
catch (HornetQException e)
{
@@ -1003,7 +1003,7 @@
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
session.createQueue(configuration.getManagementAddress().toString(), SecurityTest.queueA, true);
ClientProducer cp = session.createProducer(configuration.getManagementAddress());
- cp.send(session.createClientMessage(false));
+ cp.send(session.createMessage(false));
session.close();
Queue binding = (Queue)server.getPostOffice().getBinding(new SimpleString(SecurityTest.queueA)).getBindable();
@@ -1383,7 +1383,7 @@
{
ClientProducer prod = connection.createProducer(genericQueueName);
ClientConsumer con = connection.createConsumer(genericQueueName);
- ClientMessage m = connection.createClientMessage(false);
+ ClientMessage m = connection.createMessage(false);
prod.send(m);
ClientMessage rec = con.receive(1000);
Assert.assertNotNull(rec);
@@ -1404,7 +1404,7 @@
try
{
ClientProducer prod = connection.createProducer(queue);
- ClientMessage m = connection.createClientMessage(false);
+ ClientMessage m = connection.createMessage(false);
try
{
prod.send(m);
@@ -1436,7 +1436,7 @@
try
{
ClientProducer prod = connection.createProducer(queue);
- ClientMessage m = connection.createClientMessage(false);
+ ClientMessage m = connection.createMessage(false);
try
{
prod.send(m);
@@ -1470,7 +1470,7 @@
private void checkUserSendNoReceive(final String queue, final ClientSession connection) throws Exception
{
ClientProducer prod = connection.createProducer(queue);
- ClientMessage m = connection.createClientMessage(false);
+ ClientMessage m = connection.createMessage(false);
prod.send(m);
try
Modified: trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -59,7 +59,7 @@
ClientProducer producer = session.createProducer(queueName);
ClientConsumer consumer = session.createConsumer(queueName);
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
false,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -171,7 +171,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putIntProperty(propKey, i);
@@ -269,7 +269,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.putIntProperty(propKey, i);
@@ -344,7 +344,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
message.putIntProperty(propKey, i);
@@ -429,7 +429,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
message.putStringProperty(new SimpleString("cheese"), new SimpleString("camembert"));
@@ -454,7 +454,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = session.createClientMessage(true);
+ ClientMessage message = session.createMessage(true);
message.putStringProperty(new SimpleString("cheese"), new SimpleString("roquefort"));
Modified: trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -1245,7 +1245,7 @@
private ClientMessage createTextMessage(final String s, final boolean durable)
{
- ClientMessage message = clientSession.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = clientSession.createMessage(HornetQTextMessage.TYPE,
durable,
0,
System.currentTimeMillis(),
@@ -1256,7 +1256,7 @@
private ClientMessage createBytesMessage(final byte[] b, final boolean durable)
{
- ClientMessage message = clientSession.createClientMessage(HornetQBytesMessage.TYPE,
+ ClientMessage message = clientSession.createMessage(HornetQBytesMessage.TYPE,
durable,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -100,7 +100,7 @@
{
session = factory.createSession(false, true, true);
producer = session.createProducer(adr);
- msg = session.createClientMessage(true);
+ msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(new byte[SIZE_OF_MESSAGE]);
}
@@ -203,7 +203,7 @@
{
ClientSession session = factory.createSession(false, true, true);
ClientProducer producer = session.createProducer(adr);
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(new byte[messageSize]);
Modified: trunk/tests/src/org/hornetq/tests/stress/client/SendStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/client/SendStressTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/stress/client/SendStressTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -76,7 +76,7 @@
ClientProducer producer = session.createProducer("address");
- ClientMessage message = session.createClientMessage(false);
+ ClientMessage message = session.createMessage(false);
message.getBodyBuffer().writeBytes(new byte[1024]);
Modified: trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -97,7 +97,7 @@
for (int i = 0; i < 500; i++)
{
- prod.send(session.createClientMessage(true));
+ prod.send(session.createMessage(true));
}
session.commit();
@@ -115,7 +115,7 @@
// Sending non transactionally, so it would test non transactional stuff on the journal
for (int j = 0; j < 1000; j++)
{
- Message msg = session.createClientMessage(true);
+ Message msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(new byte[1024]);
prod.send(msg);
@@ -186,7 +186,7 @@
byte[] buffer = new byte[10 * 1024];
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
for (int i = 0; i < CompactingStressTest.TOT_AD3; i++)
{
@@ -245,9 +245,9 @@
{
sessionSlow.commit();
}
- slowProd.send(session.createClientMessage(true));
+ slowProd.send(session.createMessage(true));
}
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
prod.send(msg);
}
Modified: trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -118,9 +118,9 @@
{
sessionSlow.commit();
}
- slowProd.send(session.createClientMessage(true));
+ slowProd.send(session.createMessage(true));
}
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
prod.send(msg);
}
sessionSlow.commit();
Modified: trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -79,7 +79,7 @@
for (int i = 0; i < 100; i++)
{
- producer.send(session.createClientMessage(true));
+ producer.send(session.createMessage(true));
}
session.commit();
@@ -273,7 +273,7 @@
{
// System.out.println(Thread.currentThread().getName() + "::received #" + i);
}
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
prod.send(msg);
}
Modified: trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -305,7 +305,7 @@
ClientProducer prod = session.createProducer(queue);
for (int i = 0; i < nmessages; i++)
{
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(new byte[1024]);
prod.send(msg);
}
@@ -458,7 +458,7 @@
{
// System.out.println(Thread.currentThread().getName() + "::sent #" + i);
}
- ClientMessage msg = session.createClientMessage(true);
+ ClientMessage msg = session.createMessage(true);
prod.send(msg);
}
Modified: trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -364,7 +364,7 @@
protected ClientMessage createTextMessage(final ClientSession session, final String s, final boolean durable)
{
- ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
durable,
0,
System.currentTimeMillis(),
@@ -375,7 +375,7 @@
protected ClientMessage createBytesMessage(final ClientSession session, final byte[] b, final boolean durable)
{
- ClientMessage message = session.createClientMessage(HornetQBytesMessage.TYPE,
+ ClientMessage message = session.createMessage(HornetQBytesMessage.TYPE,
durable,
0,
System.currentTimeMillis(),
Modified: trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2009-12-08 16:54:49 UTC (rev 8621)
+++ trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2009-12-08 17:05:54 UTC (rev 8622)
@@ -880,7 +880,7 @@
protected ClientMessage createTextMessage(final String s, final boolean durable, final ClientSession clientSession)
{
- ClientMessage message = clientSession.createClientMessage(HornetQTextMessage.TYPE,
+ ClientMessage message = clientSession.createMessage(HornetQTextMessage.TYPE,
durable,
0,
System.currentTimeMillis(),
15 years, 3 months
- 1
- 0
JBoss hornetq SVN: r8621 - in trunk: examples/core/perf/src/org/hornetq/core/example and 42 other directories.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-12-08 11:54:49 -0500 (Tue, 08 Dec 2009)
New Revision: 8621
Modified:
trunk/docs/user-manual/en/appserver-integration.xml
trunk/docs/user-manual/en/configuration-index.xml
trunk/docs/user-manual/en/examples.xml
trunk/docs/user-manual/en/ha.xml
trunk/docs/user-manual/en/jms-bridge.xml
trunk/docs/user-manual/en/management.xml
trunk/docs/user-manual/en/perf-tuning.xml
trunk/docs/user-manual/en/preface.xml
trunk/docs/user-manual/en/send-guarantees.xml
trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java
trunk/examples/jms/security/server0/hornetq-jms.xml
trunk/src/config/common/schema/hornetq-jms.xsd
trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml
trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml
trunk/src/config/ra.xml
trunk/src/main/org/hornetq/core/client/ClientProducer.java
trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java
trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java
trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java
trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java
trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java
trunk/src/main/org/hornetq/jms/server/JMSServerManager.java
trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java
trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
trunk/src/main/org/hornetq/jms/server/management/ConnectionFactoryControl.java
trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java
trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java
trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java
trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java
trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java
trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml
trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java
trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java
trunk/tests/src/org/hornetq/tests/integration/client/BlockingSendTest.java
trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java
trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java
trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java
trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java
trunk/tests/src/org/hornetq/tests/integration/client/OrderTest.java
trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java
trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java
trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java
trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java
trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateProducerTest.java
trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java
trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java
trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java
trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java
trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java
trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java
trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java
trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java
trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java
trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java
trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java
trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java
trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java
trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java
trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java
trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java
trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java
Log:
HORNETQ-185: review core API
* used consistently durable/non-durable message (instead of persistent)
* renamed methods isBlockOnPersistentSend() to isBlockOnDurableSend() (& ditto for non-durable)
* updated XML schema + config
* updated doc & examples
+ fixed ResourceAdapterTest
Modified: trunk/docs/user-manual/en/appserver-integration.xml
===================================================================
--- trunk/docs/user-manual/en/appserver-integration.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/docs/user-manual/en/appserver-integration.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -534,14 +534,14 @@
<entry>If true then block on acknowledge of messages.</entry>
</row>
<row>
- <entry>BlockOnNonPersistentSend</entry>
+ <entry>BlockOnNonDurableSend</entry>
<entry>boolean</entry>
- <entry>If true then block when sending non persistent messages</entry>
+ <entry>If true then block when sending non-durable messages</entry>
</row>
<row>
- <entry>BlockOnPersistentSend</entry>
+ <entry>BlockOnDurableSend</entry>
<entry>boolean</entry>
- <entry>If true then block when sending persistent messages</entry>
+ <entry>If true then block when sending durable messages</entry>
</row>
<row>
<entry>AutoGroup</entry>
Modified: trunk/docs/user-manual/en/configuration-index.xml
===================================================================
--- trunk/docs/user-manual/en/configuration-index.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/docs/user-manual/en/configuration-index.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -866,17 +866,17 @@
</row>
<row>
<entry><link linkend="non-transactional-sends"
- >connection-factory.block-on-non-persistent-send</link></entry>
+ >connection-factory.block-on-non-durable-send</link></entry>
<entry>Boolean</entry>
- <entry>whether or not non persistent messages are sent
+ <entry>whether or not non-durable messages are sent
synchronously</entry>
<entry>false</entry>
</row>
<row>
<entry><link linkend="non-transactional-sends"
- >connection-factory.block-on-persistent-send</link></entry>
+ >connection-factory.block-on-durable-send</link></entry>
<entry>Boolean</entry>
- <entry>whether or not persistent messages are sent synchronously</entry>
+ <entry>whether or not durable messages are sent synchronously</entry>
<entry>true</entry>
</row>
<row>
Modified: trunk/docs/user-manual/en/examples.xml
===================================================================
--- trunk/docs/user-manual/en/examples.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/docs/user-manual/en/examples.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -161,7 +161,7 @@
subscriber - i.e. they will accumulate messages sent to the topic even if there is
no active subscriber on them. They will also survive server restarts or crashes.
Note that for the messages to be persisted, the messages sent to them must be marked
- as persistent messages. </para>
+ as durable messages. </para>
</section>
<section>
<title>Embedded</title>
Modified: trunk/docs/user-manual/en/ha.xml
===================================================================
--- trunk/docs/user-manual/en/ha.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/docs/user-manual/en/ha.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -51,7 +51,7 @@
response serially in an RPC manner before replicating the next piece of
data.</para>
<para>When the user receives confirmation that a transaction has committed, prepared
- or rolled back or a persistent message has been sent, we can guarantee it has
+ or rolled back or a durable message has been sent, we can guarantee it has
reached the backup server and been persisted.</para>
<para>Data replication introduces some inevitable performance overhead compared to
non replicated operation, but has the advantage in that it requires no expensive
@@ -319,7 +319,7 @@
linkend="duplicate-detection"/>) in the transaction, and retry the
transaction operations again after the call is unblocked. If the transaction had
indeed been committed on the live server successfully before failover, then when
- the transaction is retried, duplicate detection will ensure that any persistent
+ the transaction is retried, duplicate detection will ensure that any durable
messages resent in the transaction will be ignored on the server to prevent them
getting sent more than once.</para>
<note>
Modified: trunk/docs/user-manual/en/jms-bridge.xml
===================================================================
--- trunk/docs/user-manual/en/jms-bridge.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/docs/user-manual/en/jms-bridge.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -368,7 +368,7 @@
to the destination. Therefore there is a possibility that if failure occurs
between removing them from the source and them arriving at the destination they
could be lost. Hence delivery will occur at most once.</para>
- <para>This mode is available for both persistent and non persistent messages.</para>
+ <para>This mode is available for both durable and non-durable messages.</para>
</section>
<section>
<title>DUPLICATES_OK</title>
@@ -378,7 +378,7 @@
destination but before acknowledging them, they could be sent again when the
system recovers. I.e. the destination might receive duplicates after a
failure.</para>
- <para>This mode is available for both persistent and non persistent messages.</para>
+ <para>This mode is available for both durable and non-durable messages.</para>
</section>
<section>
<title>ONCE_AND_ONLY_ONCE</title>
@@ -393,7 +393,7 @@
degree of durability. If JTA is required then both supplied connection factories
need to be XAConnectionFactory implementations. This is likely to be the slowest
mode since it requires extra persistence for the transaction logging.</para>
- <para>This mode is only available for persistent messages.</para>
+ <para>This mode is only available for durable messages.</para>
<note>
<para>For a specific application it may possible to provide once and only once
semantics without using the ONCE_AND_ONLY_ONCE QoS level. This can be done
Modified: trunk/docs/user-manual/en/management.xml
===================================================================
--- trunk/docs/user-manual/en/management.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/docs/user-manual/en/management.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -376,9 +376,9 @@
<para>The <literal>ConnectionFactoryControl</literal> exposes JMS
ConnectionFactory configuration through its attributes (e.g. <literal
>getConsumerWindowSize()</literal> to retrieve the consumer window size for
- flow control, <literal>isBlockOnNonPersistentSend()</literal> to know wether
+ flow control, <literal>isBlockOnNonDurableSend()</literal> to know wether
the producers created from the connection factory will block or not when
- sending non-persistent messages, etc.)</para>
+ sending non-durable messages, etc.)</para>
</listitem>
</itemizedlist>
</section>
Modified: trunk/docs/user-manual/en/perf-tuning.xml
===================================================================
--- trunk/docs/user-manual/en/perf-tuning.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/docs/user-manual/en/perf-tuning.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -95,9 +95,9 @@
acknowledgements with one acknowledge/commit. </para>
</listitem>
<listitem>
- <para>Avoid persistent messages. By default JMS messages are persistent. If you
- don't really need persistent messages then set them to be non persistent.
- Persistent messages incur a lot more overhead in persisting them to
+ <para>Avoid durable messages. By default JMS messages are durable. If you
+ don't really need durable messages then set them to be non-durable.
+ Durable messages incur a lot more overhead in persisting them to
storage.</para>
</listitem>
</itemizedlist>
@@ -107,9 +107,9 @@
<para>There are various other places in HornetQ where we can perform some tuning:</para>
<itemizedlist>
<listitem>
- <para>Use Asynchronous Send Acknowledgements. If you need to send persistent
+ <para>Use Asynchronous Send Acknowledgements. If you need to send durable
messages non transactionally and you need a guarantee that they have reached the
- server by the time the call to send() returns, don't set persistent messages to
+ server by the time the call to send() returns, don't set durable messages to
be sent blocking, instead use asynchronous send acknowledgements to get your
acknowledgements of send back in a separate stream, see <xref
linkend="send-guarantees"/> for more information on this.</para>
@@ -143,13 +143,13 @@
>journal-sync-non-transactional</literal> to <literal>false</literal> in
<literal>hornetq-configuration.xml</literal> can give you better
non-transactional persistent performance at the expense of some possibility of
- loss of persistent messages on failure. See <xref linkend="send-guarantees"/>
+ loss of durable messages on failure. See <xref linkend="send-guarantees"/>
for more information.</para>
</listitem>
<listitem>
<para>Send messages non blocking. Setting <literal
- >block-on-persistent-send</literal> and <literal
- >block-on-non-persistent-send</literal> to <literal>false</literal> in
+ >block-on-durable-send</literal> and <literal
+ >block-on-non-durable-send</literal> to <literal>false</literal> in
<literal>hornetq-jms.xml</literal> (if you're using JMS and JNDI) or
directly on the ClientSessionFactory. This means you don't have to wait a whole
network round trip for every message sent. See <xref linkend="send-guarantees"/>
Modified: trunk/docs/user-manual/en/preface.xml
===================================================================
--- trunk/docs/user-manual/en/preface.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/docs/user-manual/en/preface.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -50,8 +50,8 @@
</listitem>
<listitem>
<para>Superb performance. Our ground-breaking high performance journal provides
- persistent messaging performance at rates normally seen for non persistent
- messaging, our non persistent messaging performance rocks the boat too.</para>
+ persistent messaging performance at rates normally seen for non-persistent
+ messaging, our non-persistent messaging performance rocks the boat too.</para>
</listitem>
<listitem>
<para>Full feature set. All the features you'd expect in any serious messaging system,
Modified: trunk/docs/user-manual/en/send-guarantees.xml
===================================================================
--- trunk/docs/user-manual/en/send-guarantees.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/docs/user-manual/en/send-guarantees.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -43,19 +43,19 @@
<para>If you are sending messages to a server using a non transacted session, HornetQ can be
configured to block the call to send until the message has definitely reached the
server, and a response has been sent back to the client. This can be configured
- individually for persistent and non-persistent messages, and is determined by the
+ individually for durable and non-durable messages, and is determined by the
following two parameters:</para>
<itemizedlist>
<listitem>
- <para><literal>BlockOnPersistentSend</literal>. If this is set to <literal
- >true</literal> then all calls to send for persistent messages on non
+ <para><literal>BlockOnDurableSend</literal>. If this is set to <literal
+ >true</literal> then all calls to send for durable messages on non
transacted sessions will block until the message has reached the server, and a
response has been sent back. The default value is <literal>true</literal>.
</para>
</listitem>
<listitem>
- <para><literal>BlockOnNonPersistentSend</literal>. If this is set to <literal
- >true</literal> then all calls to send for non-persistent messages on non
+ <para><literal>BlockOnNonDurableSend</literal>. If this is set to <literal
+ >true</literal> then all calls to send for non-durable messages on non
transacted sessions will block until the message has reached the server, and a
response has been sent back. The default value is <literal
>false</literal>.</para>
@@ -72,15 +72,15 @@
<para>If you are using JMS and you're using the JMS service on the server to load your JMS
connection factory instances into JNDI then these parameters can be configured in
<literal>hornetq-jms.xml</literal> using the elements <literal
- >block-on-persistent-send</literal> and <literal
- >block-on-non-persistent-send</literal>. If you're using JMS but not using JNDI then
+ >block-on-durable-send</literal> and <literal
+ >block-on-non-durable-send</literal>. If you're using JMS but not using JNDI then
you can set these values directly on the <literal>HornetQConnectionFactory</literal>
instance using the appropriate setter methods.</para>
<para>If you're using core you can set these values directly on the <literal
>ClientSessionFactory</literal> instance using the appropriate setter
methods.</para>
<para>When the server receives a message sent from a non transactional session, and that
- message is persistent and the message is routed to at least one durable queue, then the
+ message is durable and the message is routed to at least one durable queue, then the
server will persist the message in permanent storage. If the journal parameter <literal
>journal-sync-non-transactional</literal> is set to <literal>true</literal> the
server will not send a response back to the client until the message has been persisted
Modified: trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java
===================================================================
--- trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -211,7 +211,7 @@
factory.setAckBatchSize(perfParams.getBatchSize());
factory.setBlockOnAcknowledge(perfParams.isBlockOnACK());
- factory.setBlockOnPersistentSend(perfParams.isBlockOnPersistent());
+ factory.setBlockOnDurableSend(perfParams.isBlockOnPersistent());
}
private void displayAverage(final long numberOfMessages, final long start, final long end)
Modified: trunk/examples/jms/security/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/security/server0/hornetq-jms.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/examples/jms/security/server0/hornetq-jms.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -6,8 +6,8 @@
<connectors>
<connector-ref connector-name="netty-connector"/>
</connectors>
- <block-on-persistent-send>true</block-on-persistent-send>
- <block-on-non-persistent-send>true</block-on-non-persistent-send>
+ <block-on-durable-send>true</block-on-durable-send>
+ <block-on-non-durable-send>true</block-on-non-durable-send>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/src/config/common/schema/hornetq-jms.xsd
===================================================================
--- trunk/src/config/common/schema/hornetq-jms.xsd 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/config/common/schema/hornetq-jms.xsd 2009-12-08 16:54:49 UTC (rev 8621)
@@ -88,10 +88,10 @@
<xsd:element name="block-on-acknowledge" type="xsd:boolean"
maxOccurs="1" minOccurs="0">
</xsd:element>
- <xsd:element name="block-on-non-persistent-send" type="xsd:boolean"
+ <xsd:element name="block-on-non-durable-send" type="xsd:boolean"
maxOccurs="1" minOccurs="0">
</xsd:element>
- <xsd:element name="block-on-persistent-send" type="xsd:boolean"
+ <xsd:element name="block-on-durable-send" type="xsd:boolean"
maxOccurs="1" minOccurs="0">
</xsd:element>
<xsd:element name="auto-group-id" type="xsd:boolean"
Modified: trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -185,14 +185,14 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The block on non persistent send</description>
- <config-property-name>BlockOnNonPersistentSend</config-property-name>
+ <description>The block on non durable send</description>
+ <config-property-name>BlockOnNonDurableSend</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The block on persistent send</description>
- <config-property-name>BlockOnPersistentSend</config-property-name>
+ <description>The block on durable send</description>
+ <config-property-name>BlockOnDurableSend</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
<config-property-value></config-property-value>
</config-property>
Modified: trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -185,14 +185,14 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The block on non persistent send</description>
- <config-property-name>BlockOnNonPersistentSend</config-property-name>
+ <description>The block on non-durable send</description>
+ <config-property-name>BlockOnNonDurableSend</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The block on persistent send</description>
- <config-property-name>BlockOnPersistentSend</config-property-name>
+ <description>The block on durable send</description>
+ <config-property-name>BlockOnDurableSend</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
<config-property-value></config-property-value>
</config-property>
Modified: trunk/src/config/ra.xml
===================================================================
--- trunk/src/config/ra.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/config/ra.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -185,14 +185,14 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The block on non persistent send</description>
- <config-property-name>BlockOnNonPersistentSend</config-property-name>
+ <description>The block on non durable send</description>
+ <config-property-name>BlockOnNonDurableSend</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The block on persistent send</description>
- <config-property-name>BlockOnPersistentSend</config-property-name>
+ <description>The block on durable send</description>
+ <config-property-name>BlockOnDurableSend</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
<config-property-value></config-property-value>
</config-property>
Modified: trunk/src/main/org/hornetq/core/client/ClientProducer.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/ClientProducer.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/core/client/ClientProducer.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -73,18 +73,18 @@
boolean isClosed();
/**
- * Return whether the producer will block when sending <em>persistent</em> messages.
+ * Return whether the producer will block when sending <em>durable</em> messages.
*
- * @return <code>true</code> if the producer blocks when sending persistent, <code>false</code> else
+ * @return <code>true</code> if the producer blocks when sending durable, <code>false</code> else
*/
- boolean isBlockOnPersistentSend();
+ boolean isBlockOnDurableSend();
/**
- * Return whether the producer will block when sending <em>non-persistent</em> messages.
+ * Return whether the producer will block when sending <em>non-durable</em> messages.
*
- * @return <code>true</code> if the producer blocks when sending non-persistent, <code>false</code> else
+ * @return <code>true</code> if the producer blocks when sending non-durable, <code>false</code> else
*/
- boolean isBlockOnNonPersistentSend();
+ boolean isBlockOnNonDurableSend();
/**
* Return the producer maximum rate.
Modified: trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -368,36 +368,36 @@
void setBlockOnAcknowledge(boolean blockOnAcknowledge);
/**
- * Return whether producers created through this factory will block while sending <em>persistent</em> messages or do it asynchronously.
+ * Return whether producers created through this factory will block while sending <em>durable</em> messages or do it asynchronously.
*
- * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_PERSISTENT_SEND}.
+ * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_DURABLE_SEND}.
*
* @return whether producers will block while sending persistent messages or do it asynchronously
*/
- boolean isBlockOnPersistentSend();
+ boolean isBlockOnDurableSend();
/**
- * Set whether producers created through this factory will block while sending <em>persistent</em> messages or do it asynchronously.
+ * Set whether producers created through this factory will block while sending <em>durable</em> messages or do it asynchronously.
*
- * @param blockOnPersistentSend <code>true</code> to block when sending persistent messages or <code>false</code> to send them asynchronously
+ * @param blockOnDurableSend <code>true</code> to block when sending durable messages or <code>false</code> to send them asynchronously
*/
- void setBlockOnPersistentSend(boolean blockOnPersistentSend);
+ void setBlockOnDurableSend(boolean blockOnDurableSend);
/**
- * Return whether producers created through this factory will block while sending <em>non-persistent</em> messages or do it asynchronously.
+ * Return whether producers created through this factory will block while sending <em>non-durable</em> messages or do it asynchronously.
*
- * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND}.
+ * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_NON_DURABLE_SEND}.
*
- * @return whether producers will block while sending non-persistent messages or do it asynchronously
+ * @return whether producers will block while sending non-durable messages or do it asynchronously
*/
- boolean isBlockOnNonPersistentSend();
+ boolean isBlockOnNonDurableSend();
/**
- * Set whether producers created through this factory will block while sending <em>non-persistent</em> messages or do it asynchronously.
+ * Set whether producers created through this factory will block while sending <em>non-durable</em> messages or do it asynchronously.
*
- * @param blockOnNonPersistentSend <code>true</code> to block when sending non-persistent messages or <code>false</code> to send them asynchronously
+ * @param blockOnNonDurableSend <code>true</code> to block when sending non-durable messages or <code>false</code> to send them asynchronously
*/
- void setBlockOnNonPersistentSend(boolean blockOnNonPersistentSend);
+ void setBlockOnNonDurableSend(boolean blockOnNonDurableSend);
/**
* Return whether producers created through this factory will automatically
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -61,9 +61,9 @@
private final TokenBucketLimiter rateLimiter;
- private final boolean blockOnNonPersistentSend;
+ private final boolean blockOnNonDurableSend;
- private final boolean blockOnPersistentSend;
+ private final boolean blockOnDurableSend;
private final SimpleString groupID;
@@ -78,8 +78,8 @@
public ClientProducerImpl(final ClientSessionInternal session,
final SimpleString address,
final TokenBucketLimiter rateLimiter,
- final boolean blockOnNonPersistentSend,
- final boolean blockOnPersistentSend,
+ final boolean blockOnNonDurableSend,
+ final boolean blockOnDurableSend,
final boolean autoGroup,
final SimpleString groupID,
final int minLargeMessageSize,
@@ -93,9 +93,9 @@
this.rateLimiter = rateLimiter;
- this.blockOnNonPersistentSend = blockOnNonPersistentSend;
+ this.blockOnNonDurableSend = blockOnNonDurableSend;
- this.blockOnPersistentSend = blockOnPersistentSend;
+ this.blockOnDurableSend = blockOnDurableSend;
if (autoGroup)
{
@@ -169,14 +169,14 @@
return closed;
}
- public boolean isBlockOnPersistentSend()
+ public boolean isBlockOnDurableSend()
{
- return blockOnPersistentSend;
+ return blockOnDurableSend;
}
- public boolean isBlockOnNonPersistentSend()
+ public boolean isBlockOnNonDurableSend()
{
- return blockOnNonPersistentSend;
+ return blockOnNonDurableSend;
}
public int getMaxRate()
@@ -229,7 +229,7 @@
msg.putStringProperty(MessageImpl.HDR_GROUP_ID, groupID);
}
- boolean sendBlocking = msg.isDurable() ? blockOnPersistentSend : blockOnNonPersistentSend;
+ boolean sendBlocking = msg.isDurable() ? blockOnDurableSend : blockOnNonDurableSend;
session.workDone();
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -82,9 +82,9 @@
public static final boolean DEFAULT_BLOCK_ON_ACKNOWLEDGE = false;
- public static final boolean DEFAULT_BLOCK_ON_PERSISTENT_SEND = true;
+ public static final boolean DEFAULT_BLOCK_ON_DURABLE_SEND = true;
- public static final boolean DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND = false;
+ public static final boolean DEFAULT_BLOCK_ON_NON_DURABLE_SEND = false;
public static final boolean DEFAULT_AUTO_GROUP = false;
@@ -171,9 +171,9 @@
private boolean blockOnAcknowledge;
- private boolean blockOnPersistentSend;
+ private boolean blockOnDurableSend;
- private boolean blockOnNonPersistentSend;
+ private boolean blockOnNonDurableSend;
private boolean autoGroup;
@@ -355,9 +355,9 @@
blockOnAcknowledge = other.isBlockOnAcknowledge();
- blockOnPersistentSend = other.isBlockOnPersistentSend();
+ blockOnDurableSend = other.isBlockOnDurableSend();
- blockOnNonPersistentSend = other.isBlockOnNonPersistentSend();
+ blockOnNonDurableSend = other.isBlockOnNonDurableSend();
autoGroup = other.isAutoGroup();
@@ -416,9 +416,9 @@
blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE;
- blockOnPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND;
+ blockOnDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND;
- blockOnNonPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
+ blockOnNonDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND;
autoGroup = ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP;
@@ -617,26 +617,26 @@
this.blockOnAcknowledge = blockOnAcknowledge;
}
- public synchronized boolean isBlockOnPersistentSend()
+ public synchronized boolean isBlockOnDurableSend()
{
- return blockOnPersistentSend;
+ return blockOnDurableSend;
}
- public synchronized void setBlockOnPersistentSend(final boolean blockOnPersistentSend)
+ public synchronized void setBlockOnDurableSend(final boolean blockOnDurableSend)
{
checkWrite();
- this.blockOnPersistentSend = blockOnPersistentSend;
+ this.blockOnDurableSend = blockOnDurableSend;
}
- public synchronized boolean isBlockOnNonPersistentSend()
+ public synchronized boolean isBlockOnNonDurableSend()
{
- return blockOnNonPersistentSend;
+ return blockOnNonDurableSend;
}
- public synchronized void setBlockOnNonPersistentSend(final boolean blockOnNonPersistentSend)
+ public synchronized void setBlockOnNonDurableSend(final boolean blockOnNonDurableSend)
{
checkWrite();
- this.blockOnNonPersistentSend = blockOnNonPersistentSend;
+ this.blockOnNonDurableSend = blockOnNonDurableSend;
}
public synchronized boolean isAutoGroup()
@@ -1133,8 +1133,8 @@
consumerWindowSize,
producerMaxRate,
consumerMaxRate,
- blockOnNonPersistentSend,
- blockOnPersistentSend,
+ blockOnNonDurableSend,
+ blockOnDurableSend,
initialMessagePacketSize,
groupID);
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -146,9 +146,9 @@
private final int producerMaxRate;
- private final boolean blockOnNonPersistentSend;
+ private final boolean blockOnNonDurableSend;
- private final boolean blockOnPersistentSend;
+ private final boolean blockOnDurableSend;
private final int minLargeMessageSize;
@@ -197,8 +197,8 @@
final int confirmationWindowSize,
final int producerWindowSize,
final int producerMaxRate,
- final boolean blockOnNonPersistentSend,
- final boolean blockOnPersistentSend,
+ final boolean blockOnNonDurableSend,
+ final boolean blockOnDurableSend,
final boolean cacheLargeMessageClient,
final int minLargeMessageSize,
final int initialMessagePacketSize,
@@ -246,9 +246,9 @@
this.producerMaxRate = producerMaxRate;
- this.blockOnNonPersistentSend = blockOnNonPersistentSend;
+ this.blockOnNonDurableSend = blockOnNonDurableSend;
- this.blockOnPersistentSend = blockOnPersistentSend;
+ this.blockOnDurableSend = blockOnDurableSend;
this.cacheLargeMessageClient = cacheLargeMessageClient;
@@ -1521,8 +1521,8 @@
address,
maxRate == -1 ? null
: new TokenBucketLimiterImpl(maxRate, false),
- autoCommitSends && blockOnNonPersistentSend,
- autoCommitSends && blockOnPersistentSend,
+ autoCommitSends && blockOnNonDurableSend,
+ autoCommitSends && blockOnDurableSend,
autoGroup,
groupID == null ? null : new SimpleString(groupID),
minLargeMessageSize,
Modified: trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -45,8 +45,8 @@
final int consumerWindowSize,
final int producerMaxRate,
final int consumerMaxRate,
- final boolean blockOnNonPersistentSend,
- final boolean blockOnPersistentSend,
+ final boolean blockOnNonDurableSend,
+ final boolean blockOnDurableSend,
final int initialMessagePacketSize,
final String groupID) throws HornetQException;
Modified: trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -305,8 +305,8 @@
final int consumerWindowSize,
final int producerMaxRate,
final int consumerMaxRate,
- final boolean blockOnNonPersistentSend,
- final boolean blockOnPersistentSend,
+ final boolean blockOnNonDurableSend,
+ final boolean blockOnDurableSend,
final int initialMessagePacketSize,
final String groupID) throws HornetQException
{
@@ -413,8 +413,8 @@
confWindowSize,
producerWindowSize,
producerMaxRate,
- blockOnNonPersistentSend,
- blockOnPersistentSend,
+ blockOnNonDurableSend,
+ blockOnDurableSend,
cacheLargeMessageClient,
minLargeMessageSize,
initialMessagePacketSize,
Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -662,7 +662,7 @@
csf.setRetryInterval(retryInterval);
csf.setRetryIntervalMultiplier(retryIntervalMultiplier);
csf.setReconnectAttempts(reconnectAttempts);
- csf.setBlockOnPersistentSend(false);
+ csf.setBlockOnDurableSend(false);
// Must have confirmations enabled so we get send acks
Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -409,26 +409,26 @@
sessionFactory.setBlockOnAcknowledge(blockOnAcknowledge);
}
- public synchronized boolean isBlockOnNonPersistentSend()
+ public synchronized boolean isBlockOnNonDurableSend()
{
- return sessionFactory.isBlockOnNonPersistentSend();
+ return sessionFactory.isBlockOnNonDurableSend();
}
- public synchronized void setBlockOnNonPersistentSend(final boolean blockOnNonPersistentSend)
+ public synchronized void setBlockOnNonDurableSend(final boolean blockOnNonDurableSend)
{
checkWrite();
- sessionFactory.setBlockOnNonPersistentSend(blockOnNonPersistentSend);
+ sessionFactory.setBlockOnNonDurableSend(blockOnNonDurableSend);
}
- public synchronized boolean isBlockOnPersistentSend()
+ public synchronized boolean isBlockOnDurableSend()
{
- return sessionFactory.isBlockOnPersistentSend();
+ return sessionFactory.isBlockOnDurableSend();
}
- public synchronized void setBlockOnPersistentSend(final boolean blockOnPersistentSend)
+ public synchronized void setBlockOnDurableSend(final boolean blockOnDurableSend)
{
checkWrite();
- sessionFactory.setBlockOnPersistentSend(blockOnPersistentSend);
+ sessionFactory.setBlockOnDurableSend(blockOnDurableSend);
}
public synchronized boolean isAutoGroup()
Modified: trunk/src/main/org/hornetq/jms/server/JMSServerManager.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -150,8 +150,8 @@
int producerWindowSize,
int producerMaxRate,
boolean blockOnAcknowledge,
- boolean blockOnPersistentSend,
- boolean blockOnNonPersistentSend,
+ boolean blockOnDurableSend,
+ boolean blockOnNonDurableSend,
boolean autoGroup,
boolean preAcknowledge,
String loadBalancingPolicyClassName,
@@ -184,8 +184,8 @@
int producerWindowSize,
int producerMaxRate,
boolean blockOnAcknowledge,
- boolean blockOnPersistentSend,
- boolean blockOnNonPersistentSend,
+ boolean blockOnDurableSend,
+ boolean blockOnNonDurableSend,
boolean autoGroup,
boolean preAcknowledge,
String loadBalancingPolicyClassName,
Modified: trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -95,13 +95,13 @@
void setBlockOnAcknowledge(boolean blockOnAcknowledge);
- boolean isBlockOnPersistentSend();
+ boolean isBlockOnDurableSend();
- void setBlockOnPersistentSend(boolean blockOnPersistentSend);
+ void setBlockOnDurableSend(boolean blockOnDurableSend);
- boolean isBlockOnNonPersistentSend();
+ boolean isBlockOnNonDurableSend();
- void setBlockOnNonPersistentSend(boolean blockOnNonPersistentSend);
+ void setBlockOnNonDurableSend(boolean blockOnNonDurableSend);
boolean isAutoGroup();
Modified: trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -70,9 +70,9 @@
private boolean blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE;
- private boolean blockOnPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND;
+ private boolean blockOnDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND;
- private boolean blockOnNonPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
+ private boolean blockOnNonDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND;
private boolean autoGroup = ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP;
@@ -324,24 +324,24 @@
this.blockOnAcknowledge = blockOnAcknowledge;
}
- public boolean isBlockOnPersistentSend()
+ public boolean isBlockOnDurableSend()
{
- return blockOnPersistentSend;
+ return blockOnDurableSend;
}
- public void setBlockOnPersistentSend(final boolean blockOnPersistentSend)
+ public void setBlockOnDurableSend(final boolean blockOnDurableSend)
{
- this.blockOnPersistentSend = blockOnPersistentSend;
+ this.blockOnDurableSend = blockOnDurableSend;
}
- public boolean isBlockOnNonPersistentSend()
+ public boolean isBlockOnNonDurableSend()
{
- return blockOnNonPersistentSend;
+ return blockOnNonDurableSend;
}
- public void setBlockOnNonPersistentSend(final boolean blockOnNonPersistentSend)
+ public void setBlockOnNonDurableSend(final boolean blockOnNonDurableSend)
{
- this.blockOnNonPersistentSend = blockOnNonPersistentSend;
+ this.blockOnNonDurableSend = blockOnNonDurableSend;
}
public boolean isAutoGroup()
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -170,12 +170,12 @@
boolean blockOnAcknowledge = XMLConfigurationUtil.getBoolean(e,
"block-on-acknowledge",
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE);
- boolean blockOnNonPersistentSend = XMLConfigurationUtil.getBoolean(e,
- "block-on-non-persistent-send",
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND);
- boolean blockOnPersistentSend = XMLConfigurationUtil.getBoolean(e,
- "block-on-persistent-send",
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND);
+ boolean blockOnNonDurableSend = XMLConfigurationUtil.getBoolean(e,
+ "block-on-non-durable-send",
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND);
+ boolean blockOnDurableSend = XMLConfigurationUtil.getBoolean(e,
+ "block-on-durable-send",
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND);
boolean autoGroup = XMLConfigurationUtil.getBoolean(e,
"auto-group",
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP);
@@ -318,8 +318,8 @@
producerWindowSize,
producerMaxRate,
blockOnAcknowledge,
- blockOnPersistentSend,
- blockOnNonPersistentSend,
+ blockOnDurableSend,
+ blockOnNonDurableSend,
autoGroup,
preAcknowledge,
connectionLoadBalancingPolicyClassName,
@@ -353,8 +353,8 @@
producerWindowSize,
producerMaxRate,
blockOnAcknowledge,
- blockOnPersistentSend,
- blockOnNonPersistentSend,
+ blockOnDurableSend,
+ blockOnNonDurableSend,
autoGroup,
preAcknowledge,
connectionLoadBalancingPolicyClassName,
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -393,8 +393,8 @@
final int producerWindowSize,
final int producerMaxRate,
final boolean blockOnAcknowledge,
- final boolean blockOnPersistentSend,
- final boolean blockOnNonPersistentSend,
+ final boolean blockOnDurableSend,
+ final boolean blockOnNonDurableSend,
final boolean autoGroup,
final boolean preAcknowledge,
final String loadBalancingPolicyClassName,
@@ -428,8 +428,8 @@
cf.setProducerWindowSize(producerWindowSize);
cf.setProducerMaxRate(producerMaxRate);
cf.setBlockOnAcknowledge(blockOnAcknowledge);
- cf.setBlockOnPersistentSend(blockOnPersistentSend);
- cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend);
+ cf.setBlockOnDurableSend(blockOnDurableSend);
+ cf.setBlockOnNonDurableSend(blockOnNonDurableSend);
cf.setAutoGroup(autoGroup);
cf.setPreAcknowledge(preAcknowledge);
cf.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName);
@@ -465,8 +465,8 @@
final int producerWindowSize,
final int producerMaxRate,
final boolean blockOnAcknowledge,
- final boolean blockOnPersistentSend,
- final boolean blockOnNonPersistentSend,
+ final boolean blockOnDurableSend,
+ final boolean blockOnNonDurableSend,
final boolean autoGroup,
final boolean preAcknowledge,
final String loadBalancingPolicyClassName,
@@ -502,8 +502,8 @@
cf.setProducerWindowSize(producerWindowSize);
cf.setProducerMaxRate(producerMaxRate);
cf.setBlockOnAcknowledge(blockOnAcknowledge);
- cf.setBlockOnPersistentSend(blockOnPersistentSend);
- cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend);
+ cf.setBlockOnDurableSend(blockOnDurableSend);
+ cf.setBlockOnNonDurableSend(blockOnNonDurableSend);
cf.setAutoGroup(autoGroup);
cf.setPreAcknowledge(preAcknowledge);
cf.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName);
@@ -783,8 +783,8 @@
config.getProducerWindowSize(),
config.getProducerMaxRate(),
config.isBlockOnAcknowledge(),
- config.isBlockOnPersistentSend(),
- config.isBlockOnNonPersistentSend(),
+ config.isBlockOnDurableSend(),
+ config.isBlockOnNonDurableSend(),
config.isAutoGroup(),
config.isPreAcknowledge(),
config.getLoadBalancingPolicyClassName(),
@@ -818,8 +818,8 @@
config.getProducerWindowSize(),
config.getProducerMaxRate(),
config.isBlockOnAcknowledge(),
- config.isBlockOnPersistentSend(),
- config.isBlockOnNonPersistentSend(),
+ config.isBlockOnDurableSend(),
+ config.isBlockOnNonDurableSend(),
config.isAutoGroup(),
config.isPreAcknowledge(),
config.getLoadBalancingPolicyClassName(),
Modified: trunk/src/main/org/hornetq/jms/server/management/ConnectionFactoryControl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/management/ConnectionFactoryControl.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/jms/server/management/ConnectionFactoryControl.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -46,9 +46,9 @@
boolean isBlockOnAcknowledge();
- boolean isBlockOnPersistentSend();
+ boolean isBlockOnDurableSend();
- boolean isBlockOnNonPersistentSend();
+ boolean isBlockOnNonDurableSend();
boolean isPreAcknowledge();
Modified: trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -106,8 +106,8 @@
int producerWindowSize,
int producerMaxRate,
boolean blockOnAcknowledge,
- boolean blockOnPersistentSend,
- boolean blockOnNonPersistentSend,
+ boolean blockOnDurableSend,
+ boolean blockOnNonDurableSend,
boolean autoGroup,
boolean preAcknowledge,
String loadBalancingPolicyClassName,
@@ -141,8 +141,8 @@
@Parameter(name = "producerWindowSize") int producerWindowSize,
@Parameter(name = "producerMaxRate") int producerMaxRate,
@Parameter(name = "blockOnAcknowledge") boolean blockOnAcknowledge,
- @Parameter(name = "blockOnPersistentSend") boolean blockOnPersistentSend,
- @Parameter(name = "blockOnNonPersistentSend") boolean blockOnNonPersistentSend,
+ @Parameter(name = "blockOnDurableSend") boolean blockOnDurableSend,
+ @Parameter(name = "blockOnNonDurableSend") boolean blockOnNonDurableSend,
@Parameter(name = "autoGroup") boolean autoGroup,
@Parameter(name = "preAcknowledge") boolean preAcknowledge,
@Parameter(name = "loadBalancingPolicyClassName") String loadBalancingPolicyClassName,
@@ -188,8 +188,8 @@
int producerWindowSize,
int producerMaxRate,
boolean blockOnAcknowledge,
- boolean blockOnPersistentSend,
- boolean blockOnNonPersistentSend,
+ boolean blockOnDurableSend,
+ boolean blockOnNonDurableSend,
boolean autoGroup,
boolean preAcknowledge,
String loadBalancingPolicyClassName,
@@ -224,8 +224,8 @@
@Parameter(name = "producerWindowSize") int producerWindowSize,
@Parameter(name = "producerMaxRate") int producerMaxRate,
@Parameter(name = "blockOnAcknowledge") boolean blockOnAcknowledge,
- @Parameter(name = "blockOnPersistentSend") boolean blockOnPersistentSend,
- @Parameter(name = "blockOnNonPersistentSend") boolean blockOnNonPersistentSend,
+ @Parameter(name = "blockOnDurableSend") boolean blockOnDurableSend,
+ @Parameter(name = "blockOnNonDurableSend") boolean blockOnNonDurableSend,
@Parameter(name = "autoGroup") boolean autoGroup,
@Parameter(name = "preAcknowledge") boolean preAcknowledge,
@Parameter(name = "loadBalancingPolicyClassName") String loadBalancingPolicyClassName,
Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -107,14 +107,14 @@
return cf.isBlockOnAcknowledge();
}
- public boolean isBlockOnNonPersistentSend()
+ public boolean isBlockOnNonDurableSend()
{
- return cf.isBlockOnNonPersistentSend();
+ return cf.isBlockOnNonDurableSend();
}
- public boolean isBlockOnPersistentSend()
+ public boolean isBlockOnDurableSend()
{
- return cf.isBlockOnPersistentSend();
+ return cf.isBlockOnDurableSend();
}
public boolean isPreAcknowledge()
Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -234,8 +234,8 @@
final int producerWindowSize,
final int producerMaxRate,
final boolean blockOnAcknowledge,
- final boolean blockOnPersistentSend,
- final boolean blockOnNonPersistentSend,
+ final boolean blockOnDurableSend,
+ final boolean blockOnNonDurableSend,
final boolean autoGroup,
final boolean preAcknowledge,
final String loadBalancingPolicyClassName,
@@ -273,8 +273,8 @@
producerWindowSize,
producerMaxRate,
blockOnAcknowledge,
- blockOnPersistentSend,
- blockOnNonPersistentSend,
+ blockOnDurableSend,
+ blockOnNonDurableSend,
autoGroup,
preAcknowledge,
loadBalancingPolicyClassName,
@@ -311,8 +311,8 @@
final int producerWindowSize,
final int producerMaxRate,
final boolean blockOnAcknowledge,
- final boolean blockOnPersistentSend,
- final boolean blockOnNonPersistentSend,
+ final boolean blockOnDurableSend,
+ final boolean blockOnNonDurableSend,
final boolean autoGroup,
final boolean preAcknowledge,
final String loadBalancingPolicyClassName,
@@ -352,8 +352,8 @@
producerWindowSize,
producerMaxRate,
blockOnAcknowledge,
- blockOnPersistentSend,
- blockOnNonPersistentSend,
+ blockOnDurableSend,
+ blockOnNonDurableSend,
autoGroup,
preAcknowledge,
loadBalancingPolicyClassName,
@@ -411,8 +411,8 @@
final int producerWindowSize,
final int producerMaxRate,
final boolean blockOnAcknowledge,
- final boolean blockOnPersistentSend,
- final boolean blockOnNonPersistentSend,
+ final boolean blockOnDurableSend,
+ final boolean blockOnNonDurableSend,
final boolean autoGroup,
final boolean preAcknowledge,
final String loadBalancingPolicyClassName,
@@ -448,8 +448,8 @@
producerWindowSize,
producerMaxRate,
blockOnAcknowledge,
- blockOnPersistentSend,
- blockOnNonPersistentSend,
+ blockOnDurableSend,
+ blockOnNonDurableSend,
autoGroup,
preAcknowledge,
loadBalancingPolicyClassName,
@@ -486,8 +486,8 @@
final int producerWindowSize,
final int producerMaxRate,
final boolean blockOnAcknowledge,
- final boolean blockOnPersistentSend,
- final boolean blockOnNonPersistentSend,
+ final boolean blockOnDurableSend,
+ final boolean blockOnNonDurableSend,
final boolean autoGroup,
final boolean preAcknowledge,
final String loadBalancingPolicyClassName,
@@ -523,8 +523,8 @@
producerWindowSize,
producerMaxRate,
blockOnAcknowledge,
- blockOnPersistentSend,
- blockOnNonPersistentSend,
+ blockOnDurableSend,
+ blockOnNonDurableSend,
autoGroup,
preAcknowledge,
loadBalancingPolicyClassName,
Modified: trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
===================================================================
--- trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -84,9 +84,9 @@
private Boolean blockOnAcknowledge;
- private Boolean blockOnNonPersistentSend;
+ private Boolean blockOnNonDurableSend;
- private Boolean blockOnPersistentSend;
+ private Boolean blockOnDurableSend;
private Boolean autoGroup;
@@ -493,44 +493,44 @@
this.blockOnAcknowledge = blockOnAcknowledge;
}
- public Boolean isBlockOnNonPersistentSend()
+ public Boolean isBlockOnNonDurableSend()
{
if (ConnectionFactoryProperties.trace)
{
- ConnectionFactoryProperties.log.trace("isBlockOnNonPersistentSend()");
+ ConnectionFactoryProperties.log.trace("isBlockOnNonDurableSend()");
}
hasBeenUpdated = true;
- return blockOnNonPersistentSend;
+ return blockOnNonDurableSend;
}
- public void setBlockOnNonPersistentSend(final Boolean blockOnNonPersistentSend)
+ public void setBlockOnNonDurableSend(final Boolean blockOnNonDurableSend)
{
if (ConnectionFactoryProperties.trace)
{
- ConnectionFactoryProperties.log.trace("setBlockOnNonPersistentSend(" + blockOnNonPersistentSend + ")");
+ ConnectionFactoryProperties.log.trace("setBlockOnNonDurableSend(" + blockOnNonDurableSend + ")");
}
hasBeenUpdated = true;
- this.blockOnNonPersistentSend = blockOnNonPersistentSend;
+ this.blockOnNonDurableSend = blockOnNonDurableSend;
}
- public Boolean isBlockOnPersistentSend()
+ public Boolean isBlockOnDurableSend()
{
if (ConnectionFactoryProperties.trace)
{
- ConnectionFactoryProperties.log.trace("isBlockOnPersistentSend()");
+ ConnectionFactoryProperties.log.trace("isBlockOnDurableSend()");
}
hasBeenUpdated = true;
- return blockOnPersistentSend;
+ return blockOnDurableSend;
}
- public void setBlockOnPersistentSend(final Boolean blockOnPersistentSend)
+ public void setBlockOnDurableSend(final Boolean blockOnDurableSend)
{
if (ConnectionFactoryProperties.trace)
{
- ConnectionFactoryProperties.log.trace("setBlockOnPersistentSend(" + blockOnPersistentSend + ")");
+ ConnectionFactoryProperties.log.trace("setBlockOnDurableSend(" + blockOnDurableSend + ")");
}
hasBeenUpdated = true;
- this.blockOnPersistentSend = blockOnPersistentSend;
+ this.blockOnDurableSend = blockOnDurableSend;
}
public Boolean isAutoGroup()
Modified: trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java
===================================================================
--- trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -598,24 +598,24 @@
mcfProperties.setBlockOnAcknowledge(blockOnAcknowledge);
}
- public Boolean isBlockOnNonPersistentSend()
+ public Boolean isBlockOnNonDurableSend()
{
- return mcfProperties.isBlockOnNonPersistentSend();
+ return mcfProperties.isBlockOnNonDurableSend();
}
- public void setBlockOnNonPersistentSend(final Boolean blockOnNonPersistentSend)
+ public void setBlockOnNonDurableSend(final Boolean blockOnNonDurableSend)
{
- mcfProperties.setBlockOnNonPersistentSend(blockOnNonPersistentSend);
+ mcfProperties.setBlockOnNonDurableSend(blockOnNonDurableSend);
}
- public Boolean isBlockOnPersistentSend()
+ public Boolean isBlockOnDurableSend()
{
- return mcfProperties.isBlockOnPersistentSend();
+ return mcfProperties.isBlockOnDurableSend();
}
- public void setBlockOnPersistentSend(final Boolean blockOnPersistentSend)
+ public void setBlockOnDurableSend(final Boolean blockOnDurableSend)
{
- mcfProperties.setBlockOnPersistentSend(blockOnPersistentSend);
+ mcfProperties.setBlockOnDurableSend(blockOnDurableSend);
}
public Boolean isAutoGroup()
Modified: trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java
===================================================================
--- trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -753,63 +753,63 @@
}
/**
- * Get block on non persistent send
+ * Get block on non durable send
*
* @return The value
*/
- public Boolean getBlockOnNonPersistentSend()
+ public Boolean getBlockOnNonDurableSend()
{
if (HornetQResourceAdapter.trace)
{
- HornetQResourceAdapter.log.trace("getBlockOnNonPersistentSend()");
+ HornetQResourceAdapter.log.trace("getBlockOnNonDurableSend()");
}
- return raProperties.isBlockOnNonPersistentSend();
+ return raProperties.isBlockOnNonDurableSend();
}
/**
- * Set block on non persistent send
+ * Set block on non durable send
*
- * @param blockOnNonPersistentSend The value
+ * @param blockOnNonDurableSend The value
*/
- public void setBlockOnNonPersistentSend(final Boolean blockOnNonPersistentSend)
+ public void setBlockOnNonDurableSend(final Boolean blockOnNonDurableSend)
{
if (HornetQResourceAdapter.trace)
{
- HornetQResourceAdapter.log.trace("setBlockOnNonPersistentSend(" + blockOnNonPersistentSend + ")");
+ HornetQResourceAdapter.log.trace("setBlockOnNonDurableSend(" + blockOnNonDurableSend + ")");
}
- raProperties.setBlockOnNonPersistentSend(blockOnNonPersistentSend);
+ raProperties.setBlockOnNonDurableSend(blockOnNonDurableSend);
}
/**
- * Get block on persistent send
+ * Get block on durable send
*
* @return The value
*/
- public Boolean getBlockOnPersistentSend()
+ public Boolean getBlockOnDurableSend()
{
if (HornetQResourceAdapter.trace)
{
- HornetQResourceAdapter.log.trace("getBlockOnPersistentSend()");
+ HornetQResourceAdapter.log.trace("getBlockOnDurableSend()");
}
- return raProperties.isBlockOnPersistentSend();
+ return raProperties.isBlockOnDurableSend();
}
/**
- * Set block on persistent send
+ * Set block on durable send
*
- * @param blockOnPersistentSend The value
+ * @param blockOnDurableSend The value
*/
- public void setBlockOnPersistentSend(final Boolean blockOnPersistentSend)
+ public void setBlockOnDurableSend(final Boolean blockOnDurableSend)
{
if (HornetQResourceAdapter.trace)
{
- HornetQResourceAdapter.log.trace("setBlockOnPersistentSend(" + blockOnPersistentSend + ")");
+ HornetQResourceAdapter.log.trace("setBlockOnDurableSend(" + blockOnDurableSend + ")");
}
- raProperties.setBlockOnPersistentSend(blockOnPersistentSend);
+ raProperties.setBlockOnDurableSend(blockOnDurableSend);
}
/**
@@ -1421,17 +1421,17 @@
{
cf.setBlockOnAcknowledge(val);
}
- val = overrideProperties.isBlockOnNonPersistentSend() != null ? overrideProperties.isBlockOnNonPersistentSend()
- : raProperties.isBlockOnNonPersistentSend();
+ val = overrideProperties.isBlockOnNonDurableSend() != null ? overrideProperties.isBlockOnNonDurableSend()
+ : raProperties.isBlockOnNonDurableSend();
if (val != null)
{
- cf.setBlockOnNonPersistentSend(val);
+ cf.setBlockOnNonDurableSend(val);
}
- val = overrideProperties.isBlockOnPersistentSend() != null ? overrideProperties.isBlockOnPersistentSend()
- : raProperties.isBlockOnPersistentSend();
+ val = overrideProperties.isBlockOnDurableSend() != null ? overrideProperties.isBlockOnDurableSend()
+ : raProperties.isBlockOnDurableSend();
if (val != null)
{
- cf.setBlockOnPersistentSend(val);
+ cf.setBlockOnDurableSend(val);
}
val = overrideProperties.isFailoverOnServerShutdown() != null ? overrideProperties.isFailoverOnServerShutdown()
: raProperties.isFailoverOnServerShutdown();
Modified: trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml
===================================================================
--- trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml 2009-12-08 16:54:49 UTC (rev 8621)
@@ -24,8 +24,8 @@
<dups-ok-batch-size>3456</dups-ok-batch-size>
<transaction-batch-size>4567</transaction-batch-size>
<block-on-acknowledge>true</block-on-acknowledge>
- <block-on-non-persistent-send>false</block-on-non-persistent-send>
- <block-on-persistent-send>true</block-on-persistent-send>
+ <block-on-non-durable-send>false</block-on-non-durable-send>
+ <block-on-durable-send>true</block-on-durable-send>
<auto-group-id>false</auto-group-id>
<pre-acknowledge>true</pre-acknowledge>
<connection-ttl>2345</connection-ttl>
Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -1175,8 +1175,8 @@
public ClientProducer createProducer(final SimpleString address,
final int maxRate,
- final boolean blockOnNonPersistentSend,
- final boolean blockOnPersistentSend) throws HornetQException
+ final boolean blockOnNonDurableSend,
+ final boolean blockOnDurableSend) throws HornetQException
{
return null;
}
@@ -1193,8 +1193,8 @@
public ClientProducer createProducer(final String address,
final int maxRate,
- final boolean blockOnNonPersistentSend,
- final boolean blockOnPersistentSend) throws HornetQException
+ final boolean blockOnNonDurableSend,
+ final boolean blockOnDurableSend) throws HornetQException
{
return null;
}
Modified: trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -306,7 +306,7 @@
ClientSessionFactory sf = createInVMFactory();
- sf.setBlockOnNonPersistentSend(false);
+ sf.setBlockOnNonDurableSend(false);
ClientSession session = sf.createSession(false, true, true, true);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/BlockingSendTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/BlockingSendTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/client/BlockingSendTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -60,7 +60,7 @@
System.out.println("sync = " + server.getConfiguration().isJournalSyncNonTransactional());
factory = createFactory(false);
- factory.setBlockOnPersistentSend(true);
+ factory.setBlockOnDurableSend(true);
session = factory.createSession();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -81,7 +81,7 @@
try
{
messagingService.start();
- cf.setBlockOnNonPersistentSend(false);
+ cf.setBlockOnNonDurableSend(false);
int numMessage = 100;
cf.setConsumerWindowSize(numMessage * getMessageEncodeSize(addressA));
ClientSession sendSession = cf.createSession(false, true, true);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -2537,8 +2537,8 @@
if (sendBlocking)
{
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -60,8 +60,8 @@
{
ClientSessionFactory sf = createInVMFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(null, null, false, false, false, false, 0);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -208,8 +208,8 @@
server.start();
sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
session = sf.createSession(false, true, true);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/client/OrderTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/OrderTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/client/OrderTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -75,8 +75,8 @@
ClientSessionFactory sf = createNettyFactory();
- sf.setBlockOnNonPersistentSend(false);
- sf.setBlockOnPersistentSend(false);
+ sf.setBlockOnNonDurableSend(false);
+ sf.setBlockOnDurableSend(false);
sf.setBlockOnAcknowledge(true);
ClientSession session = sf.createSession(true, true, 0);
@@ -165,8 +165,8 @@
ClientSessionFactory sf = createNettyFactory();
- sf.setBlockOnNonPersistentSend(false);
- sf.setBlockOnPersistentSend(false);
+ sf.setBlockOnNonDurableSend(false);
+ sf.setBlockOnDurableSend(false);
sf.setBlockOnAcknowledge(false);
ClientSession session = sf.createSession(true, true, 0);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -102,8 +102,8 @@
{
ClientSessionFactory sf = createInVMFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
@@ -251,8 +251,8 @@
{
ClientSessionFactory sf = createInVMFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
@@ -394,8 +394,8 @@
{
ClientSessionFactory sf = createInVMFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
@@ -530,8 +530,8 @@
{
ClientSessionFactory sf = createInVMFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
ClientSession session = sf.createSession(null, null, false, false, true, false, 0);
@@ -607,8 +607,8 @@
{
ClientSessionFactory sf = createInVMFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
ClientSession session = sf.createSession(null, null, false, false, false, false, 0);
@@ -701,8 +701,8 @@
{
ClientSessionFactory sf = createInVMFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
@@ -842,8 +842,8 @@
{
ClientSessionFactory sf = createInVMFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
ClientSession session = sf.createSession(null, null, false, !transacted, true, false, 0);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -65,7 +65,7 @@
{
sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
- sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
ClientSession session = sf.createSession(false, true, true);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -89,7 +89,7 @@
public void testConsumerReceiveImmediateWithSessionStop() throws Exception
{
sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
- sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
sf.setBlockOnAcknowledge(true);
sf.setAckBatchSize(0);
@@ -122,7 +122,7 @@
private void doConsumerReceiveImmediateWithNoMessages(final boolean browser) throws Exception
{
sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
- sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
sf.setBlockOnAcknowledge(true);
sf.setAckBatchSize(0);
@@ -144,7 +144,7 @@
private void doConsumerReceiveImmediate(final boolean browser) throws Exception
{
sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
- sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
sf.setBlockOnAcknowledge(true);
sf.setAckBatchSize(0);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -36,8 +36,8 @@
service.start();
ClientSessionFactory cf = createInVMFactory();
cf.setProducerMaxRate(99);
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnNonPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnNonDurableSend(true);
ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true);
clientSession.createQueue(queueName, queueName, false);
ClientConsumer consumer = clientSession.createConsumer(queueName);
@@ -58,8 +58,8 @@
service.start();
ClientSessionFactory cf = createInVMFactory();
cf.setProducerMaxRate(99);
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnNonPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnNonDurableSend(true);
ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true);
try
{
@@ -86,8 +86,8 @@
service.start();
ClientSessionFactory cf = createInVMFactory();
cf.setProducerMaxRate(99);
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnNonPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnNonDurableSend(true);
ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true);
clientSession.createQueue(queueName, queueName, false);
ClientConsumer consumer = clientSession.createConsumer(queueName, "foo=bar");
@@ -108,8 +108,8 @@
service.start();
ClientSessionFactory cf = createInVMFactory();
cf.setProducerMaxRate(99);
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnNonPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnNonDurableSend(true);
ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true);
clientSession.createQueue(queueName, queueName, false);
try
@@ -137,8 +137,8 @@
service.start();
ClientSessionFactory cf = createInVMFactory();
cf.setProducerMaxRate(99);
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnNonPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnNonDurableSend(true);
ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true);
clientSession.createQueue(queueName, queueName, false);
ClientConsumer consumer = clientSession.createConsumer(queueName, null, true);
@@ -159,8 +159,8 @@
service.start();
ClientSessionFactory cf = createInVMFactory();
cf.setProducerMaxRate(99);
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnNonPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnNonDurableSend(true);
ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true);
clientSession.createQueue(queueName, queueName, false);
ClientConsumer consumer = clientSession.createConsumer(queueName, null, 100, 100, false);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateProducerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateProducerTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateProducerTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -34,14 +34,14 @@
service.start();
ClientSessionFactory cf = createInVMFactory();
cf.setProducerMaxRate(99);
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnNonPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnNonDurableSend(true);
ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true);
ClientProducer producer = clientSession.createProducer();
Assert.assertNull(producer.getAddress());
Assert.assertEquals(cf.getProducerMaxRate(), producer.getMaxRate());
- Assert.assertEquals(cf.isBlockOnNonPersistentSend(), producer.isBlockOnNonPersistentSend());
- Assert.assertEquals(cf.isBlockOnPersistentSend(), producer.isBlockOnPersistentSend());
+ Assert.assertEquals(cf.isBlockOnNonDurableSend(), producer.isBlockOnNonDurableSend());
+ Assert.assertEquals(cf.isBlockOnDurableSend(), producer.isBlockOnDurableSend());
Assert.assertFalse(producer.isClosed());
clientSession.close();
}
@@ -59,14 +59,14 @@
service.start();
ClientSessionFactory cf = createInVMFactory();
cf.setProducerMaxRate(99);
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnNonPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnNonDurableSend(true);
ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true);
ClientProducer producer = clientSession.createProducer("testAddress");
Assert.assertNotNull(producer.getAddress());
Assert.assertEquals(cf.getProducerMaxRate(), producer.getMaxRate());
- Assert.assertEquals(cf.isBlockOnNonPersistentSend(), producer.isBlockOnNonPersistentSend());
- Assert.assertEquals(cf.isBlockOnPersistentSend(), producer.isBlockOnPersistentSend());
+ Assert.assertEquals(cf.isBlockOnNonDurableSend(), producer.isBlockOnNonDurableSend());
+ Assert.assertEquals(cf.isBlockOnDurableSend(), producer.isBlockOnDurableSend());
Assert.assertFalse(producer.isClosed());
clientSession.close();
}
@@ -84,8 +84,8 @@
service.start();
ClientSessionFactory cf = createInVMFactory();
cf.setProducerMaxRate(99);
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnNonPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnNonDurableSend(true);
ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true);
clientSession.close();
try
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -133,8 +133,8 @@
ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
@@ -193,8 +193,8 @@
ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
@@ -243,8 +243,8 @@
ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
@@ -293,8 +293,8 @@
ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
@@ -343,8 +343,8 @@
ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
@@ -389,8 +389,8 @@
int confirmationWindowSize = RandomUtil.randomPositiveInt();
int producerMaxRate = RandomUtil.randomPositiveInt();
boolean blockOnAcknowledge = RandomUtil.randomBoolean();
- boolean blockOnPersistentSend = RandomUtil.randomBoolean();
- boolean blockOnNonPersistentSend = RandomUtil.randomBoolean();
+ boolean blockOnDurableSend = RandomUtil.randomBoolean();
+ boolean blockOnNonDurableSend = RandomUtil.randomBoolean();
boolean autoGroup = RandomUtil.randomBoolean();
boolean preAcknowledge = RandomUtil.randomBoolean();
String loadBalancingPolicyClassName = RandomUtil.randomString();
@@ -417,8 +417,8 @@
cf.setConfirmationWindowSize(confirmationWindowSize);
cf.setProducerMaxRate(producerMaxRate);
cf.setBlockOnAcknowledge(blockOnAcknowledge);
- cf.setBlockOnPersistentSend(blockOnPersistentSend);
- cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend);
+ cf.setBlockOnDurableSend(blockOnDurableSend);
+ cf.setBlockOnNonDurableSend(blockOnNonDurableSend);
cf.setAutoGroup(autoGroup);
cf.setPreAcknowledge(preAcknowledge);
cf.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName);
@@ -445,8 +445,8 @@
Assert.assertEquals(confirmationWindowSize, cf.getConfirmationWindowSize());
Assert.assertEquals(producerMaxRate, cf.getProducerMaxRate());
Assert.assertEquals(blockOnAcknowledge, cf.isBlockOnAcknowledge());
- Assert.assertEquals(blockOnPersistentSend, cf.isBlockOnPersistentSend());
- Assert.assertEquals(blockOnNonPersistentSend, cf.isBlockOnNonPersistentSend());
+ Assert.assertEquals(blockOnDurableSend, cf.isBlockOnDurableSend());
+ Assert.assertEquals(blockOnNonDurableSend, cf.isBlockOnNonDurableSend());
Assert.assertEquals(autoGroup, cf.isAutoGroup());
Assert.assertEquals(preAcknowledge, cf.isPreAcknowledge());
Assert.assertEquals(loadBalancingPolicyClassName, cf.getConnectionLoadBalancingPolicyClassName());
@@ -481,8 +481,8 @@
int confirmationWindowSize = RandomUtil.randomPositiveInt();
int producerMaxRate = RandomUtil.randomPositiveInt();
boolean blockOnAcknowledge = RandomUtil.randomBoolean();
- boolean blockOnPersistentSend = RandomUtil.randomBoolean();
- boolean blockOnNonPersistentSend = RandomUtil.randomBoolean();
+ boolean blockOnDurableSend = RandomUtil.randomBoolean();
+ boolean blockOnNonDurableSend = RandomUtil.randomBoolean();
boolean autoGroup = RandomUtil.randomBoolean();
boolean preAcknowledge = RandomUtil.randomBoolean();
String loadBalancingPolicyClassName = RandomUtil.randomString();
@@ -615,7 +615,7 @@
}
try
{
- cf.setBlockOnPersistentSend(blockOnPersistentSend);
+ cf.setBlockOnDurableSend(blockOnDurableSend);
Assert.fail("Should throw exception");
}
catch (IllegalStateException e)
@@ -624,7 +624,7 @@
}
try
{
- cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend);
+ cf.setBlockOnNonDurableSend(blockOnNonDurableSend);
Assert.fail("Should throw exception");
}
catch (IllegalStateException e)
@@ -753,8 +753,8 @@
cf.getConfirmationWindowSize();
cf.getProducerMaxRate();
cf.isBlockOnAcknowledge();
- cf.isBlockOnPersistentSend();
- cf.isBlockOnNonPersistentSend();
+ cf.isBlockOnDurableSend();
+ cf.isBlockOnNonDurableSend();
cf.isAutoGroup();
cf.isPreAcknowledge();
cf.getConnectionLoadBalancingPolicyClassName();
@@ -784,8 +784,8 @@
final int confirmationWindowSize,
final int producerMaxRate,
final boolean blockOnAcknowledge,
- final boolean blockOnPersistentSend,
- final boolean blockOnNonPersistentSend,
+ final boolean blockOnDurableSend,
+ final boolean blockOnNonDurableSend,
final boolean autoGroup,
final boolean preAcknowledge,
final String loadBalancingPolicyClassName,
@@ -825,8 +825,8 @@
Assert.assertEquals(cf.getConfirmationWindowSize(), confirmationWindowSize);
Assert.assertEquals(cf.getProducerMaxRate(), producerMaxRate);
Assert.assertEquals(cf.isBlockOnAcknowledge(), blockOnAcknowledge);
- Assert.assertEquals(cf.isBlockOnPersistentSend(), blockOnPersistentSend);
- Assert.assertEquals(cf.isBlockOnNonPersistentSend(), blockOnNonPersistentSend);
+ Assert.assertEquals(cf.isBlockOnDurableSend(), blockOnDurableSend);
+ Assert.assertEquals(cf.isBlockOnNonDurableSend(), blockOnNonDurableSend);
Assert.assertEquals(cf.isAutoGroup(), autoGroup);
Assert.assertEquals(cf.isPreAcknowledge(), preAcknowledge);
Assert.assertEquals(cf.getConnectionLoadBalancingPolicyClassName(), loadBalancingPolicyClassName);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -551,8 +551,8 @@
{
server.start();
ClientSessionFactory cf = createInVMFactory();
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnDurableSend(true);
ClientSession sendSession = cf.createSession(false, true, true);
ClientProducer cp = sendSession.createProducer(queueName);
ClientSession clientSession = cf.createSession(false, true, false);
@@ -622,8 +622,8 @@
{
server.start();
ClientSessionFactory cf = createInVMFactory();
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnDurableSend(true);
ClientSession sendSession = cf.createSession(false, true, true);
ClientProducer cp = sendSession.createProducer(queueName);
ClientSession clientSession = cf.createSession(false, true, false);
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -1104,8 +1104,8 @@
ClientSessionFactory sf = new ClientSessionFactoryImpl(serverTotc);
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sfs[node] = sf;
}
@@ -1152,8 +1152,8 @@
sf.setRetryInterval(100);
sf.setRetryIntervalMultiplier(1d);
sf.setReconnectAttempts(-1);
- sf.setBlockOnNonPersistentSend(blocking);
- sf.setBlockOnPersistentSend(blocking);
+ sf.setBlockOnNonDurableSend(blocking);
+ sf.setBlockOnDurableSend(blocking);
sfs[node] = sf;
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -134,8 +134,8 @@
sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession createSession = sf.createSession(true, true);
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -104,8 +104,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(true, true);
@@ -178,8 +178,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(true, true);
@@ -212,8 +212,8 @@
sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
session = sf.createSession(true, true);
@@ -266,8 +266,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(false, false);
@@ -339,8 +339,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(false, false);
@@ -420,8 +420,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(false, false);
@@ -501,8 +501,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(false, false);
@@ -590,8 +590,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session1 = sf.createSession(false, false);
@@ -673,8 +673,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session1 = sf.createSession(false, false);
@@ -768,8 +768,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(true, false, false);
@@ -838,8 +838,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(true, false, false);
@@ -911,8 +911,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(true, false, false);
@@ -985,8 +985,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(true, false, false);
@@ -1074,8 +1074,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session1 = sf.createSession(false, false);
@@ -1159,8 +1159,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session1 = sf.createSession(false, false);
@@ -1261,8 +1261,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session1 = sf.createSession(false, false);
@@ -1392,8 +1392,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
final int numSessions = 10;
@@ -1506,8 +1506,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(true, true);
@@ -1586,8 +1586,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(true, true);
@@ -1668,8 +1668,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
ClientSession session = sf.createSession(true, true, 0);
@@ -1761,8 +1761,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
ClientSession session = sf.createSession(true, true, 0);
@@ -1832,8 +1832,8 @@
server0Service.getRemotingService().addInterceptor(new DelayInterceptor());
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
final ClientSession session = sf.createSession(true, true, 0);
@@ -1901,8 +1901,8 @@
{
final ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
final ClientSession session = sf.createSession(false, false);
@@ -2062,8 +2062,8 @@
{
ClientSessionFactoryInternal sf = getSessionFactory();
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
final ClientSession session = sf.createSession(false, false);
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -80,7 +80,7 @@
public void internalTestPage(final boolean transacted, final boolean failBeforeConsume) throws Exception
{
ClientSessionFactoryInternal factory = getSessionFactory();
- factory.setBlockOnPersistentSend(true);
+ factory.setBlockOnDurableSend(true);
factory.setBlockOnAcknowledge(true);
ClientSession session = factory.createSession(!transacted, !transacted, 0);
Modified: trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -112,8 +112,8 @@
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
sf.setBlockOnAcknowledge(true);
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(true, true, 0);
@@ -315,8 +315,8 @@
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
sf.setBlockOnAcknowledge(true);
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
ClientSession session = sf.createSession(true, true, 0);
@@ -366,7 +366,7 @@
sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnDurableSend(true);
session = sf.createSession(false, true, true);
@@ -462,7 +462,7 @@
sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnDurableSend(true);
session = sf.createSession(false, true, true);
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -80,8 +80,8 @@
ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
@@ -144,8 +144,8 @@
ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
@@ -187,8 +187,8 @@
ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
@@ -234,8 +234,8 @@
ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
@@ -282,8 +282,8 @@
ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
@@ -330,8 +330,8 @@
ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
@@ -376,8 +376,8 @@
int confirmationWindowSize = RandomUtil.randomPositiveInt();
int producerMaxRate = RandomUtil.randomPositiveInt();
boolean blockOnAcknowledge = RandomUtil.randomBoolean();
- boolean blockOnPersistentSend = RandomUtil.randomBoolean();
- boolean blockOnNonPersistentSend = RandomUtil.randomBoolean();
+ boolean blockOnDurableSend = RandomUtil.randomBoolean();
+ boolean blockOnNonDurableSend = RandomUtil.randomBoolean();
boolean autoGroup = RandomUtil.randomBoolean();
boolean preAcknowledge = RandomUtil.randomBoolean();
String loadBalancingPolicyClassName = RandomUtil.randomString();
@@ -403,8 +403,8 @@
cf.setConfirmationWindowSize(confirmationWindowSize);
cf.setProducerMaxRate(producerMaxRate);
cf.setBlockOnAcknowledge(blockOnAcknowledge);
- cf.setBlockOnPersistentSend(blockOnPersistentSend);
- cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend);
+ cf.setBlockOnDurableSend(blockOnDurableSend);
+ cf.setBlockOnNonDurableSend(blockOnNonDurableSend);
cf.setAutoGroup(autoGroup);
cf.setPreAcknowledge(preAcknowledge);
cf.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName);
@@ -430,8 +430,8 @@
Assert.assertEquals(confirmationWindowSize, cf.getConfirmationWindowSize());
Assert.assertEquals(producerMaxRate, cf.getProducerMaxRate());
Assert.assertEquals(blockOnAcknowledge, cf.isBlockOnAcknowledge());
- Assert.assertEquals(blockOnPersistentSend, cf.isBlockOnPersistentSend());
- Assert.assertEquals(blockOnNonPersistentSend, cf.isBlockOnNonPersistentSend());
+ Assert.assertEquals(blockOnDurableSend, cf.isBlockOnDurableSend());
+ Assert.assertEquals(blockOnNonDurableSend, cf.isBlockOnNonDurableSend());
Assert.assertEquals(autoGroup, cf.isAutoGroup());
Assert.assertEquals(preAcknowledge, cf.isPreAcknowledge());
Assert.assertEquals(loadBalancingPolicyClassName, cf.getConnectionLoadBalancingPolicyClassName());
@@ -467,8 +467,8 @@
int confirmationWindowSize = RandomUtil.randomPositiveInt();
int producerMaxRate = RandomUtil.randomPositiveInt();
boolean blockOnAcknowledge = RandomUtil.randomBoolean();
- boolean blockOnPersistentSend = RandomUtil.randomBoolean();
- boolean blockOnNonPersistentSend = RandomUtil.randomBoolean();
+ boolean blockOnDurableSend = RandomUtil.randomBoolean();
+ boolean blockOnNonDurableSend = RandomUtil.randomBoolean();
boolean autoGroup = RandomUtil.randomBoolean();
boolean preAcknowledge = RandomUtil.randomBoolean();
String loadBalancingPolicyClassName = RandomUtil.randomString();
@@ -611,7 +611,7 @@
}
try
{
- cf.setBlockOnPersistentSend(blockOnPersistentSend);
+ cf.setBlockOnDurableSend(blockOnDurableSend);
Assert.fail("Should throw exception");
}
catch (IllegalStateException e)
@@ -620,7 +620,7 @@
}
try
{
- cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend);
+ cf.setBlockOnNonDurableSend(blockOnNonDurableSend);
Assert.fail("Should throw exception");
}
catch (IllegalStateException e)
@@ -759,8 +759,8 @@
cf.getConfirmationWindowSize();
cf.getProducerMaxRate();
cf.isBlockOnAcknowledge();
- cf.isBlockOnPersistentSend();
- cf.isBlockOnNonPersistentSend();
+ cf.isBlockOnDurableSend();
+ cf.isBlockOnNonDurableSend();
cf.isAutoGroup();
cf.isPreAcknowledge();
cf.getConnectionLoadBalancingPolicyClassName();
@@ -792,8 +792,8 @@
final int confirmationWindowSize,
final int producerMaxRate,
final boolean blockOnAcknowledge,
- final boolean blockOnPersistentSend,
- final boolean blockOnNonPersistentSend,
+ final boolean blockOnDurableSend,
+ final boolean blockOnNonDurableSend,
final boolean autoGroup,
final boolean preAcknowledge,
final String loadBalancingPolicyClassName,
@@ -835,8 +835,8 @@
Assert.assertEquals(cf.getConfirmationWindowSize(), confirmationWindowSize);
Assert.assertEquals(cf.getProducerMaxRate(), producerMaxRate);
Assert.assertEquals(cf.isBlockOnAcknowledge(), blockOnAcknowledge);
- Assert.assertEquals(cf.isBlockOnPersistentSend(), blockOnPersistentSend);
- Assert.assertEquals(cf.isBlockOnNonPersistentSend(), blockOnNonPersistentSend);
+ Assert.assertEquals(cf.isBlockOnDurableSend(), blockOnDurableSend);
+ Assert.assertEquals(cf.isBlockOnNonDurableSend(), blockOnNonDurableSend);
Assert.assertEquals(cf.isAutoGroup(), autoGroup);
Assert.assertEquals(cf.isPreAcknowledge(), preAcknowledge);
Assert.assertEquals(cf.getConnectionLoadBalancingPolicyClassName(), loadBalancingPolicyClassName);
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -206,8 +206,8 @@
// Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection
cf.setReconnectAttempts(0);
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnDurableSend(true);
cf.setCacheLargeMessagesClient(true);
return cf;
@@ -227,8 +227,8 @@
// Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection
cf.setReconnectAttempts(0);
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnDurableSend(true);
cf.setCacheLargeMessagesClient(true);
return cf;
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -212,8 +212,8 @@
ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
true,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -258,8 +258,8 @@
ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -82,8 +82,8 @@
ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -241,8 +241,8 @@
ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -87,8 +87,8 @@
new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- jbcf.setBlockOnPersistentSend(true);
- jbcf.setBlockOnNonPersistentSend(true);
+ jbcf.setBlockOnDurableSend(true);
+ jbcf.setBlockOnNonDurableSend(true);
// Note we set consumer window size to a value so we can verify that consumer credit re-sending
// works properly on failover
@@ -171,13 +171,13 @@
{
HornetQConnectionFactory jbcfLive = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
- jbcfLive.setBlockOnNonPersistentSend(true);
- jbcfLive.setBlockOnPersistentSend(true);
+ jbcfLive.setBlockOnNonDurableSend(true);
+ jbcfLive.setBlockOnDurableSend(true);
HornetQConnectionFactory jbcfBackup = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- jbcfBackup.setBlockOnNonPersistentSend(true);
- jbcfBackup.setBlockOnPersistentSend(true);
+ jbcfBackup.setBlockOnNonDurableSend(true);
+ jbcfBackup.setBlockOnDurableSend(true);
Connection connLive = jbcfLive.createConnection();
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -50,7 +50,7 @@
super.setUp();
cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
- cf.setBlockOnPersistentSend(true);
+ cf.setBlockOnDurableSend(true);
cf.setPreAcknowledge(true);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -51,7 +51,7 @@
super.setUp();
cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
- cf.setBlockOnPersistentSend(true);
+ cf.setBlockOnDurableSend(true);
cf.setPreAcknowledge(true);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -70,7 +70,7 @@
jmsServer.start();
jmsServer.createQueue(ExceptionListenerTest.Q_NAME, ExceptionListenerTest.Q_NAME, null, true);
cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
- cf.setBlockOnPersistentSend(true);
+ cf.setBlockOnDurableSend(true);
cf.setPreAcknowledge(true);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -158,8 +158,8 @@
ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
true, // this test needs to block on ACK
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -213,8 +213,8 @@
Assert.assertEquals(3456, cf.getDupsOKBatchSize());
Assert.assertEquals(4567, cf.getTransactionBatchSize());
Assert.assertEquals(true, cf.isBlockOnAcknowledge());
- Assert.assertEquals(false, cf.isBlockOnNonPersistentSend());
- Assert.assertEquals(true, cf.isBlockOnPersistentSend());
+ Assert.assertEquals(false, cf.isBlockOnNonDurableSend());
+ Assert.assertEquals(true, cf.isBlockOnDurableSend());
Assert.assertEquals(false, cf.isAutoGroup());
Assert.assertEquals(true, cf.isPreAcknowledge());
Assert.assertEquals(2345, cf.getConnectionTTL());
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -71,8 +71,8 @@
HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getCanonicalName()));
- jbcf.setBlockOnPersistentSend(true);
- jbcf.setBlockOnNonPersistentSend(true);
+ jbcf.setBlockOnDurableSend(true);
+ jbcf.setBlockOnNonDurableSend(true);
Connection conn = jbcf.createConnection();
@@ -98,8 +98,8 @@
HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getCanonicalName()));
- jbcf.setBlockOnPersistentSend(true);
- jbcf.setBlockOnNonPersistentSend(true);
+ jbcf.setBlockOnDurableSend(true);
+ jbcf.setBlockOnNonDurableSend(true);
Connection conn = jbcf.createConnection();
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -867,7 +867,7 @@
{
HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName()));
- cf.setBlockOnPersistentSend(true);
+ cf.setBlockOnDurableSend(true);
return cf.createConnection();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -463,8 +463,8 @@
ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
@@ -512,8 +512,8 @@
ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -107,8 +107,8 @@
final int producerWindowSize,
final int producerMaxRate,
final boolean blockOnAcknowledge,
- final boolean blockOnPersistentSend,
- final boolean blockOnNonPersistentSend,
+ final boolean blockOnDurableSend,
+ final boolean blockOnNonDurableSend,
final boolean autoGroup,
final boolean preAcknowledge,
final String loadBalancingPolicyClassName,
@@ -142,8 +142,8 @@
producerWindowSize,
producerMaxRate,
blockOnAcknowledge,
- blockOnPersistentSend,
- blockOnNonPersistentSend,
+ blockOnDurableSend,
+ blockOnNonDurableSend,
autoGroup,
preAcknowledge,
loadBalancingPolicyClassName,
@@ -178,8 +178,8 @@
final int producerWindowSize,
final int producerMaxRate,
final boolean blockOnAcknowledge,
- final boolean blockOnPersistentSend,
- final boolean blockOnNonPersistentSend,
+ final boolean blockOnDurableSend,
+ final boolean blockOnNonDurableSend,
final boolean autoGroup,
final boolean preAcknowledge,
final String loadBalancingPolicyClassName,
@@ -213,8 +213,8 @@
producerWindowSize,
producerMaxRate,
blockOnAcknowledge,
- blockOnPersistentSend,
- blockOnNonPersistentSend,
+ blockOnDurableSend,
+ blockOnNonDurableSend,
autoGroup,
preAcknowledge,
loadBalancingPolicyClassName,
@@ -398,8 +398,8 @@
final int producerWindowSize,
final int producerMaxRate,
final boolean blockOnAcknowledge,
- final boolean blockOnPersistentSend,
- final boolean blockOnNonPersistentSend,
+ final boolean blockOnDurableSend,
+ final boolean blockOnNonDurableSend,
final boolean autoGroup,
final boolean preAcknowledge,
final String loadBalancingPolicyClassName,
@@ -434,8 +434,8 @@
producerWindowSize,
producerMaxRate,
blockOnAcknowledge,
- blockOnPersistentSend,
- blockOnNonPersistentSend,
+ blockOnDurableSend,
+ blockOnNonDurableSend,
autoGroup,
preAcknowledge,
loadBalancingPolicyClassName,
@@ -471,8 +471,8 @@
final int producerWindowSize,
final int producerMaxRate,
final boolean blockOnAcknowledge,
- final boolean blockOnPersistentSend,
- final boolean blockOnNonPersistentSend,
+ final boolean blockOnDurableSend,
+ final boolean blockOnNonDurableSend,
final boolean autoGroup,
final boolean preAcknowledge,
final String loadBalancingPolicyClassName,
@@ -507,8 +507,8 @@
producerWindowSize,
producerMaxRate,
blockOnAcknowledge,
- blockOnPersistentSend,
- blockOnNonPersistentSend,
+ blockOnDurableSend,
+ blockOnNonDurableSend,
autoGroup,
preAcknowledge,
loadBalancingPolicyClassName,
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -53,8 +53,8 @@
{
HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(connectorFactory));
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnDurableSend(true);
cf.setBlockOnAcknowledge(true);
return cf.createConnection();
@@ -66,8 +66,8 @@
{
HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(connectorFactory));
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnDurableSend(true);
cf.setBlockOnAcknowledge(true);
cf.setConnectionTTL(connectionTTL);
cf.setClientFailureCheckPeriod(clientFailureCheckPeriod);
Modified: trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -153,8 +153,8 @@
if (sendingBlocking)
{
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -427,8 +427,8 @@
server.start();
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnNonDurableSend(true);
session = sf.createSession(false, true, false);
session.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -315,8 +315,8 @@
server.start();
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnNonDurableSend(true);
session = sf.createSession(false, true, false);
session.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -1286,8 +1286,8 @@
server.start();
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnNonPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnNonDurableSend(true);
session = sf.createSession(false, true, false);
session.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -153,8 +153,8 @@
// Making it synchronous, just because we want to stop sending messages as soon as the page-store becomes in
// page mode
// and we could only guarantee that by setting it to synchronous
- sf.setBlockOnNonPersistentSend(true);
- sf.setBlockOnPersistentSend(true);
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
sf.setBlockOnAcknowledge(true);
ClientSession session = sf.createSession(null, null, false, !transacted, !transacted, false, 0);
Modified: trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -97,8 +97,8 @@
// Making it synchronous, just because we want to stop sending messages as soon as the page-store becomes in
// page mode
// and we could only guarantee that by setting it to synchronous
- sf.setBlockOnNonPersistentSend(blocking);
- sf.setBlockOnPersistentSend(blocking);
+ sf.setBlockOnNonDurableSend(blocking);
+ sf.setBlockOnDurableSend(blocking);
sf.setBlockOnAcknowledge(blocking);
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
Modified: trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -70,8 +70,8 @@
ClientSessionFactory factory = createInVMFactory();
- factory.setBlockOnPersistentSend(true);
- factory.setBlockOnNonPersistentSend(true);
+ factory.setBlockOnDurableSend(true);
+ factory.setBlockOnNonDurableSend(true);
factory.setMinLargeMessageSize(1024 * 1024);
final ClientSession session = factory.createSession(false, true, true);
Modified: trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -69,8 +69,8 @@
String queue = RandomUtil.randomString();
ClientSessionFactory csf = new ClientSessionFactoryImpl(getConnectorTransportConfiguration(true));
- csf.setBlockOnNonPersistentSend(false);
- csf.setBlockOnPersistentSend(false);
+ csf.setBlockOnNonDurableSend(false);
+ csf.setBlockOnDurableSend(false);
ClientSession session = null;
if (transactional)
{
Modified: trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -487,7 +487,7 @@
securityRepository.addMatch(SecurityTest.addressA, roles);
securityManager.addRole("auser", "arole");
ClientSessionFactory cf = createInVMFactory();
- cf.setBlockOnNonPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
session.createQueue(SecurityTest.addressA, SecurityTest.queueA, true);
ClientProducer cp = session.createProducer(SecurityTest.addressA);
@@ -521,7 +521,7 @@
securityRepository.addMatch(SecurityTest.addressA, roles);
securityManager.addRole("auser", "arole");
ClientSessionFactory cf = createInVMFactory();
- cf.setBlockOnNonPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
session.createQueue(SecurityTest.addressA, SecurityTest.queueA, true);
ClientProducer cp = session.createProducer(SecurityTest.addressA);
@@ -926,7 +926,7 @@
securityRepository.addMatch(configuration.getManagementAddress().toString(), roles);
securityManager.addRole("auser", "arole");
ClientSessionFactory cf = createInVMFactory();
- cf.setBlockOnNonPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1);
ClientProducer cp = session.createProducer(configuration.getManagementAddress());
cp.send(session.createClientMessage(false));
@@ -1155,8 +1155,8 @@
ClientSession frankConnection = null;
ClientSession samConnection = null;
ClientSessionFactory factory = createInVMFactory();
- factory.setBlockOnNonPersistentSend(true);
- factory.setBlockOnPersistentSend(true);
+ factory.setBlockOnNonDurableSend(true);
+ factory.setBlockOnDurableSend(true);
ClientSession adminSession = factory.createSession("all", "all", false, true, true, false, -1);
String genericQueueName = "genericQueue";
@@ -1293,8 +1293,8 @@
ClientSession frankConnection = null;
ClientSession samConnection = null;
ClientSessionFactory factory = createInVMFactory();
- factory.setBlockOnNonPersistentSend(true);
- factory.setBlockOnPersistentSend(true);
+ factory.setBlockOnNonDurableSend(true);
+ factory.setBlockOnDurableSend(true);
ClientSession adminSession = factory.createSession("all", "all", false, true, true, false, -1);
String genericQueueName = "genericQueue";
Modified: trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -434,7 +434,7 @@
server.start();
sf = createInVMFactory();
- sf.setBlockOnPersistentSend(false);
+ sf.setBlockOnDurableSend(false);
sf.setBlockOnAcknowledge(false);
ClientSession sess = sf.createSession();
Modified: trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -280,8 +280,8 @@
sf = createInVMFactory();
sf.setBlockOnAcknowledge(false);
- sf.setBlockOnNonPersistentSend(false);
- sf.setBlockOnPersistentSend(false);
+ sf.setBlockOnNonDurableSend(false);
+ sf.setBlockOnDurableSend(false);
ClientSession sess = sf.createSession();
Modified: trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -188,9 +188,9 @@
sf = createNettyFactory();
- sf.setBlockOnPersistentSend(false);
+ sf.setBlockOnDurableSend(false);
- sf.setBlockOnNonPersistentSend(false);
+ sf.setBlockOnNonDurableSend(false);
sf.setBlockOnAcknowledge(false);
Modified: trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -144,7 +144,7 @@
private void addEmptyTransaction(final Xid xid) throws HornetQException, XAException
{
ClientSessionFactory sf = createInVMFactory();
- sf.setBlockOnNonPersistentSend(false);
+ sf.setBlockOnNonDurableSend(false);
sf.setBlockOnAcknowledge(false);
ClientSession session = sf.createSession(true, false, false);
session.start(xid, XAResource.TMNOFLAGS);
@@ -157,7 +157,7 @@
private void checkEmptyXID(final Xid xid) throws HornetQException, XAException
{
ClientSessionFactory sf = createInVMFactory();
- sf.setBlockOnNonPersistentSend(false);
+ sf.setBlockOnNonDurableSend(false);
sf.setBlockOnAcknowledge(false);
ClientSession session = sf.createSession(true, false, false);
@@ -368,7 +368,7 @@
server.start();
sf = createNettyFactory();
- sf.setBlockOnPersistentSend(false);
+ sf.setBlockOnDurableSend(false);
sf.setBlockOnAcknowledge(false);
ClientSession sess = sf.createSession();
Modified: trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -68,8 +68,8 @@
ClientSessionFactory factory = createInVMFactory();
factory.setBlockOnAcknowledge(true);
- factory.setBlockOnPersistentSend(false);
- factory.setBlockOnNonPersistentSend(false);
+ factory.setBlockOnDurableSend(false);
+ factory.setBlockOnNonDurableSend(false);
ClientSession session = null;
try
Modified: trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -160,8 +160,8 @@
HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName()));
// Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection
cf.setReconnectAttempts(0);
- cf.setBlockOnNonPersistentSend(true);
- cf.setBlockOnPersistentSend(true);
+ cf.setBlockOnNonDurableSend(true);
+ cf.setBlockOnDurableSend(true);
return cf;
}
@@ -232,8 +232,8 @@
};
// Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection
failingSourceCF.setReconnectAttempts(0);
- failingSourceCF.setBlockOnNonPersistentSend(true);
- failingSourceCF.setBlockOnPersistentSend(true);
+ failingSourceCF.setBlockOnNonDurableSend(true);
+ failingSourceCF.setBlockOnDurableSend(true);
ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF);
ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory());
@@ -421,8 +421,8 @@
};
// Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection
failingSourceCF.setReconnectAttempts(0);
- failingSourceCF.setBlockOnNonPersistentSend(true);
- failingSourceCF.setBlockOnPersistentSend(true);
+ failingSourceCF.setBlockOnNonDurableSend(true);
+ failingSourceCF.setBlockOnDurableSend(true);
ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF);
ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory());
@@ -481,8 +481,8 @@
};
// Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection
failingSourceCF.setReconnectAttempts(0);
- failingSourceCF.setBlockOnNonPersistentSend(true);
- failingSourceCF.setBlockOnPersistentSend(true);
+ failingSourceCF.setBlockOnNonDurableSend(true);
+ failingSourceCF.setBlockOnDurableSend(true);
ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF);
ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory());
Modified: trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -91,7 +91,8 @@
Assert.assertEquals(factory.getProducerMaxRate(), ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE);
Assert.assertEquals(factory.getConfirmationWindowSize(),
ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE);
- Assert.assertEquals(factory.getReconnectAttempts(), ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS);
+ // by default, reconnect attempts is set to -1
+ Assert.assertEquals(-1, factory.getReconnectAttempts());
Assert.assertEquals(factory.getRetryInterval(), ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL);
Assert.assertEquals(factory.getRetryIntervalMultiplier(),
ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER);
@@ -101,9 +102,9 @@
Assert.assertEquals(factory.getTransactionBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE);
Assert.assertEquals(factory.isAutoGroup(), ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP);
Assert.assertEquals(factory.isBlockOnAcknowledge(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE);
- Assert.assertEquals(factory.isBlockOnNonPersistentSend(),
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND);
- Assert.assertEquals(factory.isBlockOnPersistentSend(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND);
+ Assert.assertEquals(factory.isBlockOnNonDurableSend(),
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND);
+ Assert.assertEquals(factory.isBlockOnDurableSend(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND);
Assert.assertEquals(factory.isFailoverOnServerShutdown(),
ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN);
Assert.assertEquals(factory.isPreAcknowledge(), ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE);
@@ -144,7 +145,8 @@
Assert.assertEquals(factory.getProducerMaxRate(), ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE);
Assert.assertEquals(factory.getConfirmationWindowSize(),
ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE);
- Assert.assertEquals(factory.getReconnectAttempts(), ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS);
+ // by default, reconnect attempts is set to -1
+ Assert.assertEquals(-1, factory.getReconnectAttempts());
Assert.assertEquals(factory.getRetryInterval(), ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL);
Assert.assertEquals(factory.getRetryIntervalMultiplier(),
ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER);
@@ -154,9 +156,9 @@
Assert.assertEquals(factory.getTransactionBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE);
Assert.assertEquals(factory.isAutoGroup(), ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP);
Assert.assertEquals(factory.isBlockOnAcknowledge(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE);
- Assert.assertEquals(factory.isBlockOnNonPersistentSend(),
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND);
- Assert.assertEquals(factory.isBlockOnPersistentSend(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND);
+ Assert.assertEquals(factory.isBlockOnNonDurableSend(),
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND);
+ Assert.assertEquals(factory.isBlockOnDurableSend(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND);
Assert.assertEquals(factory.isFailoverOnServerShutdown(),
ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN);
Assert.assertEquals(factory.isPreAcknowledge(), ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE);
@@ -169,8 +171,8 @@
ra.setConnectorClassName(InVMConnector.class.getName());
ra.setAutoGroup(!ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP);
ra.setBlockOnAcknowledge(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE);
- ra.setBlockOnNonPersistentSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND);
- ra.setBlockOnPersistentSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND);
+ ra.setBlockOnNonDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND);
+ ra.setBlockOnDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND);
ra.setCallTimeout(1l);
ra.setClientFailureCheckPeriod(2l);
ra.setClientID("myid");
@@ -217,9 +219,9 @@
Assert.assertEquals(factory.getTransactionBatchSize(), 18);
Assert.assertEquals(factory.isAutoGroup(), !ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP);
Assert.assertEquals(factory.isBlockOnAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE);
- Assert.assertEquals(factory.isBlockOnNonPersistentSend(),
- !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND);
- Assert.assertEquals(factory.isBlockOnPersistentSend(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND);
+ Assert.assertEquals(factory.isBlockOnNonDurableSend(),
+ !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND);
+ Assert.assertEquals(factory.isBlockOnDurableSend(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND);
Assert.assertEquals(factory.isFailoverOnServerShutdown(),
!ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN);
Assert.assertEquals(factory.isPreAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE);
@@ -233,8 +235,8 @@
ConnectionFactoryProperties connectionFactoryProperties = new ConnectionFactoryProperties();
connectionFactoryProperties.setAutoGroup(!ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP);
connectionFactoryProperties.setBlockOnAcknowledge(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE);
- connectionFactoryProperties.setBlockOnNonPersistentSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND);
- connectionFactoryProperties.setBlockOnPersistentSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND);
+ connectionFactoryProperties.setBlockOnNonDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND);
+ connectionFactoryProperties.setBlockOnDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND);
connectionFactoryProperties.setCallTimeout(1l);
connectionFactoryProperties.setClientFailureCheckPeriod(2l);
connectionFactoryProperties.setClientID("myid");
@@ -281,9 +283,9 @@
Assert.assertEquals(factory.getTransactionBatchSize(), 18);
Assert.assertEquals(factory.isAutoGroup(), !ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP);
Assert.assertEquals(factory.isBlockOnAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE);
- Assert.assertEquals(factory.isBlockOnNonPersistentSend(),
- !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND);
- Assert.assertEquals(factory.isBlockOnPersistentSend(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND);
+ Assert.assertEquals(factory.isBlockOnNonDurableSend(),
+ !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND);
+ Assert.assertEquals(factory.isBlockOnDurableSend(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND);
Assert.assertEquals(factory.isFailoverOnServerShutdown(),
!ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN);
Assert.assertEquals(factory.isPreAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE);
Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2009-12-08 15:37:42 UTC (rev 8620)
+++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2009-12-08 16:54:49 UTC (rev 8621)
@@ -191,8 +191,8 @@
ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
- ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
15 years, 3 months
- 1
- 0
JBoss hornetq SVN: r8620 - trunk/src/main/org/hornetq/core/client.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-12-08 10:37:42 -0500 (Tue, 08 Dec 2009)
New Revision: 8620
Modified:
trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java
Log:
HORNETQ-186: fill in Javadocs for core API
* documented ClientSessionFactory API
Modified: trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java 2009-12-08 14:12:26 UTC (rev 8619)
+++ trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java 2009-12-08 15:37:42 UTC (rev 8620)
@@ -17,30 +17,115 @@
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.exception.HornetQException;
+import org.hornetq.core.message.impl.MessageImpl;
import org.hornetq.core.remoting.Interceptor;
import org.hornetq.utils.Pair;
/**
- * A ClientSessionFactory
+ * A ClientSessionFactory is the entry point to create and configure HornetQ resources to produce and consume messages.
*
* @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
*/
public interface ClientSessionFactory
{
+ /**
+ * Create a session with XA transaction semantics.
+ *
+ * @return a ClientSession with XA transaction semantics
+ *
+ * @throws HornetQException if an exception occurs while creating the session
+ */
ClientSession createXASession() throws HornetQException;
+ /**
+ * Create a <em>transacted</em> session.
+ *
+ * It is up to the client to commit when sending and acknowledging messages.
+
+ * @return a transacted ClientSession
+ * @throws HornetQException if an exception occurs while creating the session
+ *
+ * @see ClientSession#commit()
+ */
ClientSession createTransactedSession() throws HornetQException;
+
+ /**
+ * Create a <em>non-transacted</em> session.
+ *
+ * Message sends and acknowledgments are automatically committed by the session. <em>This does not
+ * mean that messages are automatically acknowledged</em>, only that when messages are acknowledged,
+ * the session will automatically commit the transaction containing the acknowledgments.
+
+ * @return a non-transacted ClientSession
+ * @throws HornetQException if an exception occurs while creating the session
+ */
ClientSession createSession() throws HornetQException;
+ /**
+ * Create a session.
+ *
+ * @param autoCommitSends <code>true</code> to automatically commit message sends, <code>false</code> to commit manually
+ * @param autoCommitAcks <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually
+ * @return a ClientSession
+ * @throws HornetQException if an exception occurs while creating the session
+ */
ClientSession createSession(boolean autoCommitSends, boolean autoCommitAcks) throws HornetQException;
+ /**
+ * Create a session.
+ *
+ * @param autoCommitSends <code>true</code> to automatically commit message sends, <code>false</code> to commit manually
+ * @param autoCommitAcks <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually
+ * @param ackBatchSize the batch size of the acknowledgements
+ * @return a ClientSession
+ * @throws HornetQException if an exception occurs while creating the session
+ */
ClientSession createSession(boolean autoCommitSends, boolean autoCommitAcks, int ackBatchSize) throws HornetQException;
+ /**
+ * Create a session.
+ *
+ * @param xa wether the session support XA transaction semantic or not
+ * @param autoCommitSends <code>true</code> to automatically commit message sends, <code>false</code> to commit manually
+ * @param autoCommitAcks <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually
+ * @return a ClientSession
+ * @throws HornetQException if an exception occurs while creating the session
+ */
ClientSession createSession(boolean xa, boolean autoCommitSends, boolean autoCommitAcks) throws HornetQException;
+ /**
+ * Create a session.
+ *
+ * It is possible to <em>pre-acknowledge messages on the server</em> so that the client can avoid additional network trip
+ * to the server to acknowledge messages. While this increase performance, this does not guarantee delivery (as messages
+ * can be lost after being pre-acknowledged on the server). Use with caution if your application design permits it.
+ *
+ * @param xa wether the session support XA transaction semantic or not
+ * @param autoCommitSends <code>true</code> to automatically commit message sends, <code>false</code> to commit manually
+ * @param autoCommitAcks <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually
+ * @param preAcknowledge <code>true</code> to pre-acknowledge messages on the server, <code>false</code> to let the client acknowledge the messages
+ * @return a ClientSession
+ * @throws HornetQException if an exception occurs while creating the session
+ */
ClientSession createSession(boolean xa, boolean autoCommitSends, boolean autoCommitAcks, boolean preAcknowledge) throws HornetQException;
+ /**
+ * Create an <em>authenticated</em> session.
+ *
+ * It is possible to <em>pre-acknowledge messages on the server</em> so that the client can avoid additional network trip
+ * to the server to acknowledge messages. While this increase performance, this does not guarantee delivery (as messages
+ * can be lost after being pre-acknowledged on the server). Use with caution if your application design permits it.
+ *
+ * @param username the user name
+ * @param password the user password
+ * @param xa whether the session support XA transaction semantic or not
+ * @param autoCommitSends <code>true</code> to automatically commit message sends, <code>false</code> to commit manually
+ * @param autoCommitAcks <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually
+ * @param preAcknowledge <code>true</code> to pre-acknowledge messages on the server, <code>false</code> to let the client acknowledge the messages
+ * @return a ClientSession
+ * @throws HornetQException if an exception occurs while creating the session
+ */
ClientSession createSession(String username,
String password,
boolean xa,
@@ -49,64 +134,289 @@
boolean preAcknowledge,
int ackBatchSize) throws HornetQException;
+ /**
+ * Return the list of <em>live - backup</em> connectors pairs configured
+ * that sessions created by this factory will use to connect
+ * to HornetQ servers or <code>null</code> if the factory is using discovery group.
+ *
+ * The backup configuration (returned by {@link org.hornetq.utils.Pair#b}) can be <code>null</code> if there is no
+ * backup for the corresponding live configuration (returned by {@link org.hornetq.utils.Pair#a})
+ *
+ * @return a list of pair of TransportConfiguration corresponding to the live - backup nodes
+ */
List<Pair<TransportConfiguration, TransportConfiguration>> getStaticConnectors();
+ /**
+ * Set the static list of live - backup connectors pairs that sessions created by this factory will use to connect
+ * to HornetQ servers.
+ *
+ * The backup configuration (returned by {@link Pair#b}) can be <code>null</code> if there is no
+ * backup for the corresponding live configuration (returned by {@link Pair#a})
+ *
+ * @param staticConnectors a list of pair of TransportConfiguration corresponding to the live - backup nodes
+ */
void setStaticConnectors(List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors);
+ /**
+ * Return the period used to check if a client has failed to receive pings from the server.
+ *
+ * Period is in milliseconds, default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_CLIENT_FAILURE_CHECK_PERIOD}.
+ *
+ * @return the period used to check if a client has failed to receive pings from the server
+ */
long getClientFailureCheckPeriod();
+ /**
+ * Set the period (in milliseconds) used to check if a client has failed to receive pings from the server.
+ *
+ * Value must be -1 (to disable) or greater than 0.
+ *
+ * @param clientFailureCheckPeriod the period to check failure
+ */
void setClientFailureCheckPeriod(long clientFailureCheckPeriod);
+ /**
+ * When <code>true</code>, consumers created through this factory will create temporary files to cache large messages.
+ *
+ * There is 1 temporary file created for each large message.
+ *
+ * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_CACHE_LARGE_MESSAGE_CLIENT}.
+ *
+ * @return <code>true</code> if consumers created through this factory will cache large messages in temporary files, <code>false</code> else.
+ */
boolean isCacheLargeMessagesClient();
+ /**
+ * Set wether large messages received by consumers created through this factory will be cached in temporary files or not.
+ *
+ * @param cached <code>true</code> to cache large messages in temporary files, <code>false</code> else
+ */
void setCacheLargeMessagesClient(boolean cached);
+ /**
+ * Return the connection <em>time-to-live</em>.
+ * This TTL determines how long the server will keep a connection alive in the absence of any data arriving from the client.
+ *
+ * Value is in milliseconds, default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_CONNECTION_TTL}.
+ *
+ * @return the connection time-to-live in milliseconds
+ */
long getConnectionTTL();
+ /**
+ * Set this factory's connections <em>time-to-live</em>.
+ *
+ * Value must be -1 (to disable) or greater or equals to 0.
+ *
+ * @param connectionTTL period in milliseconds
+ */
void setConnectionTTL(long connectionTTL);
+ /**
+ * Returns the blocking calls timeout.
+ *
+ * If client's blocking calls to the server take more than this timeout, the call will throw a {@link HornetQException} with the code {@link HornetQException#CONNECTION_TIMEDOUT}.
+ * Value is in milliseconds, default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_CALL_TIMEOUT}.
+ *
+ * @return the blocking calls timeout
+ */
long getCallTimeout();
+ /**
+ * Set the blocking call timeout.
+ *
+ * Value must be greater or equals to 0
+ *
+ * @param callTimeout blocking call timeout in milliseconds
+ */
void setCallTimeout(long callTimeout);
+ /**
+ * Return the large message size threshold.
+ *
+ * Messages whose size is if greater than this value will be handled as <em>large messages</em>.
+ *
+ * Value is in bytes, default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_MIN_LARGE_MESSAGE_SIZE}.
+ *
+ * @return the message size threshold to treat messages as large messages.
+ */
int getMinLargeMessageSize();
+ /**
+ * Set the large message size threshold.
+ *
+ * Value must be greater than 0.
+ *
+ * @param minLargeMessageSize large message size threshold in bytes
+ */
void setMinLargeMessageSize(int minLargeMessageSize);
+ /**
+ * Return the window size for flow control of the consumers created through this factory.
+ *
+ * Value is in bytes, default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_CONSUMER_WINDOW_SIZE}.
+ *
+ * @return the window size used for consumer flow control
+ */
int getConsumerWindowSize();
+ /**
+ * Set the window size for flow control of the consumers created through this factory.
+ *
+ * Value must be -1 (to disable flow control), 0 (to not buffer any messages) or greater than 0 (to set the maximum size of the buffer)
+ *
+ * @param consumerWindowSize window size (in bytes) used for consumer flow control
+ */
void setConsumerWindowSize(int consumerWindowSize);
+ /**
+ * Return the maximum rate of message consumption for consumers created through this factory.
+ *
+ * This value controls the rate at which a consumer can consume messages. A consumer will never consume messages at a rate faster than the rate specified.
+ *
+ * Value is -1 (to disable) or a positive integer corresponding to the maximum desired message consumption rate specified in units of messages per second.
+ * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_CONSUMER_MAX_RATE}.
+ *
+ * @return the consumer max rate
+ */
int getConsumerMaxRate();
+ /**
+ * Set the maximum rate of message consumption for consumers created through this factory.
+ *
+ * Value must -1 (to disable) or a positive integer corresponding to the maximum desired message consumption rate specified in units of messages per second.
+ *
+ * @param consumerMaxRate maximum rate of message consumption (in messages per seconds)
+ */
void setConsumerMaxRate(int consumerMaxRate);
+ /**
+ * Return the size for the confirmation window of clients using this factory.
+ *
+ * Value is in bytes or -1 (to disable the window). Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_CONFIRMATION_WINDOW_SIZE}.
+ *
+ * @return the size for the confirmation window of clients using this factory
+ */
int getConfirmationWindowSize();
+ /**
+ * Set the size for the confirmation window buffer of clients using this factory.
+ *
+ * Value must be -1 (to disable the window) or greater than 0.
+
+ * @param confirmationWindowSize size of the confirmation window (in bytes)
+ */
void setConfirmationWindowSize(int confirmationWindowSize);
+ /**
+ * Return the window size for flow control of the producers created through this factory.
+ *
+ * Value must be -1 (to disable flow control) or greater than 0 to determine the maximum amount of bytes at any give time (to prevent overloading the connection).
+ * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_PRODUCER_WINDOW_SIZE}.
+ *
+ * @return the window size for flow control of the producers created through this factory.
+ */
int getProducerWindowSize();
+ /**
+ * Return the window size for flow control of the producers created through this factory.
+ *
+ * Value must be -1 (to disable flow control) or greater than 0.
+ *
+ * @param producerWindowSize window size (in bytest) for flow control of the producers created through this factory.
+ */
void setProducerWindowSize(int producerWindowSize);
+ /**
+ * Return the maximum rate of message production for producers created through this factory.
+ *
+ * This value controls the rate at which a producer can produce messages. A producer will never produce messages at a rate faster than the rate specified.
+ *
+ * Value is -1 (to disable) or a positive integer corresponding to the maximum desired message production rate specified in units of messages per second.
+ * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_PRODUCER_MAX_RATE}.
+ *
+ * @return maximum rate of message production (in messages per seconds)
+ */
int getProducerMaxRate();
+ /**
+ * Set the maximum rate of message production for producers created through this factory.
+ *
+ * Value must -1 (to disable) or a positive integer corresponding to the maximum desired message production rate specified in units of messages per second.
+ *
+ * @param producerMaxRate maximum rate of message production (in messages per seconds)
+ */
void setProducerMaxRate(int producerMaxRate);
+ /**
+ * Return whether consumers created through this factory will block while sending message acknowledgements or do it asynchronously.
+ *
+ * If the consumer are configured to send message acknowledgement asynchronously, you can set a SendAcknowledgementHandler on the ClientSession
+ * to be notified once the acknowledgement has been handled by the server.
+ *
+ * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_ACKNOWLEDGE}.
+ *
+ * @return whether consumers will block while sending message acknowledgements or do it asynchronously
+ */
boolean isBlockOnAcknowledge();
+ /**
+ * Set whether consumers created through this factory will block while sending message acknowledgements or do it asynchronously.
+ *
+ * @param blockOnAcknowledge <code>true</code> to block when sending message acknowledgements or <code>false</code> to send them asynchronously
+ */
void setBlockOnAcknowledge(boolean blockOnAcknowledge);
+ /**
+ * Return whether producers created through this factory will block while sending <em>persistent</em> messages or do it asynchronously.
+ *
+ * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_PERSISTENT_SEND}.
+ *
+ * @return whether producers will block while sending persistent messages or do it asynchronously
+ */
boolean isBlockOnPersistentSend();
+ /**
+ * Set whether producers created through this factory will block while sending <em>persistent</em> messages or do it asynchronously.
+ *
+ * @param blockOnPersistentSend <code>true</code> to block when sending persistent messages or <code>false</code> to send them asynchronously
+ */
void setBlockOnPersistentSend(boolean blockOnPersistentSend);
+ /**
+ * Return whether producers created through this factory will block while sending <em>non-persistent</em> messages or do it asynchronously.
+ *
+ * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND}.
+ *
+ * @return whether producers will block while sending non-persistent messages or do it asynchronously
+ */
boolean isBlockOnNonPersistentSend();
+ /**
+ * Set whether producers created through this factory will block while sending <em>non-persistent</em> messages or do it asynchronously.
+ *
+ * @param blockOnNonPersistentSend <code>true</code> to block when sending non-persistent messages or <code>false</code> to send them asynchronously
+ */
void setBlockOnNonPersistentSend(boolean blockOnNonPersistentSend);
+ /**
+ * Return whether producers created through this factory will automatically
+ * assign a group ID to the messages they sent.
+ *
+ * if <code>true</code>, the random unique group ID is created set on each message for the property
+ * {@value MessageImpl#HDR_GROUP_ID}.
+ * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_AUTO_GROUP}.
+ *
+ * @return whether producers will automatically assign a group ID to their messages
+ */
boolean isAutoGroup();
+ /**
+ * Set whether producers created through this factory will automatically
+ * assign a group ID to the messages they sent.
+ *
+ * @param autoGroup <code>true</code> to automatically assign a group ID to each messages sent through this factory, <code>false</code> else
+ */
void setAutoGroup(boolean autoGroup);
boolean isPreAcknowledge();
15 years, 3 months
- 1
- 0
JBoss hornetq SVN: r8619 - in trunk: src/main/org/hornetq/ra and 1 other directory.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2009-12-08 09:12:26 -0500 (Tue, 08 Dec 2009)
New Revision: 8619
Modified:
trunk/docs/user-manual/en/appserver-integration.xml
trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
Log:
reconnect attemots now -1 by default for the ra. updated docs also
Modified: trunk/docs/user-manual/en/appserver-integration.xml
===================================================================
--- trunk/docs/user-manual/en/appserver-integration.xml 2009-12-08 10:36:45 UTC (rev 8618)
+++ trunk/docs/user-manual/en/appserver-integration.xml 2009-12-08 14:12:26 UTC (rev 8619)
@@ -375,7 +375,13 @@
be left unchanged. This is the HornetQ resource adapter class.</para>
<para>After that there is a list of configuration properties. This will be where most of
the configuration is done. The first 2 configure the transport used by the adapter
- and the rest configure the connection itself.</para>
+ and the rest configure the connection factory itself.<note><para>All connection
+ factory properties will use the defaults when not provided. This is accept
+ for the <literal>reconnectAttempts</literal> which will default to -1 which
+ signifies that the connection should attempt to reconnect on connection
+ failure indefinately. This is only used when the adapter is configured to
+ connect to a remote server as an InVM connector can never
+ fail.</para></note></para>
<para>The following table explains what each property is for.</para>
<table frame="topbot" border="2">
<title>Global Configuration Properties</title>
@@ -541,7 +547,7 @@
<entry>AutoGroup</entry>
<entry>boolean</entry>
<entry>If true then auto group messages</entry>
- </row>
+ </row>
<row>
<entry>PreAcknowledge</entry>
<entry>boolean</entry>
@@ -549,6 +555,11 @@
consumer</entry>
</row>
<row>
+ <entry>reconnectAttempts</entry>
+ <entry>Integer</entry>
+ <entry>How attemts to try at reconnecting, default is -1</entry>
+ </row>
+ <row>
<entry>RetryInterval</entry>
<entry>long</entry>
<entry>How long to wait , in milli seconds, before retrying a failed
@@ -642,7 +653,6 @@
url="http://www.jboss.org/file-access/default/members/jbossas/freezone/docs/Cl..."
>JBoss Application Server clustering documentation</ulink></para>
</section>
-
<section id="xa-recovery">
<title>XA Recovery</title>
<para><emphasis>XA recovery</emphasis> deals with system or application failures to ensure
Modified: trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
===================================================================
--- trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2009-12-08 10:36:45 UTC (rev 8618)
+++ trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2009-12-08 14:12:26 UTC (rev 8619)
@@ -96,7 +96,7 @@
private Double retryIntervalMultiplier;
- private Integer reconnectAttempts;
+ private Integer reconnectAttempts = -1;
private Boolean failoverOnServerShutdown;
15 years, 3 months
- 1
- 0
JBoss hornetq SVN: r8618 - in trunk/examples/core/perf: server0 and 1 other directories.
by do-not-reply＠jboss.org
Author: timfox
Date: 2009-12-08 05:36:45 -0500 (Tue, 08 Dec 2009)
New Revision: 8618
Modified:
trunk/examples/core/perf/perf.properties
trunk/examples/core/perf/server0/hornetq-configuration.xml
trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java
trunk/examples/core/perf/src/org/hornetq/core/example/PerfParams.java
Log:
added send acks option to perf test
Modified: trunk/examples/core/perf/perf.properties
===================================================================
--- trunk/examples/core/perf/perf.properties 2009-12-08 10:23:43 UTC (rev 8617)
+++ trunk/examples/core/perf/perf.properties 2009-12-08 10:36:45 UTC (rev 8618)
@@ -1,5 +1,5 @@
-num-messages=1000000
-num-warmup-messages=0
+num-messages=100000
+num-warmup-messages=1000
message-size=1024
durable=false
transacted=false
@@ -12,9 +12,10 @@
port=5445
tcp-buffer=2048576
tcp-no-delay=false
-confirmation-window=-1
+confirmation-window=1048576
producer-window=1048576
consumer-window=1048576
pre-ack=false
block-ack=false
block-persistent=false
+use-send-acks=true
Modified: trunk/examples/core/perf/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/core/perf/server0/hornetq-configuration.xml 2009-12-08 10:23:43 UTC (rev 8617)
+++ trunk/examples/core/perf/server0/hornetq-configuration.xml 2009-12-08 10:36:45 UTC (rev 8618)
@@ -15,10 +15,10 @@
<security-enabled>false</security-enabled>
- <persistence-enabled>false</persistence-enabled>
+ <persistence-enabled>true</persistence-enabled>
- <journal-sync-non-transactional>false</journal-sync-non-transactional>
- <journal-sync-transactional>false</journal-sync-transactional>
+ <journal-sync-non-transactional>true</journal-sync-non-transactional>
+ <journal-sync-transactional>true</journal-sync-transactional>
<journal-type>ASYNCIO</journal-type>
<journal-min-files>20</journal-min-files>
<journal-buffer-timeout>20000</journal-buffer-timeout>
@@ -33,11 +33,13 @@
</queue>
</queues>
+<!--
<address-settings>
<address-setting match="perfAddress">
<max-size-bytes>10485760</max-size-bytes>
<address-full-policy>BLOCK</address-full-policy>
</address-setting>
</address-settings>
+-->
</configuration>
Modified: trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java
===================================================================
--- trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2009-12-08 10:23:43 UTC (rev 8617)
+++ trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2009-12-08 10:36:45 UTC (rev 8618)
@@ -28,8 +28,10 @@
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.MessageHandler;
+import org.hornetq.core.client.SendAcknowledgementHandler;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.TransportConfiguration;
+import org.hornetq.core.message.Message;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.integration.transports.netty.TransportConstants;
import org.hornetq.utils.TokenBucketLimiter;
@@ -123,6 +125,7 @@
int consumerWindowSize = Integer.valueOf(props.getProperty("consumer-window"));
boolean blockOnACK = Boolean.valueOf(props.getProperty("block-ack", "false"));
boolean blockOnPersistent = Boolean.valueOf(props.getProperty("block-persistent", "false"));
+ boolean useSendAcks = Boolean.valueOf(props.getProperty("use-send-acks", "false"));
PerfBase.log.info("num-messages: " + noOfMessages);
PerfBase.log.info("num-warmup-messages: " + noOfWarmupMessages);
@@ -144,7 +147,13 @@
PerfBase.log.info("consumer-window: " + consumerWindowSize);
PerfBase.log.info("block-ack:" + blockOnACK);
PerfBase.log.info("block-persistent:" + blockOnPersistent);
+ PerfBase.log.info("use-send-acks:" + useSendAcks);
+ if (useSendAcks && confirmationWindowSize < 1)
+ {
+ throw new IllegalArgumentException("If you use send acks, then need to set confirmation-window-size to a positive integer");
+ }
+
PerfParams perfParams = new PerfParams();
perfParams.setNoOfMessagesToSend(noOfMessages);
perfParams.setNoOfWarmupMessages(noOfWarmupMessages);
@@ -166,6 +175,7 @@
perfParams.setConsumerWindow(consumerWindowSize);
perfParams.setBlockOnACK(blockOnACK);
perfParams.setBlockOnPersistent(blockOnPersistent);
+ perfParams.setUseSendAcks(useSendAcks);
return perfParams;
}
@@ -179,8 +189,6 @@
private ClientSessionFactory factory;
- private ClientSession session;
-
private long start;
private void init(final boolean transacted, final String queueName) throws Exception
@@ -204,8 +212,6 @@
factory.setBlockOnAcknowledge(perfParams.isBlockOnACK());
factory.setBlockOnPersistentSend(perfParams.isBlockOnPersistent());
-
- session = factory.createSession(!transacted, !transacted);
}
private void displayAverage(final long numberOfMessages, final long start, final long end)
@@ -223,6 +229,7 @@
try
{
PerfBase.log.info("params = " + perfParams);
+
init(perfParams.isSessionTransacted(), perfParams.getQueueName());
if (perfParams.isDrainQueue())
@@ -238,7 +245,8 @@
perfParams.isSessionTransacted(),
false,
perfParams.getThrottleRate(),
- perfParams.getMessageSize());
+ perfParams.getMessageSize(),
+ perfParams.isUseSendAcks());
PerfBase.log.info("warmed up");
start = System.currentTimeMillis();
sendMessages(perfParams.getNoOfMessagesToSend(),
@@ -247,7 +255,8 @@
perfParams.isSessionTransacted(),
true,
perfParams.getThrottleRate(),
- perfParams.getMessageSize());
+ perfParams.getMessageSize(),
+ perfParams.isUseSendAcks());
long end = System.currentTimeMillis();
displayAverage(perfParams.getNoOfMessagesToSend(), start, end);
}
@@ -255,29 +264,18 @@
{
e.printStackTrace();
}
- finally
- {
- if (session != null)
- {
- try
- {
- session.close();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
- }
}
protected void runListener()
{
+ ClientSession session = null;
+
try
{
-
init(perfParams.isSessionTransacted(), perfParams.getQueueName());
+ session = factory.createSession(!perfParams.isSessionTransacted(), !perfParams.isSessionTransacted());
+
if (perfParams.isDrainQueue())
{
drainQueue();
@@ -290,7 +288,7 @@
PerfBase.log.info("READY!!!");
CountDownLatch countDownLatch = new CountDownLatch(1);
- consumer.setMessageHandler(new PerfListener(countDownLatch, perfParams));
+ consumer.setMessageHandler(new PerfListener(session, countDownLatch, perfParams));
countDownLatch.await();
long end = System.currentTimeMillis();
// start was set on the first received message
@@ -319,29 +317,42 @@
private void drainQueue() throws Exception
{
PerfBase.log.info("Draining queue");
- ClientConsumer consumer = session.createConsumer(perfParams.getQueueName());
- session.start();
+ ClientSession session = null;
- ClientMessage message = null;
-
- int count = 0;
- do
+ try
{
- message = consumer.receive(3000);
+ session = factory.createSession();
- if (message != null)
+ ClientConsumer consumer = session.createConsumer(perfParams.getQueueName());
+
+ session.start();
+
+ ClientMessage message = null;
+
+ int count = 0;
+ do
{
- message.acknowledge();
+ message = consumer.receive(3000);
- count++;
+ if (message != null)
+ {
+ message.acknowledge();
+
+ count++;
+ }
}
+ while (message != null);
+
+ PerfBase.log.info("Drained " + count + " messages");
}
- while (message != null);
-
- consumer.close();
-
- PerfBase.log.info("Drained " + count + " messages");
+ finally
+ {
+ if (session != null)
+ {
+ session.close();
+ }
+ }
}
private void sendMessages(final int numberOfMessages,
@@ -350,53 +361,97 @@
final boolean transacted,
final boolean display,
final int throttleRate,
- final int messageSize) throws Exception
+ final int messageSize,
+ final boolean useSendAcks) throws Exception
{
- ClientProducer producer = session.createProducer(perfParams.getAddress());
+ ClientSession session = null;
- ClientMessage message = session.createClientMessage(durable);
+ try
+ {
+ session = factory.createSession(!transacted, !transacted);
- byte[] payload = PerfBase.randomByteArray(messageSize);
+ CountDownLatch theLatch = null;
- message.getBodyBuffer().writeBytes(payload);
+ if (useSendAcks)
+ {
+ final CountDownLatch latch = new CountDownLatch(numberOfMessages);
- final int modulo = 2000;
+ class MySendAckHandler implements SendAcknowledgementHandler
+ {
+ public void sendAcknowledged(Message message)
+ {
+ latch.countDown();
+ }
+ }
+
+ session.setSendAcknowledgementHandler(new MySendAckHandler());
- TokenBucketLimiter tbl = throttleRate != -1 ? new TokenBucketLimiterImpl(throttleRate, false) : null;
+ theLatch = latch;
+ }
- boolean committed = false;
- for (int i = 1; i <= numberOfMessages; i++)
- {
- producer.send(message);
+ ClientProducer producer = session.createProducer(perfParams.getAddress());
- if (transacted)
+ ClientMessage message = session.createClientMessage(durable);
+
+ byte[] payload = PerfBase.randomByteArray(messageSize);
+
+ message.getBodyBuffer().writeBytes(payload);
+
+ final int modulo = 2000;
+
+ TokenBucketLimiter tbl = throttleRate != -1 ? new TokenBucketLimiterImpl(throttleRate, false) : null;
+
+ boolean committed = false;
+
+ for (int i = 1; i <= numberOfMessages; i++)
{
- if (i % txBatchSize == 0)
+ producer.send(message);
+
+ if (transacted)
{
- session.commit();
- committed = true;
+ if (i % txBatchSize == 0)
+ {
+ session.commit();
+ committed = true;
+ }
+ else
+ {
+ committed = false;
+ }
}
- else
+ if (display && i % modulo == 0)
{
- committed = false;
+ double duration = (1.0 * System.currentTimeMillis() - start) / 1000;
+ PerfBase.log.info(String.format("sent %6d messages in %2.2fs", i, duration));
}
+
+ // log.info("sent message " + i);
+
+ if (tbl != null)
+ {
+ tbl.limit();
+ }
}
- if (display && i % modulo == 0)
+
+ if (transacted && !committed)
{
- double duration = (1.0 * System.currentTimeMillis() - start) / 1000;
- PerfBase.log.info(String.format("sent %6d messages in %2.2fs", i, duration));
+ session.commit();
}
- // log.info("sent message " + i);
+ if (useSendAcks)
+ {
+ // Must close the session first since this flushes the confirmations
+ session.close();
- if (tbl != null)
- {
- tbl.limit();
+ theLatch.await();
}
}
- if (transacted && !committed)
+ finally
{
- session.commit();
+ if (session != null)
+ {
+ session.close();
+ }
}
}
@@ -414,8 +469,11 @@
private final AtomicLong count = new AtomicLong(0);
- public PerfListener(final CountDownLatch countDownLatch, final PerfParams perfParams)
+ private final ClientSession session;
+
+ public PerfListener(final ClientSession session, final CountDownLatch countDownLatch, final PerfParams perfParams)
{
+ this.session = session;
this.countDownLatch = countDownLatch;
this.perfParams = perfParams;
warmingUp = perfParams.getNoOfWarmupMessages() > 0;
@@ -428,13 +486,13 @@
{
if (warmingUp)
{
- boolean committed = checkCommit();
+ boolean committed = checkCommit(session);
if (count.incrementAndGet() == perfParams.getNoOfWarmupMessages())
{
PerfBase.log.info("warmed up after receiving " + count.longValue() + " msgs");
if (!committed)
{
- checkCommit();
+ checkCommit(session);
}
warmingUp = false;
}
@@ -452,12 +510,12 @@
message.acknowledge();
long currentCount = count.incrementAndGet();
- boolean committed = checkCommit();
+ boolean committed = checkCommit(session);
if (currentCount == perfParams.getNoOfMessagesToSend())
{
if (!committed)
{
- checkCommit();
+ checkCommit(session);
}
countDownLatch.countDown();
}
@@ -473,7 +531,7 @@
}
}
- private boolean checkCommit() throws Exception
+ private boolean checkCommit(final ClientSession session) throws Exception
{
if (perfParams.isSessionTransacted())
{
Modified: trunk/examples/core/perf/src/org/hornetq/core/example/PerfParams.java
===================================================================
--- trunk/examples/core/perf/src/org/hornetq/core/example/PerfParams.java 2009-12-08 10:23:43 UTC (rev 8617)
+++ trunk/examples/core/perf/src/org/hornetq/core/example/PerfParams.java 2009-12-08 10:36:45 UTC (rev 8618)
@@ -54,7 +54,7 @@
private boolean preAck;
- private int confirmationWindow;
+ private int confirmationWindow = -1;
private int producerWindow;
@@ -63,6 +63,8 @@
private boolean blockOnPersistent = true;
private boolean blockOnACK = true;
+
+ private boolean useSendAcks;
public boolean isBlockOnPersistent()
{
@@ -284,4 +286,14 @@
{
this.consumerWindow = consumerWindow;
}
+
+ public boolean isUseSendAcks()
+ {
+ return useSendAcks;
+ }
+
+ public void setUseSendAcks(boolean useSendAcks)
+ {
+ this.useSendAcks = useSendAcks;
+ }
}
15 years, 3 months
- 1
- 0