[hornetq-commits] JBoss hornetq SVN: r8622 - in trunk: examples/core/embedded and 33 other directories.

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(),