[hornetq-commits] JBoss hornetq SVN: r11509 - in branches/Branch_2_2_EAP: tests/src/org/hornetq/tests/integration/client and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Oct 10 21:35:34 EDT 2011
Author: clebert.suconic at jboss.com
Date: 2011-10-10 21:35:33 -0400 (Mon, 10 Oct 2011)
New Revision: 11509
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageHandlerTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/server/LVQTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/ServiceTestBase.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java
Log:
removing duplicate method on testsuite
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -2097,6 +2097,7 @@
}
}
+
/** This seems duplicate code all over the place, but for security reasons we can't let something like this to be open in a
* utility class, as it would be a door to load anything you like in a safe VM.
* For that reason any class trying to do a privileged block should do with the AccessController directly.
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -82,7 +82,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
producer.send(message);
}
@@ -116,7 +116,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
producer.send(message);
}
@@ -150,7 +150,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
producer.send(message);
}
@@ -188,7 +188,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
producer.send(message);
}
@@ -228,7 +228,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
producer.send(message);
}
session.close();
@@ -293,7 +293,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
producer.send(message);
}
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -65,7 +65,7 @@
clientSession.createQueue(dla, dlq, null, false);
clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
- producer.send(createTextMessage("heyho!", clientSession));
+ producer.send(createTextMessage(clientSession, "heyho!"));
clientSession.start();
ClientConsumer clientConsumer = clientSession.createConsumer(qName);
ClientMessage m = clientConsumer.receive(500);
@@ -95,7 +95,7 @@
clientSession.createQueue(dla, dlq, null, false);
clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
- producer.send(createTextMessage("heyho!", clientSession));
+ producer.send(createTextMessage(clientSession, "heyho!"));
clientSession.start();
ClientConsumer clientConsumer = clientSession.createConsumer(qName);
ClientMessage m = clientConsumer.receive(5000);
@@ -132,7 +132,7 @@
clientSession.createQueue(dla, dlq, null, false);
clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
- producer.send(createTextMessage("heyho!", clientSession));
+ producer.send(createTextMessage(clientSession, "heyho!"));
ClientConsumer clientConsumer = clientSession.createConsumer(qName);
final CountDownLatch latch = new CountDownLatch(2);
TestHandler handler = new TestHandler(latch, clientSession);
@@ -189,7 +189,7 @@
clientSession.createQueue(dla, dlq2, null, false);
clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
- producer.send(createTextMessage("heyho!", clientSession));
+ producer.send(createTextMessage(clientSession, "heyho!"));
clientSession.start();
ClientConsumer clientConsumer = clientSession.createConsumer(qName);
ClientMessage m = clientConsumer.receive(500);
@@ -223,7 +223,7 @@
server.getAddressSettingsRepository().addMatch(qName.toString(), addressSettings);
clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
- producer.send(createTextMessage("heyho!", clientSession));
+ producer.send(createTextMessage(clientSession, "heyho!"));
clientSession.start();
ClientConsumer clientConsumer = clientSession.createConsumer(qName);
ClientMessage m = clientConsumer.receive(500);
@@ -258,7 +258,7 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- ClientMessage tm = createTextMessage("Message:" + i, clientSession);
+ ClientMessage tm = createTextMessage(clientSession, "Message:" + i);
producer.send(tm);
}
@@ -339,7 +339,7 @@
clientSession.createQueue(deadLetterAdress, deadLetterQueue, false);
ClientProducer producer = clientSession.createProducer(address);
- ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
+ ClientMessage clientMessage = createTextMessage(clientSession, "heyho!");
producer.send(clientMessage);
clientSession.start();
@@ -381,7 +381,7 @@
clientSession.createQueue(deadLetterAdress, deadLetterQueue, false);
ClientProducer producer = clientSession.createProducer(address);
- ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
+ ClientMessage clientMessage = createTextMessage(clientSession, "heyho!");
producer.send(clientMessage);
clientSession.start();
@@ -430,7 +430,7 @@
clientSession.createQueue(specificDeadLetterAddress, specificDeadLetterQueue, false);
ClientProducer producer = clientSession.createProducer(address);
- ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
+ ClientMessage clientMessage = createTextMessage(clientSession, "heyho!");
producer.send(clientMessage);
clientSession.start();
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -53,7 +53,7 @@
clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
- ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
+ ClientMessage clientMessage = createTextMessage(clientSession, "heyho!");
clientMessage.setExpiration(System.currentTimeMillis());
producer.send(clientMessage);
@@ -84,7 +84,7 @@
clientSession.createQueue(ea, eq2, null, false);
clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
- ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
+ ClientMessage clientMessage = createTextMessage(clientSession, "heyho!");
clientMessage.setExpiration(System.currentTimeMillis());
producer.send(clientMessage);
@@ -136,7 +136,7 @@
clientSession.createQueue(ea, eq2, null, false);
clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
- ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
+ ClientMessage clientMessage = createTextMessage(clientSession, "heyho!");
clientMessage.setExpiration(System.currentTimeMillis());
producer.send(clientMessage);
clientSession.start();
@@ -167,7 +167,7 @@
long expiration = System.currentTimeMillis();
for (int i = 0; i < NUM_MESSAGES; i++)
{
- ClientMessage tm = createTextMessage("Message:" + i, clientSession);
+ ClientMessage tm = createTextMessage(clientSession, "Message:" + i);
tm.setExpiration(expiration);
producer.send(tm);
}
@@ -212,7 +212,7 @@
clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
- ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
+ ClientMessage clientMessage = createTextMessage(clientSession, "heyho!");
clientMessage.setExpiration(System.currentTimeMillis());
producer.send(clientMessage);
@@ -241,7 +241,7 @@
clientSession.createQueue(qName, qName, null, false);
ClientProducer producer = clientSession.createProducer(qName);
- ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
+ ClientMessage clientMessage = createTextMessage(clientSession, "heyho!");
clientMessage.setExpiration(System.currentTimeMillis());
producer.send(clientMessage);
@@ -279,7 +279,7 @@
clientSession.createQueue(specificExpiryAddress, specificExpiryQueue, false);
ClientProducer producer = clientSession.createProducer(address);
- ClientMessage clientMessage = createTextMessage("heyho!", clientSession);
+ ClientMessage clientMessage = createTextMessage(clientSession, "heyho!");
clientMessage.setExpiration(System.currentTimeMillis());
producer.send(clientMessage);
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -75,7 +75,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
producer.send(message);
}
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -64,7 +64,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, clientSession);
+ ClientMessage message = createTextMessage(clientSession, "m" + i);
clientProducer.send(message);
}
CountDownLatch latch = new CountDownLatch(numMessages);
@@ -91,7 +91,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, clientSession);
+ ClientMessage message = createTextMessage(clientSession, "m" + i);
clientProducer.send(message);
clientProducer2.send(message);
clientProducer3.send(message);
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -99,7 +99,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, clientSession);
+ ClientMessage message = createTextMessage(clientSession, "m" + i);
message.putStringProperty(Message.HDR_GROUP_ID, groupId);
clientProducer.send(message);
}
@@ -131,7 +131,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, clientSession);
+ ClientMessage message = createTextMessage(clientSession, "m" + i);
if (i % 2 == 0 || i == 0)
{
message.putStringProperty(Message.HDR_GROUP_ID, groupId);
@@ -174,7 +174,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, clientSession);
+ ClientMessage message = createTextMessage(clientSession, "m" + i);
if (i % 2 == 0 || i == 0)
{
message.putStringProperty(Message.HDR_GROUP_ID, groupId);
@@ -222,7 +222,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, clientSession);
+ ClientMessage message = createTextMessage(clientSession, "m" + i);
if (i % 2 == 0 || i == 0)
{
message.putStringProperty(Message.HDR_GROUP_ID, groupId);
@@ -283,7 +283,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, clientSession);
+ ClientMessage message = createTextMessage(clientSession, "m" + i);
if (i % 2 == 0 || i == 0)
{
message.putStringProperty(Message.HDR_GROUP_ID, groupId);
@@ -358,7 +358,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, clientSession);
+ ClientMessage message = createTextMessage(clientSession, "m" + i);
if (i % 2 == 0 || i == 0)
{
message.putStringProperty(Message.HDR_GROUP_ID, groupId);
@@ -419,7 +419,7 @@
int numMessages = 100;
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, clientSession);
+ ClientMessage message = createTextMessage(clientSession, "m" + i);
if (i % 2 == 0 || i == 0)
{
message.putStringProperty(Message.HDR_GROUP_ID, groupId);
@@ -493,7 +493,7 @@
int numMessages = 4;
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, clientSession);
+ ClientMessage message = createTextMessage(clientSession, "m" + i);
if (i % 2 == 0 || i == 0)
{
message.putStringProperty(Message.HDR_GROUP_ID, groupId);
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageHandlerTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageHandlerTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessageHandlerTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -74,7 +74,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
producer.send(message);
}
@@ -135,7 +135,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("i"), i);
@@ -237,7 +237,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("i"), i);
producer.send(message);
}
@@ -325,7 +325,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("i"), i);
producer.send(message);
}
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -72,7 +72,7 @@
for (int i = 0; i < 10; i++)
{
- ClientMessage m = createTextMessage(Integer.toString(i), session);
+ ClientMessage m = createTextMessage(session, Integer.toString(i));
m.setPriority((byte)i);
producer.send(m);
}
@@ -114,7 +114,7 @@
for (int i = 0; i < 10; i++)
{
- ClientMessage m = createTextMessage(Integer.toString(i), session);
+ ClientMessage m = createTextMessage(session, Integer.toString(i));
m.setPriority((byte)i);
producer.send(m);
}
@@ -153,28 +153,28 @@
// 3 7
// 3 3
// 1 9
- messages[0] = createTextMessage("a", session);
+ messages[0] = createTextMessage(session, "a");
messages[0].setPriority((byte)0);
- messages[1] = createTextMessage("b", session);
+ messages[1] = createTextMessage(session, "b");
messages[1].setPriority((byte)0);
- messages[2] = createTextMessage("c", session);
+ messages[2] = createTextMessage(session, "c");
messages[2].setPriority((byte)0);
- messages[3] = createTextMessage("d", session);
+ messages[3] = createTextMessage(session, "d");
messages[3].setPriority((byte)7);
- messages[4] = createTextMessage("e", session);
+ messages[4] = createTextMessage(session, "e");
messages[4].setPriority((byte)7);
- messages[5] = createTextMessage("f", session);
+ messages[5] = createTextMessage(session, "f");
messages[5].setPriority((byte)7);
- messages[6] = createTextMessage("g", session);
+ messages[6] = createTextMessage(session, "g");
messages[6].setPriority((byte)3);
- messages[7] = createTextMessage("h", session);
+ messages[7] = createTextMessage(session, "h");
messages[7].setPriority((byte)3);
- messages[8] = createTextMessage("i", session);
+ messages[8] = createTextMessage(session, "i");
messages[8].setPriority((byte)3);
- messages[9] = createTextMessage("j", session);
+ messages[9] = createTextMessage(session, "j");
messages[9].setPriority((byte)9);
for (int i = 0; i < 10; i++)
@@ -222,7 +222,7 @@
for (int i = 0; i < 10; i++)
{
- ClientMessage m = createTextMessage(Integer.toString(i), session);
+ ClientMessage m = createTextMessage(session, Integer.toString(i));
m.setPriority((byte)i);
producer.send(m);
}
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -51,7 +51,7 @@
SimpleString dlq = new SimpleString("DLQ1");
clientSession.createQueue(dla, dlq, null, false);
ClientProducer producer = clientSession.createProducer(address);
- producer.send(createTextMessage("heyho!", clientSession));
+ producer.send(createTextMessage(clientSession, "heyho!"));
clientSession.start();
ClientConsumer clientConsumer = clientSession.createConsumer(dlq);
ClientMessage m = clientConsumer.receive(500);
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -77,7 +77,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
producer.send(message);
}
@@ -124,7 +124,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("x"), i);
producer.send(message);
}
@@ -172,7 +172,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
if (i % 2 == 0)
{
message.putStringProperty(new SimpleString("color"), new SimpleString("RED"));
@@ -210,7 +210,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
producer.send(message);
}
@@ -248,7 +248,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("x"), i);
producer.send(message);
}
@@ -303,7 +303,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
producer.send(message);
}
@@ -338,7 +338,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
producer.send(message);
}
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -247,7 +247,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
producer.send(message);
}
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -74,7 +74,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("i"), i);
producer.send(message);
}
@@ -118,7 +118,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("i"), i);
producer.send(message);
}
@@ -165,7 +165,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("i"), i);
producer.send(message);
}
@@ -255,7 +255,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("i"), i);
producer.send(message);
}
@@ -353,7 +353,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("i"), i);
producer.send(message);
}
@@ -455,7 +455,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("i"), i);
producer.send(message);
}
@@ -572,7 +572,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("i"), i);
producer.send(message);
}
@@ -625,7 +625,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("i"), i);
producer.send(message);
}
@@ -666,7 +666,7 @@
for (int i = 0; i < numMessages; i++)
{
- ClientMessage message = createTextMessage("m" + i, session);
+ ClientMessage message = createTextMessage(session, "m" + i);
message.putIntProperty(new SimpleString("i"), i);
producer.send(message);
}
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -49,8 +49,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -74,8 +74,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -107,8 +107,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -148,8 +148,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -177,8 +177,8 @@
clientSession.createQueue(addressAB, queueName1, null, false);
clientSession.createQueue(addressAC, queueName2, null, false);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -209,8 +209,8 @@
clientSession.deleteQueue(queueName1);
// the wildcard binding should still exist
Assert.assertEquals(server.getPostOffice().getBindingsForAddress(addressAB).getBindings().size(), 1);
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -259,15 +259,15 @@
ClientProducer producer = clientSession.createProducer();
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(addressAB, createTextMessage("m1", clientSession));
- producer.send(addressAC, createTextMessage("m2", clientSession));
- producer.send(addressAD, createTextMessage("m3", clientSession));
- producer.send(addressAE, createTextMessage("m4", clientSession));
- producer.send(addressAF, createTextMessage("m5", clientSession));
- producer.send(addressAG, createTextMessage("m6", clientSession));
- producer.send(addressAH, createTextMessage("m7", clientSession));
- producer.send(addressAJ, createTextMessage("m8", clientSession));
- producer.send(addressAK, createTextMessage("m9", clientSession));
+ producer.send(addressAB, createTextMessage(clientSession, "m1"));
+ producer.send(addressAC, createTextMessage(clientSession, "m2"));
+ producer.send(addressAD, createTextMessage(clientSession, "m3"));
+ producer.send(addressAE, createTextMessage(clientSession, "m4"));
+ producer.send(addressAF, createTextMessage(clientSession, "m5"));
+ producer.send(addressAG, createTextMessage(clientSession, "m6"));
+ producer.send(addressAH, createTextMessage(clientSession, "m7"));
+ producer.send(addressAJ, createTextMessage(clientSession, "m8"));
+ producer.send(addressAK, createTextMessage(clientSession, "m9"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
@@ -356,15 +356,15 @@
ClientProducer producer = clientSession.createProducer();
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(addressAB, createTextMessage("m1", clientSession));
- producer.send(addressAC, createTextMessage("m2", clientSession));
- producer.send(addressAD, createTextMessage("m3", clientSession));
- producer.send(addressAE, createTextMessage("m4", clientSession));
- producer.send(addressAF, createTextMessage("m5", clientSession));
- producer.send(addressAG, createTextMessage("m6", clientSession));
- producer.send(addressAH, createTextMessage("m7", clientSession));
- producer.send(addressAJ, createTextMessage("m8", clientSession));
- producer.send(addressAK, createTextMessage("m9", clientSession));
+ producer.send(addressAB, createTextMessage(clientSession, "m1"));
+ producer.send(addressAC, createTextMessage(clientSession, "m2"));
+ producer.send(addressAD, createTextMessage(clientSession, "m3"));
+ producer.send(addressAE, createTextMessage(clientSession, "m4"));
+ producer.send(addressAF, createTextMessage(clientSession, "m5"));
+ producer.send(addressAG, createTextMessage(clientSession, "m6"));
+ producer.send(addressAH, createTextMessage(clientSession, "m7"));
+ producer.send(addressAJ, createTextMessage(clientSession, "m8"));
+ producer.send(addressAK, createTextMessage(clientSession, "m9"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
@@ -433,8 +433,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -462,8 +462,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -492,8 +492,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -521,8 +521,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -550,8 +550,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -575,8 +575,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -602,8 +602,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m2", m.getBodyBuffer().readString());
@@ -627,8 +627,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m2", m.getBodyBuffer().readString());
@@ -652,8 +652,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -677,8 +677,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -702,8 +702,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
@@ -730,8 +730,8 @@
ClientProducer producer2 = clientSession.createProducer(addressAC);
ClientConsumer clientConsumer = clientSession.createConsumer(queueName);
clientSession.start();
- producer.send(createTextMessage("m1", clientSession));
- producer2.send(createTextMessage("m2", clientSession));
+ producer.send(createTextMessage(clientSession, "m1"));
+ producer2.send(createTextMessage(clientSession, "m2"));
ClientMessage m = clientConsumer.receive(500);
Assert.assertNotNull(m);
Assert.assertEquals("m1", m.getBodyBuffer().readString());
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -59,7 +59,7 @@
long expiration = System.currentTimeMillis();
for (int i = 0; i < numMessages; i++)
{
- ClientMessage m = createTextMessage("m" + i, clientSession);
+ ClientMessage m = createTextMessage(clientSession, "m" + i);
m.setExpiration(expiration);
producer.send(m);
}
@@ -80,10 +80,10 @@
long expiration = System.currentTimeMillis();
for (int i = 0; i < numMessages; i++)
{
- ClientMessage m = createTextMessage("m" + i, clientSession);
+ ClientMessage m = createTextMessage(clientSession, "m" + i);
m.setExpiration(expiration);
producer.send(m);
- m = createTextMessage("m" + i, clientSession);
+ m = createTextMessage(clientSession, "m" + i);
m.setExpiration(expiration);
producer2.send(m);
}
@@ -99,7 +99,7 @@
long expiration = System.currentTimeMillis();
for (int i = 0; i < numMessages; i++)
{
- ClientMessage m = createTextMessage("m" + i, clientSession);
+ ClientMessage m = createTextMessage(clientSession, "m" + i);
if (i % 2 == 0)
{
m.setExpiration(expiration);
@@ -119,7 +119,7 @@
long expiration = System.currentTimeMillis() + 1000;
for (int i = 0; i < numMessages; i++)
{
- ClientMessage m = createTextMessage("m" + i, clientSession);
+ ClientMessage m = createTextMessage(clientSession, "m" + i);
m.setExpiration(expiration);
producer.send(m);
}
@@ -151,7 +151,7 @@
long expiration = System.currentTimeMillis();
for (int i = 0; i < numMessages; i++)
{
- ClientMessage m = createTextMessage("m" + i, clientSession);
+ ClientMessage m = createTextMessage(clientSession, "m" + i);
m.setExpiration(expiration);
producer.send(m);
}
@@ -190,7 +190,7 @@
long sendMessagesUntil = System.currentTimeMillis() + 2000;
do
{
- ClientMessage m = createTextMessage("m" + numMessages++, clientSession);
+ ClientMessage m = createTextMessage(clientSession, "m" + numMessages++);
m.setExpiration(expiration);
producer.send(m);
Thread.sleep(100);
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -55,13 +55,13 @@
SimpleString messageId1 = new SimpleString("SMID1");
SimpleString messageId2 = new SimpleString("SMID2");
clientSessionXa.start(xid, XAResource.TMNOFLAGS);
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2);
- ClientMessage m3 = createTextMessage("m3", clientSession);
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2);
producer.send(m1);
producer.send(m2);
@@ -94,22 +94,22 @@
ClientConsumer consumer = clientSessionXa.createConsumer(qName1);
SimpleString rh = new SimpleString("SMID1");
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m1.setDurable(true);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m2.setDurable(true);
- ClientMessage m3 = createTextMessage("m3", clientSession);
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m3.setDurable(true);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m4.setDurable(true);
- ClientMessage m5 = createTextMessage("m5", clientSession);
+ ClientMessage m5 = createTextMessage(clientSession, "m5");
m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m5.setDurable(true);
- ClientMessage m6 = createTextMessage("m6", clientSession);
+ ClientMessage m6 = createTextMessage(clientSession, "m6");
m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m6.setDurable(true);
clientSessionXa.start(xid, XAResource.TMNOFLAGS);
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/server/LVQTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -50,10 +50,10 @@
{
ClientProducer producer = clientSession.createProducer(address);
ClientConsumer consumer = clientSession.createConsumer(qName1);
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
SimpleString rh = new SimpleString("SMID1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
producer.send(m1);
producer.send(m2);
@@ -70,13 +70,13 @@
ClientConsumer consumer = clientSession.createConsumer(qName1);
SimpleString messageId1 = new SimpleString("SMID1");
SimpleString messageId2 = new SimpleString("SMID2");
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2);
- ClientMessage m3 = createTextMessage("m3", clientSession);
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2);
producer.send(m1);
producer.send(m2);
@@ -97,10 +97,10 @@
{
ClientProducer producer = clientSession.createProducer(address);
ClientConsumer consumer = clientSession.createConsumer(qName1);
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
SimpleString rh = new SimpleString("SMID1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
producer.send(m1);
clientSession.start();
@@ -119,10 +119,10 @@
{
ClientProducer producer = clientSession.createProducer(address);
ClientConsumer consumer = clientSession.createConsumer(qName1);
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
SimpleString rh = new SimpleString("SMID1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
producer.send(m1);
clientSession.start();
@@ -146,17 +146,17 @@
ClientConsumer consumer = clientSession.createConsumer(qName1);
SimpleString rh = new SimpleString("SMID1");
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m3 = createTextMessage("m3", clientSession);
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m5 = createTextMessage("m5", clientSession);
+ ClientMessage m5 = createTextMessage(clientSession, "m5");
m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m6 = createTextMessage("m6", clientSession);
+ ClientMessage m6 = createTextMessage(clientSession, "m6");
m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
clientSession.start();
producer.send(m1);
@@ -198,10 +198,10 @@
ClientProducer producer = clientSessionTxReceives.createProducer(address);
ClientConsumer consumer = clientSessionTxReceives.createConsumer(qName1);
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
SimpleString rh = new SimpleString("SMID1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
producer.send(m1);
producer.send(m2);
@@ -218,13 +218,13 @@
ClientConsumer consumer = clientSessionTxReceives.createConsumer(qName1);
SimpleString messageId1 = new SimpleString("SMID1");
SimpleString messageId2 = new SimpleString("SMID2");
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2);
- ClientMessage m3 = createTextMessage("m3", clientSession);
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2);
producer.send(m1);
producer.send(m2);
@@ -250,13 +250,13 @@
ClientConsumer consumer = clientSessionTxReceives.createConsumer(qName1);
SimpleString messageId1 = new SimpleString("SMID1");
SimpleString messageId2 = new SimpleString("SMID2");
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2);
- ClientMessage m3 = createTextMessage("m3", clientSession);
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId2);
producer.send(m1);
producer.send(m2);
@@ -295,7 +295,7 @@
ClientProducer producer = clientSessionTxReceives.createProducer(address);
ClientConsumer consumer = clientSessionTxReceives.createConsumer(qName1);
SimpleString messageId1 = new SimpleString("SMID1");
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, messageId1);
producer.send(m1);
clientSessionTxReceives.start();
@@ -315,17 +315,17 @@
ClientProducer producer = clientSessionTxSends.createProducer(address);
ClientConsumer consumer = clientSessionTxSends.createConsumer(qName1);
SimpleString rh = new SimpleString("SMID1");
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m3 = createTextMessage("m3", clientSession);
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m5 = createTextMessage("m5", clientSession);
+ ClientMessage m5 = createTextMessage(clientSession, "m5");
m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
- ClientMessage m6 = createTextMessage("m6", clientSession);
+ ClientMessage m6 = createTextMessage(clientSession, "m6");
m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
producer.send(m1);
producer.send(m2);
@@ -346,22 +346,22 @@
ClientProducer producer = clientSession.createProducer(address);
ClientConsumer consumer = clientSession.createConsumer(qName1);
SimpleString rh = new SimpleString("SMID1");
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m1.setDurable(true);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m2.setDurable(true);
- ClientMessage m3 = createTextMessage("m3", clientSession);
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m3.setDurable(true);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m4.setDurable(true);
- ClientMessage m5 = createTextMessage("m5", clientSession);
+ ClientMessage m5 = createTextMessage(clientSession, "m5");
m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m5.setDurable(true);
- ClientMessage m6 = createTextMessage("m6", clientSession);
+ ClientMessage m6 = createTextMessage(clientSession, "m6");
m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m6.setDurable(true);
producer.send(m1);
@@ -384,22 +384,22 @@
ClientProducer producer = clientSessionTxSends.createProducer(address);
ClientConsumer consumer = clientSessionTxSends.createConsumer(qName1);
SimpleString rh = new SimpleString("SMID1");
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m1.setDurable(true);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m2.setDurable(true);
- ClientMessage m3 = createTextMessage("m3", clientSession);
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m3.setDurable(true);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m4.setDurable(true);
- ClientMessage m5 = createTextMessage("m5", clientSession);
+ ClientMessage m5 = createTextMessage(clientSession, "m5");
m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m5.setDurable(true);
- ClientMessage m6 = createTextMessage("m6", clientSession);
+ ClientMessage m6 = createTextMessage(clientSession, "m6");
m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m6.setDurable(true);
producer.send(m1);
@@ -423,22 +423,22 @@
ClientProducer producer = clientSession.createProducer(address);
ClientConsumer consumer = clientSession.createConsumer(qName1);
SimpleString rh = new SimpleString("SMID1");
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m1.setDurable(true);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m2.setDurable(true);
- ClientMessage m3 = createTextMessage("m3", clientSession);
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m3.setDurable(true);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m4.setDurable(true);
- ClientMessage m5 = createTextMessage("m5", clientSession);
+ ClientMessage m5 = createTextMessage(clientSession, "m5");
m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m5.setDurable(true);
- ClientMessage m6 = createTextMessage("m6", clientSession);
+ ClientMessage m6 = createTextMessage(clientSession, "m6");
m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m6.setDurable(true);
clientSession.start();
@@ -479,22 +479,22 @@
ClientProducer producer = clientSessionTxReceives.createProducer(address);
ClientConsumer consumer = clientSessionTxReceives.createConsumer(qName1);
SimpleString rh = new SimpleString("SMID1");
- ClientMessage m1 = createTextMessage("m1", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
m1.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m1.setDurable(true);
- ClientMessage m2 = createTextMessage("m2", clientSession);
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
m2.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m2.setDurable(true);
- ClientMessage m3 = createTextMessage("m3", clientSession);
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
m3.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m3.setDurable(true);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
m4.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m4.setDurable(true);
- ClientMessage m5 = createTextMessage("m5", clientSession);
+ ClientMessage m5 = createTextMessage(clientSession, "m5");
m5.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m5.setDurable(true);
- ClientMessage m6 = createTextMessage("m6", clientSession);
+ ClientMessage m6 = createTextMessage(clientSession, "m6");
m6.putStringProperty(Message.HDR_LAST_VALUE_NAME, rh);
m6.setDurable(true);
clientSessionTxReceives.start();
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -76,7 +76,7 @@
session.createQueue(CoreClientOverSSLTest.QUEUE, CoreClientOverSSLTest.QUEUE, false);
ClientProducer producer = session.createProducer(CoreClientOverSSLTest.QUEUE);
- ClientMessage message = createTextMessage(text, session);
+ ClientMessage message = createTextMessage(session, text);
producer.send(message);
ClientConsumer consumer = session.createConsumer(CoreClientOverSSLTest.QUEUE);
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -131,10 +131,10 @@
{
Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());
- ClientMessage m1 = createTextMessage("m1", clientSession);
- ClientMessage m2 = createTextMessage("m2", clientSession);
- ClientMessage m3 = createTextMessage("m3", clientSession);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
clientSession.setTransactionTimeout(1);
clientSession.start(xid, XAResource.TMNOFLAGS);
clientProducer.send(m1);
@@ -162,10 +162,10 @@
{
Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());
- ClientMessage m1 = createTextMessage("m1", clientSession);
- ClientMessage m2 = createTextMessage("m2", clientSession);
- ClientMessage m3 = createTextMessage("m3", clientSession);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
ClientSession clientSession2 = sessionFactory.createSession(false, true, true);
ClientProducer clientProducer2 = clientSession2.createProducer(atestq);
clientProducer2.send(m1);
@@ -232,14 +232,14 @@
{
Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());
- ClientMessage m1 = createTextMessage("m1", clientSession);
- ClientMessage m2 = createTextMessage("m2", clientSession);
- ClientMessage m3 = createTextMessage("m3", clientSession);
- ClientMessage m4 = createTextMessage("m4", clientSession);
- ClientMessage m5 = createTextMessage("m5", clientSession);
- ClientMessage m6 = createTextMessage("m6", clientSession);
- ClientMessage m7 = createTextMessage("m7", clientSession);
- ClientMessage m8 = createTextMessage("m8", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
+ ClientMessage m5 = createTextMessage(clientSession, "m5");
+ ClientMessage m6 = createTextMessage(clientSession, "m6");
+ ClientMessage m7 = createTextMessage(clientSession, "m7");
+ ClientMessage m8 = createTextMessage(clientSession, "m8");
ClientSession clientSession2 = sessionFactory.createSession(false, true, true);
ClientProducer clientProducer2 = clientSession2.createProducer(atestq);
clientProducer2.send(m1);
@@ -312,14 +312,14 @@
{
Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());
- ClientMessage m1 = createTextMessage("m1", clientSession);
- ClientMessage m2 = createTextMessage("m2", clientSession);
- ClientMessage m3 = createTextMessage("m3", clientSession);
- ClientMessage m4 = createTextMessage("m4", clientSession);
- ClientMessage m5 = createTextMessage("m5", clientSession);
- ClientMessage m6 = createTextMessage("m6", clientSession);
- ClientMessage m7 = createTextMessage("m7", clientSession);
- ClientMessage m8 = createTextMessage("m8", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
+ ClientMessage m5 = createTextMessage(clientSession, "m5");
+ ClientMessage m6 = createTextMessage(clientSession, "m6");
+ ClientMessage m7 = createTextMessage(clientSession, "m7");
+ ClientMessage m8 = createTextMessage(clientSession, "m8");
ClientSession clientSession2 = sessionFactory.createSession(false, true, true);
ClientProducer clientProducer2 = clientSession2.createProducer(atestq);
clientProducer2.send(m1);
@@ -387,10 +387,10 @@
{
Xid xid = new XidImpl("xa1".getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());
- ClientMessage m1 = createTextMessage("m1", clientSession);
- ClientMessage m2 = createTextMessage("m2", clientSession);
- ClientMessage m3 = createTextMessage("m3", clientSession);
- ClientMessage m4 = createTextMessage("m4", clientSession);
+ ClientMessage m1 = createTextMessage(clientSession, "m1");
+ ClientMessage m2 = createTextMessage(clientSession, "m2");
+ ClientMessage m3 = createTextMessage(clientSession, "m3");
+ ClientMessage m4 = createTextMessage(clientSession, "m4");
clientSession.start(xid, XAResource.TMNOFLAGS);
clientProducer.send(m1);
clientProducer.send(m2);
@@ -455,7 +455,7 @@
for (int i = 0; i < messages.length; i++)
{
- messages[i] = createTextMessage("m" + i, clientSession);
+ messages[i] = createTextMessage(clientSession, "m" + i);
}
for (int i = 0; i < clientSessions.length; i++)
{
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/ServiceTestBase.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -49,7 +49,6 @@
import org.hornetq.core.settings.impl.AddressFullMessagePolicy;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.jms.client.HornetQBytesMessage;
-import org.hornetq.jms.client.HornetQTextMessage;
import org.hornetq.spi.core.security.HornetQSecurityManager;
import org.hornetq.spi.core.security.HornetQSecurityManagerImpl;
import org.hornetq.utils.UUIDGenerator;
@@ -601,29 +600,12 @@
return (ClientSessionFactoryImpl)locator.createSessionFactory();
}
-
- protected ClientMessage createTextMessage(final ClientSession session, final String s)
- {
- return createTextMessage(session, s, true);
- }
-
public String getTextMessage(final ClientMessage m)
{
m.getBodyBuffer().resetReaderIndex();
return m.getBodyBuffer().readString();
}
- protected ClientMessage createTextMessage(final ClientSession session, final String s, final boolean durable)
- {
- ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
- durable,
- 0,
- System.currentTimeMillis(),
- (byte)1);
- message.getBodyBuffer().writeString(s);
- return message;
- }
-
protected ClientMessage createBytesMessage(final ClientSession session, final byte[] b, final boolean durable)
{
ClientMessage message = session.createMessage(HornetQBytesMessage.TYPE,
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java 2011-10-11 01:35:10 UTC (rev 11508)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java 2011-10-11 01:35:33 UTC (rev 11509)
@@ -1272,18 +1272,19 @@
return (size / alignment + (size % alignment != 0 ? 1 : 0)) * alignment;
}
- protected ClientMessage createTextMessage(final String s, final ClientSession clientSession)
+ protected ClientMessage createTextMessage(final ClientSession session, final String s)
{
- return createTextMessage(s, true, clientSession);
+ return createTextMessage(session, s, true);
}
- protected ClientMessage createTextMessage(final String s, final boolean durable, final ClientSession clientSession)
+
+ protected ClientMessage createTextMessage(final ClientSession session, final String s, final boolean durable)
{
- ClientMessage message = clientSession.createMessage(HornetQTextMessage.TYPE,
- durable,
- 0,
- System.currentTimeMillis(),
- (byte)4);
+ ClientMessage message = session.createMessage(HornetQTextMessage.TYPE,
+ durable,
+ 0,
+ System.currentTimeMillis(),
+ (byte)1);
message.getBodyBuffer().writeString(s);
return message;
}
More information about the hornetq-commits
mailing list