[jboss-cvs] JBoss Messaging SVN: r4162 - in trunk: src/main/org/jboss/messaging/core/client and 27 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 8 06:59:16 EDT 2008
Author: timfox
Date: 2008-05-08 06:59:15 -0400 (Thu, 08 May 2008)
New Revision: 4162
Added:
trunk/src/main/org/jboss/messaging/core/message/ClientMessage.java
trunk/src/main/org/jboss/messaging/core/message/ServerMessage.java
trunk/src/main/org/jboss/messaging/core/message/impl/ClientMessageImpl.java
trunk/src/main/org/jboss/messaging/core/message/impl/ServerMessageImpl.java
Modified:
trunk/docs/examples/messaging/src/org/jboss/messaging/example/SSLClient.java
trunk/docs/examples/messaging/src/org/jboss/messaging/example/SimpleClient.java
trunk/docs/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java
trunk/src/main/org/jboss/messaging/core/client/ClientBrowser.java
trunk/src/main/org/jboss/messaging/core/client/ClientConnectionFactory.java
trunk/src/main/org/jboss/messaging/core/client/ClientConsumer.java
trunk/src/main/org/jboss/messaging/core/client/ClientProducer.java
trunk/src/main/org/jboss/messaging/core/client/MessageHandler.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
trunk/src/main/org/jboss/messaging/core/filter/Filter.java
trunk/src/main/org/jboss/messaging/core/filter/impl/FilterImpl.java
trunk/src/main/org/jboss/messaging/core/message/Message.java
trunk/src/main/org/jboss/messaging/core/message/MessageReference.java
trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java
trunk/src/main/org/jboss/messaging/core/message/impl/MessageReferenceImpl.java
trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java
trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
trunk/src/main/org/jboss/messaging/core/persistence/impl/nullpm/NullStorageManager.java
trunk/src/main/org/jboss/messaging/core/postoffice/PostOffice.java
trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ProducerSendMessageCodec.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ReceiveMessageCodec.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java
trunk/src/main/org/jboss/messaging/core/server/ServerProducer.java
trunk/src/main/org/jboss/messaging/core/server/ServerSession.java
trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
trunk/src/main/org/jboss/messaging/core/transaction/Transaction.java
trunk/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java
trunk/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java
trunk/src/main/org/jboss/messaging/jms/client/JBossMapMessage.java
trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
trunk/src/main/org/jboss/messaging/jms/client/JBossMessageConsumer.java
trunk/src/main/org/jboss/messaging/jms/client/JBossObjectMessage.java
trunk/src/main/org/jboss/messaging/jms/client/JBossQueueBrowser.java
trunk/src/main/org/jboss/messaging/jms/client/JBossStreamMessage.java
trunk/src/main/org/jboss/messaging/jms/client/JBossTextMessage.java
trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java
trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/CrashClient.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/DummyInterceptor.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/GracefulClient.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSL.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/FilterTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/concurrent/QueueTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/fakes/FakeFilter.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/transaction/impl/TransactionTest.java
trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java
Log:
Split message into Server and Client message
Modified: trunk/docs/examples/messaging/src/org/jboss/messaging/example/SSLClient.java
===================================================================
--- trunk/docs/examples/messaging/src/org/jboss/messaging/example/SSLClient.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/docs/examples/messaging/src/org/jboss/messaging/example/SSLClient.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -32,8 +32,9 @@
import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.message.ClientMessage;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.impl.ClientMessageImpl;
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -69,7 +70,7 @@
ClientSession clientSession = clientConnection.createClientSession(false, true, true, 100, true, false);
SimpleString queue = new SimpleString("queuejms.testQueue");
ClientProducer clientProducer = clientSession.createProducer(queue);
- Message message = new MessageImpl(JBossTextMessage.TYPE, false, 0,
+ ClientMessage message = new ClientMessageImpl(JBossTextMessage.TYPE, false, 0,
System.currentTimeMillis(), (byte) 1);
message.getBody().putString("Hello!");
clientProducer.send(message);
Modified: trunk/docs/examples/messaging/src/org/jboss/messaging/example/SimpleClient.java
===================================================================
--- trunk/docs/examples/messaging/src/org/jboss/messaging/example/SimpleClient.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/docs/examples/messaging/src/org/jboss/messaging/example/SimpleClient.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -32,8 +32,9 @@
import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.message.ClientMessage;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.impl.ClientMessageImpl;
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.jms.client.JBossTextMessage;
import org.jboss.messaging.util.SimpleString;
@@ -57,7 +58,7 @@
ClientSession clientSession = clientConnection.createClientSession(false, true, true, 100, true, false);
SimpleString queue = new SimpleString("queuejms.testQueue");
ClientProducer clientProducer = clientSession.createProducer(queue);
- Message message = new MessageImpl(JBossTextMessage.TYPE, false, 0,
+ ClientMessage message = new ClientMessageImpl(JBossTextMessage.TYPE, false, 0,
System.currentTimeMillis(), (byte) 1);
message.getBody().putString("Hello!");
clientProducer.send(message);
Modified: trunk/docs/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java
===================================================================
--- trunk/docs/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/docs/examples/messaging/src/org/jboss/messaging/example/SimpleExample.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -35,8 +35,9 @@
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.message.ClientMessage;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.impl.ClientMessageImpl;
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.core.security.CheckType;
import org.jboss.messaging.core.security.JBMSecurityManager;
@@ -94,7 +95,7 @@
clientConnection = connectionFactory.createConnection();
ClientSession clientSession = clientConnection.createClientSession(false, true, true, 100, true, false);
ClientProducer clientProducer = clientSession.createProducer(atestq);
- Message message = new MessageImpl(JBossTextMessage.TYPE, false, 0,
+ ClientMessage message = new ClientMessageImpl(JBossTextMessage.TYPE, false, 0,
System.currentTimeMillis(), (byte) 1);
message.getBody().putString("Hello!");
clientProducer.send(message);
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientBrowser.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientBrowser.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientBrowser.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -8,7 +8,7 @@
package org.jboss.messaging.core.client;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ClientMessage;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -19,7 +19,7 @@
{
void reset() throws MessagingException;
- Message nextMessage() throws MessagingException;
+ ClientMessage nextMessage() throws MessagingException;
boolean hasNextMessage() throws MessagingException;
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientConnectionFactory.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientConnectionFactory.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -22,7 +22,6 @@
package org.jboss.messaging.core.client;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.version.Version;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientConsumer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientConsumer.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientConsumer.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -8,7 +8,7 @@
package org.jboss.messaging.core.client;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ClientMessage;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -16,11 +16,11 @@
*/
public interface ClientConsumer
{
- Message receive() throws MessagingException;
+ ClientMessage receive() throws MessagingException;
- Message receive(long timeout) throws MessagingException;
+ ClientMessage receive(long timeout) throws MessagingException;
- Message receiveImmediate() throws MessagingException;
+ ClientMessage receiveImmediate() throws MessagingException;
MessageHandler getMessageHandler() throws MessagingException;
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientProducer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientProducer.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientProducer.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -8,7 +8,7 @@
package org.jboss.messaging.core.client;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ClientMessage;
import org.jboss.messaging.util.SimpleString;
/**
@@ -18,9 +18,9 @@
{
SimpleString getAddress();
- void send(Message message) throws MessagingException;
+ void send(ClientMessage message) throws MessagingException;
- void send(SimpleString address, Message message) throws MessagingException;
+ void send(SimpleString address, ClientMessage message) throws MessagingException;
void registerAcknowledgementHandler(AcknowledgementHandler handler);
Modified: trunk/src/main/org/jboss/messaging/core/client/MessageHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/MessageHandler.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/client/MessageHandler.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -21,7 +21,7 @@
*/
package org.jboss.messaging.core.client;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ClientMessage;
/**
*
@@ -32,5 +32,5 @@
*/
public interface MessageHandler
{
- void onMessage(Message message);
+ void onMessage(ClientMessage message);
}
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -28,7 +28,7 @@
import org.jboss.messaging.core.client.ClientBrowser;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ClientMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
@@ -113,14 +113,14 @@
return response.hasNext();
}
- public Message nextMessage() throws MessagingException
+ public ClientMessage nextMessage() throws MessagingException
{
checkClosed();
ReceiveMessage response =
(ReceiveMessage)remotingConnection.sendBlocking(serverTargetID, session.getServerTargetID(), new PacketImpl(SESS_BROWSER_NEXTMESSAGE));
- return response.getMessage();
+ return response.getClientMessage();
}
// Public ---------------------------------------------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -32,7 +32,7 @@
import org.jboss.messaging.core.list.PriorityLinkedList;
import org.jboss.messaging.core.list.impl.PriorityLinkedListImpl;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ClientMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowTokenMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
@@ -74,7 +74,7 @@
private final int tokenBatchSize;
- private final PriorityLinkedList<Message> buffer = new PriorityLinkedListImpl<Message>(10);
+ private final PriorityLinkedList<ClientMessage> buffer = new PriorityLinkedListImpl<ClientMessage>(10);
private volatile Thread receiverThread;
@@ -124,7 +124,7 @@
// ClientConsumer implementation
// -----------------------------------------------------------------
- public synchronized Message receive(long timeout) throws MessagingException
+ public synchronized ClientMessage receive(long timeout) throws MessagingException
{
checkClosed();
@@ -168,7 +168,7 @@
if (!closed && !buffer.isEmpty())
{
- Message m = buffer.removeFirst();
+ ClientMessage m = buffer.removeFirst();
boolean expired = m.isExpired();
@@ -202,12 +202,12 @@
}
}
- public Message receive() throws MessagingException
+ public ClientMessage receive() throws MessagingException
{
return receive(0);
}
- public Message receiveImmediate() throws MessagingException
+ public ClientMessage receiveImmediate() throws MessagingException
{
return receive(-1);
}
@@ -283,7 +283,7 @@
return targetID;
}
- public void handleMessage(final Message message) throws Exception
+ public void handleMessage(final ClientMessage message) throws Exception
{
if (closed)
{
@@ -442,7 +442,7 @@
//ordering. If we just added a Runnable with the message to the executor immediately as we get it
//we could not do that
- Message message;
+ ClientMessage message;
synchronized (this)
{
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -8,7 +8,7 @@
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ClientMessage;
/**
*
@@ -21,7 +21,7 @@
{
long getClientTargetID();
- void handleMessage(Message message) throws Exception;
+ void handleMessage(ClientMessage message) throws Exception;
void recover(long lastDeliveryID) throws MessagingException;
}
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -45,7 +45,7 @@
{
ReceiveMessage message = (ReceiveMessage) packet;
- clientConsumer.handleMessage(message.getMessage());
+ clientConsumer.handleMessage(message.getClientMessage());
}
else
{
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -24,7 +24,7 @@
import org.jboss.messaging.core.client.AcknowledgementHandler;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ClientMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerSendMessage;
import org.jboss.messaging.util.SimpleString;
import org.jboss.messaging.util.TokenBucketLimiter;
@@ -108,21 +108,21 @@
return address;
}
- public void send(final Message msg) throws MessagingException
+ public void send(final ClientMessage msg) throws MessagingException
{
checkClosed();
doSend(null, msg);
}
- public void send(final SimpleString address, final Message msg) throws MessagingException
+ public void send(final SimpleString address, final ClientMessage msg) throws MessagingException
{
checkClosed();
doSend(address, msg);
}
- private void doSend(final SimpleString address, final Message msg) throws MessagingException
+ private void doSend(final SimpleString address, final ClientMessage msg) throws MessagingException
{
if (address != null)
{
@@ -133,7 +133,7 @@
msg.setDestination(this.address);
}
- ProducerSendMessage message = new ProducerSendMessage(msg.copy());
+ ProducerSendMessage message = new ProducerSendMessage(msg);
//TODO flow control disabled for now
Modified: trunk/src/main/org/jboss/messaging/core/filter/Filter.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/filter/Filter.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/filter/Filter.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -21,7 +21,7 @@
*/
package org.jboss.messaging.core.filter;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.util.SimpleString;
/**
@@ -33,7 +33,7 @@
*/
public interface Filter
{
- boolean match(Message message);
+ boolean match(ServerMessage message);
SimpleString getFilterString();
}
Modified: trunk/src/main/org/jboss/messaging/core/filter/impl/FilterImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/filter/impl/FilterImpl.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/filter/impl/FilterImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -27,7 +27,7 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.util.SimpleString;
/**
@@ -95,7 +95,7 @@
return sfilterString;
}
- public boolean match(final Message message)
+ public boolean match(final ServerMessage message)
{
try
{
@@ -148,7 +148,7 @@
// Private --------------------------------------------------------------------------
- private Object getHeaderFieldValue(final Message msg, final String fieldName)
+ private Object getHeaderFieldValue(final ServerMessage msg, final String fieldName)
{
if ("JBMMessageID".equals(fieldName))
{
Added: trunk/src/main/org/jboss/messaging/core/message/ClientMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/ClientMessage.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/message/ClientMessage.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.core.message;
+
+/**
+ *
+ * A ClientMessage
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public interface ClientMessage extends Message
+{
+ int getDeliveryCount();
+
+ void setDeliveryCount(int deliveryCount);
+
+ long getDeliveryID();
+
+ void setDeliveryID(long deliveryID);
+
+}
Modified: trunk/src/main/org/jboss/messaging/core/message/Message.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/Message.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/message/Message.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -23,7 +23,6 @@
import java.util.Set;
-import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.util.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
@@ -48,10 +47,6 @@
int getType();
- long getMessageID();
-
- void setMessageID(long id);
-
boolean isDurable();
void setDurable(boolean durable);
@@ -70,20 +65,11 @@
void setPriority(byte priority);
- int getDeliveryCount();
-
- void setDeliveryCount(int deliveryCount);
-
- long getDeliveryID();
-
- void setDeliveryID(long deliveryID);
-
+
MessagingBuffer encode();
void decode(MessagingBuffer buffer);
- Message copy();
-
// Properties
// ------------------------------------------------------------------
@@ -123,43 +109,4 @@
void setBody(MessagingBuffer body);
- // Other stuff that should be moved to ServerMessage
- // -------------------------------------------------------------------------------------
-
- /**
- * Get the connection id
- * @return the connection id
- */
- long getConnectionID();
-
- /**
- * Set the connection id
- * @param connectionID
- */
- void setConnectionID(long connectionID);
-
-
- /**
- * @return a reference for this message
- */
- MessageReference createReference(Queue queue);
-
- /**
- * Decrement the durable ref count
- */
- void decrementDurableRefCount();
-
- /**
- * Increment the durable ref count
- */
- void incrementDurableRefCount();
-
- /**
- * Get the current durable reference count
- * @return the durable ref count
- */
- int getDurableRefCount();
-
-
-
}
Modified: trunk/src/main/org/jboss/messaging/core/message/MessageReference.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/MessageReference.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/message/MessageReference.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -40,7 +40,7 @@
*/
public interface MessageReference
{
- Message getMessage();
+ ServerMessage getMessage();
MessageReference copy(Queue queue);
Added: trunk/src/main/org/jboss/messaging/core/message/ServerMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/ServerMessage.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/message/ServerMessage.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.core.message;
+
+import org.jboss.messaging.core.server.Queue;
+
+/**
+ *
+ * A ServerMessage
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public interface ServerMessage extends Message
+{
+ long getMessageID();
+
+ void setMessageID(long id);
+
+ long getConnectionID();
+
+ void setConnectionID(long connectionID);
+
+ MessageReference createReference(Queue queue);
+
+ void decrementDurableRefCount();
+
+ void incrementDurableRefCount();
+
+ int getDurableRefCount();
+
+ ServerMessage copy();
+}
+
Added: trunk/src/main/org/jboss/messaging/core/message/impl/ClientMessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/impl/ClientMessageImpl.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/message/impl/ClientMessageImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.core.message.impl;
+
+import org.jboss.messaging.core.message.ClientMessage;
+
+/**
+ *
+ * A ClientMessageImpl
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class ClientMessageImpl extends MessageImpl implements ClientMessage
+{
+ private int deliveryCount;
+
+ private long deliveryID;
+
+ /*
+ * Constructor for when reading from network
+ */
+ public ClientMessageImpl(final int deliveryCount, final long deliveryID)
+ {
+ super();
+
+ this.deliveryCount = deliveryCount;
+
+ this.deliveryID = deliveryID;
+ }
+
+ /*
+ * Construct a message before sending
+ */
+ public ClientMessageImpl(final int type, final boolean durable, final long expiration,
+ final long timestamp, final byte priority)
+ {
+ super(type, durable, expiration, timestamp, priority);
+ }
+
+ public void setDeliveryCount(final int deliveryCount)
+ {
+ this.deliveryCount = deliveryCount;
+ }
+
+ public int getDeliveryCount()
+ {
+ return this.deliveryCount;
+ }
+
+ public void setDeliveryID(final long deliveryID)
+ {
+ this.deliveryID = deliveryID;
+ }
+
+ public long getDeliveryID()
+ {
+ return this.deliveryID;
+ }
+
+}
Modified: trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -22,13 +22,10 @@
package org.jboss.messaging.core.message.impl;
import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.message.MessageReference;
import org.jboss.messaging.core.remoting.impl.mina.BufferWrapper;
-import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.util.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
import org.jboss.messaging.util.TypedProperties;
@@ -46,7 +43,7 @@
*
* $Id: MessageSupport.java 2740 2007-05-30 11:36:28Z timfox $
*/
-public class MessageImpl implements Message
+public abstract class MessageImpl implements Message
{
// Constants -----------------------------------------------------
@@ -56,11 +53,9 @@
private SimpleString destination;
- private long messageID;
-
private int type;
- private boolean durable;
+ protected boolean durable;
/** GMT milliseconds at which this message expires. 0 means never expires * */
private long expiration;
@@ -71,30 +66,17 @@
private byte priority;
- private long connectionID;
-
- private final AtomicInteger durableRefCount = new AtomicInteger(0);
-
- private int deliveryCount;
-
- private long deliveryID;
-
+
private MessagingBuffer body;
// Constructors --------------------------------------------------
- /*
- * Construct when reading from network
- */
- public MessageImpl()
+ protected MessageImpl()
{
this.properties = new TypedProperties();
}
-
- /*
- * Construct a message before sending
- */
- public MessageImpl(final int type, final boolean durable, final long expiration,
+
+ protected MessageImpl(final int type, final boolean durable, final long expiration,
final long timestamp, final byte priority)
{
this();
@@ -105,23 +87,13 @@
this.priority = priority;
this.body = new BufferWrapper(1024);
}
-
- /*
- * Construct a MessageImpl from storage
- */
- public MessageImpl(final long messageID)
- {
- this();
- this.messageID = messageID;
- }
/*
* Copy constructor
*/
- public MessageImpl(final MessageImpl other)
+ protected MessageImpl(final MessageImpl other)
{
this.destination = other.destination;
- this.messageID = other.messageID;
this.type = other.type;
this.durable = other.durable;
this.expiration = other.expiration;
@@ -129,9 +101,6 @@
this.priority = other.priority;
this.properties = new TypedProperties(other.properties);
this.body = other.body;
-
- this.deliveryCount = other.deliveryCount;
- this.deliveryID = other.deliveryID;
}
// Message implementation ----------------------------------------
@@ -147,9 +116,6 @@
buff.putLong(timestamp);
buff.putByte(priority);
- buff.putInt(deliveryCount);
- buff.putLong(deliveryID);
-
properties.encode(buff);
buff.putInt(body.limit());
@@ -169,9 +135,6 @@
timestamp = buffer.getLong();
priority = buffer.getByte();
- deliveryCount = buffer.getInt();
- deliveryID = buffer.getLong();
-
properties.decode(buffer);
int len = buffer.getInt();
@@ -192,16 +155,6 @@
this.destination = destination;
}
- public long getMessageID()
- {
- return messageID;
- }
-
- public void setMessageID(final long id)
- {
- this.messageID = id;
- }
-
public int getType()
{
return type;
@@ -248,35 +201,6 @@
this.priority = priority;
}
- public long getConnectionID()
- {
- return connectionID;
- }
-
- public void setConnectionID(final long connectionID)
- {
- this.connectionID = connectionID;
- }
-
- public void setDeliveryCount(final int deliveryCount)
- {
- this.deliveryCount = deliveryCount;
- }
-
- public int getDeliveryCount()
- {
- return this.deliveryCount;
- }
-
- public void setDeliveryID(final long deliveryID)
- {
- this.deliveryID = deliveryID;
- }
-
- public long getDeliveryID()
- {
- return this.deliveryID;
- }
public boolean isExpired()
{
@@ -288,11 +212,6 @@
return System.currentTimeMillis() - expiration >= 0;
}
- public Message copy()
- {
- return new MessageImpl(this);
- }
-
// Properties
// ---------------------------------------------------------------------------------------
@@ -373,69 +292,9 @@
{
this.body = body;
}
-
-
- // TODO Other stuff that should be moved to ServerMessage:
- // -------------------------------------------------------
-
- public MessageReference createReference(final Queue queue)
- {
- MessageReference ref = new MessageReferenceImpl(this, queue);
- //references.add(ref);
-
- if (durable && queue.isDurable())
- {
- durableRefCount.incrementAndGet();
- }
-
- return ref;
- }
-
- public int getDurableRefCount()
- {
- return durableRefCount.get();
- }
-
- public void decrementDurableRefCount()
- {
- durableRefCount.decrementAndGet();
- }
-
- public void incrementDurableRefCount()
- {
- durableRefCount.incrementAndGet();
- }
-
// Public --------------------------------------------------------
- public boolean equals(Object o)
- {
- if (this == o)
- {
- return true;
- }
-
- if (!(o instanceof MessageImpl))
- {
- return false;
- }
-
- MessageImpl that = (MessageImpl) o;
-
- return that.messageID == this.messageID;
- }
-
- public int hashCode()
- {
- return (int) ((this.messageID >>> 32) ^ this.messageID);
- }
-
- public String toString()
- {
- return "M[" + messageID + "]@" + System.identityHashCode(this);
- }
-
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/message/impl/MessageReferenceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/impl/MessageReferenceImpl.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/message/impl/MessageReferenceImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -24,6 +24,7 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
@@ -54,7 +55,7 @@
private long scheduledDeliveryTime;
- private Message message;
+ private ServerMessage message;
private Queue queue;
@@ -75,7 +76,7 @@
this.queue = queue;
}
- protected MessageReferenceImpl(final Message message, final Queue queue)
+ protected MessageReferenceImpl(final ServerMessage message, final Queue queue)
{
this.message = message;
@@ -114,7 +115,7 @@
this.scheduledDeliveryTime = scheduledDeliveryTime;
}
- public Message getMessage()
+ public ServerMessage getMessage()
{
return message;
}
@@ -151,7 +152,7 @@
binding = postOffice.addBinding(DLQ, DLQ, null, true, false);
}
- Message copyMessage = makeCopyForDLQOrExpiry(false, persistenceManager);
+ ServerMessage copyMessage = makeCopyForDLQOrExpiry(false, persistenceManager);
tx.addMessage(copyMessage);
@@ -192,7 +193,7 @@
binding = postOffice.addBinding(expiryQueue, expiryQueue, null, true, false);
}
- Message copyMessage = makeCopyForDLQOrExpiry(false, persistenceManager);
+ ServerMessage copyMessage = makeCopyForDLQOrExpiry(false, persistenceManager);
copyMessage.setDestination(binding.getAddress());
@@ -223,7 +224,7 @@
// Private -------------------------------------------------------
- private Message makeCopyForDLQOrExpiry(final boolean expiry, final StorageManager pm) throws Exception
+ private ServerMessage makeCopyForDLQOrExpiry(final boolean expiry, final StorageManager pm) throws Exception
{
/*
We copy the message and send that to the dlq/expiry queue - this is
@@ -234,7 +235,7 @@
and original message id
*/
- Message copy = message.copy();
+ ServerMessage copy = message.copy();
long newMessageId = pm.generateMessageID();
Added: trunk/src/main/org/jboss/messaging/core/message/impl/ServerMessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/impl/ServerMessageImpl.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/message/impl/ServerMessageImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -0,0 +1,139 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.core.message.impl;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
+import org.jboss.messaging.core.server.Queue;
+
+/**
+ *
+ * A ServerMessageImpl
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class ServerMessageImpl extends MessageImpl implements ServerMessage
+{
+ private long messageID;
+
+ private long connectionID;
+
+ private final AtomicInteger durableRefCount = new AtomicInteger(0);
+
+ /*
+ * Constructor for when reading from network
+ */
+ public ServerMessageImpl()
+ {
+ }
+
+ /*
+ * Construct a MessageImpl from storage
+ */
+ public ServerMessageImpl(final long messageID)
+ {
+ super();
+
+ this.messageID = messageID;
+ }
+
+ /*
+ * Copy constructor
+ */
+ public ServerMessageImpl(final ServerMessageImpl other)
+ {
+ super(other);
+
+ this.messageID = other.messageID;
+
+ this.connectionID = other.connectionID;
+ }
+
+ /**
+ * Only used in testing
+ */
+ public ServerMessageImpl(final int type, final boolean durable, final long expiration,
+ final long timestamp, final byte priority)
+ {
+ super(type, durable, expiration, timestamp, priority);
+ }
+
+ public long getMessageID()
+ {
+ return messageID;
+ }
+
+ public void setMessageID(final long id)
+ {
+ this.messageID = id;
+ }
+
+ public long getConnectionID()
+ {
+ return connectionID;
+ }
+
+ public void setConnectionID(final long connectionID)
+ {
+ this.connectionID = connectionID;
+ }
+
+ public MessageReference createReference(final Queue queue)
+ {
+ MessageReference ref = new MessageReferenceImpl(this, queue);
+
+ //references.add(ref);
+
+ if (durable && queue.isDurable())
+ {
+ durableRefCount.incrementAndGet();
+ }
+
+ return ref;
+ }
+
+ public int getDurableRefCount()
+ {
+ return durableRefCount.get();
+ }
+
+ public void decrementDurableRefCount()
+ {
+ durableRefCount.decrementAndGet();
+ }
+
+ public void incrementDurableRefCount()
+ {
+ durableRefCount.incrementAndGet();
+ }
+
+ public ServerMessage copy()
+ {
+ return new ServerMessageImpl(this);
+ }
+
+
+}
+
Modified: trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -24,7 +24,7 @@
import java.util.List;
import java.util.Map;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.message.MessageReference;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
@@ -50,14 +50,14 @@
long generateTransactionID();
- void storeMessage(Message message) throws Exception;
+ void storeMessage(ServerMessage message) throws Exception;
void storeAcknowledge(long queueID, long messageID) throws Exception;
void storeDelete(long messageID) throws Exception;
- void storeMessageTransactional(long txID, Message message) throws Exception;
+ void storeMessageTransactional(long txID, ServerMessage message) throws Exception;
void storeAcknowledgeTransactional(long txID, long queueID, long messageiD) throws Exception;
Modified: trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -24,9 +24,9 @@
import org.jboss.messaging.core.journal.impl.JournalImpl;
import org.jboss.messaging.core.journal.impl.NIOSequentialFileFactory;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
-import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.ServerMessage;
+import org.jboss.messaging.core.message.impl.ServerMessageImpl;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
@@ -159,7 +159,7 @@
// Non transactional operations
- public void storeMessage(final Message message) throws Exception
+ public void storeMessage(final ServerMessage message) throws Exception
{
//TODO too much copying is occurring here
@@ -186,7 +186,7 @@
// Transactional operations
- public void storeMessageTransactional(long txID, Message message) throws Exception
+ public void storeMessageTransactional(long txID, ServerMessage message) throws Exception
{
//TODO too much copying is occurring here
@@ -269,7 +269,7 @@
{
MessagingBuffer buff = new ByteBufferWrapper(bb);
- Message message = new MessageImpl(record.id);
+ ServerMessage message = new ServerMessageImpl(record.id);
message.decode(buff);
Modified: trunk/src/main/org/jboss/messaging/core/persistence/impl/nullpm/NullStorageManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/persistence/impl/nullpm/NullStorageManager.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/persistence/impl/nullpm/NullStorageManager.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -25,8 +25,8 @@
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
-import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
@@ -108,11 +108,11 @@
{
}
- public void storeMessage(Message message) throws Exception
+ public void storeMessage(ServerMessage message) throws Exception
{
}
- public void storeMessageTransactional(long txID, Message message) throws Exception
+ public void storeMessageTransactional(long txID, ServerMessage message) throws Exception
{
}
Modified: trunk/src/main/org/jboss/messaging/core/postoffice/PostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/PostOffice.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/PostOffice.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -26,8 +26,8 @@
import java.util.Set;
import org.jboss.messaging.core.filter.Filter;
-import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.server.MessagingComponent;
import org.jboss.messaging.util.SimpleString;
@@ -69,7 +69,7 @@
Binding getBinding(SimpleString queueName) throws Exception;
- List<MessageReference> route(Message message) throws Exception;
+ List<MessageReference> route(ServerMessage message) throws Exception;
//Flow control
Modified: trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -35,8 +35,8 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.FlowController;
@@ -190,7 +190,7 @@
return nameMap.get(queueName);
}
- public List<MessageReference> route(final Message message) throws Exception
+ public List<MessageReference> route(final ServerMessage message) throws Exception
{
SimpleString address = message.getDestination();
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ProducerSendMessageCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ProducerSendMessageCodec.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ProducerSendMessageCodec.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -9,8 +9,8 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.PROD_SEND;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.ServerMessage;
+import org.jboss.messaging.core.message.impl.ServerMessageImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerSendMessage;
import org.jboss.messaging.util.MessagingBuffer;
@@ -46,7 +46,7 @@
@Override
protected void encodeBody(final ProducerSendMessage message, final MessagingBuffer out) throws Exception
{
- MessagingBuffer buffer = message.getMessage().encode();
+ MessagingBuffer buffer = message.getClientMessage().encode();
buffer.flip();
@@ -63,7 +63,7 @@
{
//TODO can be optimised
- Message message = new MessageImpl();
+ ServerMessage message = new ServerMessageImpl();
message.decode(in);
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ReceiveMessageCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ReceiveMessageCodec.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ReceiveMessageCodec.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -9,8 +9,8 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.RECEIVE_MSG;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.ClientMessage;
+import org.jboss.messaging.core.message.impl.ClientMessageImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
import org.jboss.messaging.util.MessagingBuffer;
@@ -41,9 +41,8 @@
@Override
protected void encodeBody(final ReceiveMessage message, final MessagingBuffer out) throws Exception
- {
-
- MessagingBuffer buffer = message.getMessage().encode();
+ {
+ MessagingBuffer buffer = message.getServerMessage().encode();
buffer.flip();
@@ -51,6 +50,9 @@
byte[] data = buffer.array();
+ out.putInt(message.getDeliveryCount());
+ out.putLong(message.getDeliveryID());
+
out.putBytes(data, 0, buffer.limit());
}
@@ -60,8 +62,11 @@
{
//TODO can be optimised
- Message message = new MessageImpl();
+ int deliveryCount = in.getInt();
+ long deliveryID = in.getLong();
+ ClientMessage message = new ClientMessageImpl(deliveryCount, deliveryID);
+
message.decode(in);
message.getBody().flip();
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ProducerSendMessage.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -8,7 +8,8 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.PROD_SEND;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ClientMessage;
+import org.jboss.messaging.core.message.ServerMessage;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -22,33 +23,45 @@
// Attributes ----------------------------------------------------
- private final Message message;
+ private final ClientMessage clientMessage;
+
+ private final ServerMessage serverMessage;
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
- public ProducerSendMessage(final Message message)
+ public ProducerSendMessage(final ClientMessage message)
{
super(PROD_SEND);
- this.message = message;
+ this.clientMessage = message;
+
+ this.serverMessage = null;
}
+
+ public ProducerSendMessage(final ServerMessage message)
+ {
+ super(PROD_SEND);
+ this.serverMessage = message;
+
+ this.clientMessage = null;
+ }
+
// Public --------------------------------------------------------
- public Message getMessage()
+ public ClientMessage getClientMessage()
{
- return message;
+ return clientMessage;
}
- @Override
- public String toString()
+ public ServerMessage getServerMessage()
{
- return getParentString() + ", message=" + message
- + "]";
+ return serverMessage;
}
-
+
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -8,7 +8,8 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.RECEIVE_MSG;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ClientMessage;
+import org.jboss.messaging.core.message.ServerMessage;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -23,36 +24,65 @@
// Attributes ----------------------------------------------------
- private final Message message;
+ private final ClientMessage clientMessage;
+
+ private final ServerMessage serverMessage;
+
+ private final int deliveryCount;
+
+ private final long deliveryID;
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
- public ReceiveMessage(final Message message)
+ public ReceiveMessage(final ClientMessage message)
{
super(RECEIVE_MSG);
- assert message != null;
+ this.clientMessage = message;
+
+ this.serverMessage = null;
+
+ this.deliveryCount = -1;
+
+ this.deliveryID = -1;
+ }
+
+ public ReceiveMessage(final ServerMessage message, final int deliveryCount, final long deliveryID)
+ {
+ super(RECEIVE_MSG);
- this.message = message;
+ this.serverMessage = message;
+
+ this.clientMessage = null;
+
+ this.deliveryCount = deliveryCount;
+
+ this.deliveryID = deliveryID;
}
// Public --------------------------------------------------------
- public Message getMessage()
+ public ClientMessage getClientMessage()
{
- return message;
+ return clientMessage;
}
+
+ public ServerMessage getServerMessage()
+ {
+ return serverMessage;
+ }
- @Override
- public String toString()
+ public int getDeliveryCount()
{
- StringBuffer buf = new StringBuffer(getParentString());
- buf.append(", message=" + message);
- buf.append("]");
- return buf.toString();
+ return deliveryCount;
}
+
+ public long getDeliveryID()
+ {
+ return deliveryID;
+ }
// Package protected ---------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/server/ServerProducer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/ServerProducer.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/server/ServerProducer.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -1,6 +1,6 @@
package org.jboss.messaging.core.server;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ServerMessage;
/**
*
@@ -15,7 +15,7 @@
void close() throws Exception;
- void send(Message msg) throws Exception;
+ void send(ServerMessage msg) throws Exception;
void sendCredits() throws Exception;
Modified: trunk/src/main/org/jboss/messaging/core/server/ServerSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/ServerSession.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/server/ServerSession.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -25,8 +25,8 @@
import javax.transaction.xa.Xid;
-import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionCreateBrowserResponseMessage;
@@ -63,7 +63,7 @@
void promptDelivery(Queue queue);
- void send(Message msg) throws Exception;
+ void send(ServerMessage msg) throws Exception;
void acknowledge(long deliveryID, boolean allUpTo) throws Exception;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -72,21 +72,8 @@
public void deliver() throws Exception
{
- /*
- Note we copy the message before sending.
- This is because delivery count may be different for the same message sent to different topic subscribers
- And invm the same message instance would otherwise be passed to all consumers
- For the non INVM case this copy is unncessary and can be optimised away TODO - although the overhead of
- copying is actually quite small
- */
- Message copy = reference.getMessage().copy();
+ ReceiveMessage message = new ReceiveMessage(reference.getMessage(), reference.getDeliveryCount() + 1, deliveryID);
- copy.setDeliveryCount(reference.getDeliveryCount() + 1);
-
- copy.setDeliveryID(deliveryID);
-
- ReceiveMessage message = new ReceiveMessage(copy);
-
message.setTargetID(consumerID);
message.setExecutorID(sessionID);
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -33,6 +33,7 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.PacketSender;
@@ -69,7 +70,7 @@
private final ServerSession session;
private final Queue destination;
private final Filter filter;
- private Iterator iterator;
+ private Iterator<ServerMessage> iterator;
// Constructors ---------------------------------------------------------------------------------
@@ -115,14 +116,14 @@
return has;
}
- public Message nextMessage() throws Exception
+ public ServerMessage nextMessage() throws Exception
{
if (iterator == null)
{
iterator = createIterator();
}
- Message r = (Message)iterator.next();
+ ServerMessage r = iterator.next();
return r;
}
@@ -139,13 +140,13 @@
iterator = createIterator();
}
- ArrayList messages = new ArrayList(maxMessages);
+ List<ServerMessage> messages = new ArrayList<ServerMessage>(maxMessages);
int i = 0;
while (i < maxMessages)
{
if (iterator.hasNext())
{
- Message m = (Message)iterator.next();
+ ServerMessage m = iterator.next();
messages.add(m);
i++;
}
@@ -176,11 +177,11 @@
// Private --------------------------------------------------------------------------------------
- private Iterator createIterator()
+ private Iterator<ServerMessage> createIterator()
{
List<MessageReference> refs = destination.list(filter);
- List<Message> msgs = new ArrayList<Message>();
+ List<ServerMessage> msgs = new ArrayList<ServerMessage>();
for (MessageReference ref: refs)
{
@@ -215,8 +216,8 @@
response = new SessionBrowserHasNextMessageResponseMessage(hasNextMessage());
break;
case SESS_BROWSER_NEXTMESSAGE:
- Message message = nextMessage();
- response = new ReceiveMessage(message);
+ ServerMessage message = nextMessage();
+ response = new ReceiveMessage(message, 0, 0);
break;
case SESS_BROWSER_RESET:
reset();
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -21,13 +21,12 @@
*/
package org.jboss.messaging.core.server.impl;
-import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.server.HandleStatus;
@@ -185,7 +184,7 @@
return HandleStatus.BUSY;
}
- Message message = ref.getMessage();
+ ServerMessage message = ref.getMessage();
if (filter != null && !filter.match(message))
{
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerImpl.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -22,7 +22,7 @@
package org.jboss.messaging.core.server.impl;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.postoffice.FlowController;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketSender;
@@ -87,7 +87,7 @@
session.removeProducer(this);
}
- public void send(final Message message) throws Exception
+ public void send(final ServerMessage message) throws Exception
{
if (this.address != null)
{
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -61,7 +61,7 @@
{
case PROD_SEND:
ProducerSendMessage message = (ProducerSendMessage) packet;
- producer.send(message.getMessage());
+ producer.send(message.getServerMessage());
break;
case CLOSE:
producer.close();
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -38,8 +38,8 @@
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.filter.impl.FilterImpl;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.FlowController;
@@ -300,7 +300,7 @@
});
}
- public void send(final Message msg) throws Exception
+ public void send(final ServerMessage msg) throws Exception
{
//check the user has write access to this address
securityStore.check(msg.getDestination().toString(), CheckType.WRITE, connection);
@@ -1083,7 +1083,7 @@
private void doAck(final MessageReference ref) throws Exception
{
- Message message = ref.getMessage();
+ ServerMessage message = ref.getMessage();
Queue queue = ref.getQueue();
Modified: trunk/src/main/org/jboss/messaging/core/transaction/Transaction.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/transaction/Transaction.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/transaction/Transaction.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -25,8 +25,8 @@
import javax.transaction.xa.Xid;
-import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.core.settings.impl.QueueSettings;
@@ -45,7 +45,7 @@
void rollback(HierarchicalRepository<QueueSettings> queueSettingsRepository) throws Exception;
- void addMessage(Message message) throws Exception;
+ void addMessage(ServerMessage message) throws Exception;
List<MessageReference> getAcknowledgements();
Modified: trunk/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -30,8 +30,8 @@
import javax.transaction.xa.Xid;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.server.Queue;
@@ -98,8 +98,7 @@
return id;
}
- public void addMessage(final Message message)
- throws Exception
+ public void addMessage(final ServerMessage message) throws Exception
{
if (state != State.ACTIVE)
{
@@ -132,7 +131,7 @@
}
acknowledgements.add(acknowledgement);
- Message message = acknowledgement.getMessage();
+ ServerMessage message = acknowledgement.getMessage();
if (message.isDurable())
{
@@ -258,7 +257,7 @@
{
Queue queue = ref.getQueue();
- Message message = ref.getMessage();
+ ServerMessage message = ref.getMessage();
if (message.isDurable() && queue.isDurable())
{
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -30,6 +30,7 @@
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.message.ClientMessage;
import org.jboss.messaging.core.remoting.impl.mina.BufferWrapper;
/**
@@ -67,9 +68,7 @@
/*
* Constructor on receipt at client side
*/
- public JBossBytesMessage(
- final org.jboss.messaging.core.message.Message message,
- final ClientSession session)
+ public JBossBytesMessage(final ClientMessage message, final ClientSession session)
{
super(message, session);
}
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossMapMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossMapMessage.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossMapMessage.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -31,6 +31,7 @@
import javax.jms.MessageFormatException;
import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.message.ClientMessage;
import org.jboss.messaging.util.SimpleString;
import org.jboss.messaging.util.TypedProperties;
@@ -70,7 +71,7 @@
map = new TypedProperties();
}
- public JBossMapMessage(final org.jboss.messaging.core.message.Message message, final ClientSession session)
+ public JBossMapMessage(final ClientMessage message, final ClientSession session)
{
super(message, session);
}
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -39,8 +39,8 @@
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.remoting.impl.mina.BufferWrapper;
+import org.jboss.messaging.core.message.ClientMessage;
+import org.jboss.messaging.core.message.impl.ClientMessageImpl;
import org.jboss.messaging.jms.JBossDestination;
import org.jboss.messaging.util.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
@@ -108,7 +108,7 @@
private static final Logger log = Logger.getLogger(JBossMessage.class);
- public static JBossMessage createMessage(final org.jboss.messaging.core.message.Message message, final ClientSession session)
+ public static JBossMessage createMessage(final ClientMessage message, final ClientSession session)
{
int type = message.getType();
@@ -144,7 +144,7 @@
// Attributes ----------------------------------------------------
//The underlying message
- protected org.jboss.messaging.core.message.Message message;
+ protected ClientMessage message;
protected MessagingBuffer body;
@@ -175,7 +175,7 @@
*/
protected JBossMessage(final int type)
{
- message = new MessageImpl(type, true, 0, System.currentTimeMillis(), (byte)4);
+ message = new ClientMessageImpl(type, true, 0, System.currentTimeMillis(), (byte)4);
//TODO - can we lazily create this?
body = message.getBody();
@@ -189,7 +189,7 @@
/**
* Constructor for when receiving a message from the server
*/
- public JBossMessage(final org.jboss.messaging.core.message.Message message, ClientSession session)
+ public JBossMessage(final ClientMessage message, ClientSession session)
{
this.message = message;
@@ -853,7 +853,7 @@
// Public --------------------------------------------------------
- public org.jboss.messaging.core.message.Message getCoreMessage()
+ public ClientMessage getCoreMessage()
{
return message;
}
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossMessageConsumer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossMessageConsumer.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossMessageConsumer.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -36,6 +36,7 @@
import org.jboss.messaging.core.client.MessageHandler;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.message.ClientMessage;
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
@@ -200,7 +201,7 @@
{
try
{
- org.jboss.messaging.core.message.Message message = consumer.receive(timeout);
+ ClientMessage message = consumer.receive(timeout);
JBossMessage jbm = null;
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossObjectMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossObjectMessage.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossObjectMessage.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -31,6 +31,7 @@
import javax.jms.ObjectMessage;
import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.message.ClientMessage;
/**
* This class implements javax.jms.ObjectMessage
@@ -68,7 +69,7 @@
super(JBossObjectMessage.TYPE);
}
- public JBossObjectMessage(final org.jboss.messaging.core.message.Message message, ClientSession session)
+ public JBossObjectMessage(final ClientMessage message, ClientSession session)
{
super(message, session);
}
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossQueueBrowser.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossQueueBrowser.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossQueueBrowser.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -30,7 +30,7 @@
import org.jboss.messaging.core.client.ClientBrowser;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ClientMessage;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -135,7 +135,7 @@
{
try
{
- Message message = browser.nextMessage();
+ ClientMessage message = browser.nextMessage();
JBossMessage jbm = JBossMessage.createMessage(message, null);
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossStreamMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossStreamMessage.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossStreamMessage.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -30,6 +30,7 @@
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.message.ClientMessage;
import org.jboss.messaging.core.remoting.impl.mina.BufferWrapper;
import org.jboss.messaging.util.DataConstants;
@@ -72,7 +73,7 @@
super(JBossStreamMessage.TYPE);
}
- public JBossStreamMessage(final org.jboss.messaging.core.message.Message message, final ClientSession session)
+ public JBossStreamMessage(final ClientMessage message, final ClientSession session)
{
super(message, session);
}
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossTextMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossTextMessage.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossTextMessage.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -27,6 +27,7 @@
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.message.ClientMessage;
/**
* This class implements javax.jms.TextMessage ported from SpyTextMessage in JBossMQ.
@@ -66,7 +67,7 @@
super(JBossTextMessage.TYPE);
}
- public JBossTextMessage(final org.jboss.messaging.core.message.Message message, ClientSession session)
+ public JBossTextMessage(final ClientMessage message, ClientSession session)
{
super(message, session);
}
Modified: trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -27,7 +27,7 @@
import org.jboss.messaging.core.client.MessageHandler;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ClientMessage;
/**
*
@@ -59,7 +59,7 @@
* In this method we apply the JMS acknowledgement and redelivery semantics
* as per JMS spec
*/
- public void onMessage(final Message message)
+ public void onMessage(final ClientMessage message)
{
JBossMessage jbm = JBossMessage.createMessage(message, session.getCoreSession());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -11,8 +11,8 @@
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.ClientMessage;
+import org.jboss.messaging.core.message.impl.ClientMessageImpl;
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.core.server.impl.MessagingServerImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
@@ -67,7 +67,7 @@
ClientProducer producer = session.createProducer(QUEUE);
- Message message = new MessageImpl(JBossTextMessage.TYPE, false, 0,
+ ClientMessage message = new ClientMessageImpl(JBossTextMessage.TYPE, false, 0,
System.currentTimeMillis(), (byte) 1);
message.getBody().putString("testINVMCoreClient");
producer.send(message);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -33,8 +33,9 @@
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.message.ClientMessage;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.impl.ClientMessageImpl;
import org.jboss.messaging.core.server.ConnectionManager;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.impl.MessagingServerImpl;
@@ -121,7 +122,7 @@
// + 1 per connection to the client
assertActiveConnections(1 + numberOfConnectionsOnTheClient);
- MessageImpl message = new MessageImpl(JBossTextMessage.TYPE, false, 0,
+ ClientMessage message = new ClientMessageImpl(JBossTextMessage.TYPE, false, 0,
System.currentTimeMillis(), (byte) 1);
message.getBody().putString(ClientCrashTest.MESSAGE_TEXT_FROM_SERVER);
producer.send(message);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/CrashClient.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/CrashClient.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/CrashClient.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -36,7 +36,8 @@
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.ClientMessage;
+import org.jboss.messaging.core.message.impl.ClientMessageImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
@@ -88,7 +89,7 @@
}
}
- MessageImpl message = new MessageImpl(JBossTextMessage.TYPE, false, 0,
+ ClientMessage message = new ClientMessageImpl(JBossTextMessage.TYPE, false, 0,
System.currentTimeMillis(), (byte) 1);
message.getBody().putString(ClientCrashTest.MESSAGE_TEXT_FROM_CLIENT);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/DummyInterceptor.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/DummyInterceptor.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/DummyInterceptor.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -47,8 +47,8 @@
if (packet instanceof ReceiveMessage)
{
ReceiveMessage deliver = (ReceiveMessage)packet;
- log.info("msg = " + deliver.getMessage().getClass().getName());
- deliver.getMessage().putStringProperty(new SimpleString("DummyInterceptor"), new SimpleString("was here"));
+ log.info("msg = " + deliver.getServerMessage().getClass().getName());
+ deliver.getServerMessage().putStringProperty(new SimpleString("DummyInterceptor"), new SimpleString("was here"));
}
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/GracefulClient.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/GracefulClient.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/GracefulClient.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -34,7 +34,8 @@
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.ClientMessage;
+import org.jboss.messaging.core.message.impl.ClientMessageImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
/**
@@ -67,7 +68,7 @@
ClientProducer producer = session.createProducer(QUEUE);
ClientConsumer consumer = session.createConsumer(QUEUE, null, false, false, true);
- MessageImpl message = new MessageImpl(JBossTextMessage.TYPE, false, 0,
+ ClientMessage message = new ClientMessageImpl(JBossTextMessage.TYPE, false, 0,
System.currentTimeMillis(), (byte) 1);
message.getBody().putString(ClientExitTest.MESSAGE_TEXT);
producer.send(message);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -21,8 +21,9 @@
import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.message.ClientMessage;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.impl.ClientMessageImpl;
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.core.server.impl.MessagingServerImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
@@ -183,7 +184,7 @@
String msg = "msg " + UUID.randomUUID().toString();
interceptor.changeMessage = true;
- MessageImpl message = new MessageImpl(JBossTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte) 1);
+ ClientMessage message = new ClientMessageImpl(JBossTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte) 1);
message.getBody().putString(msg);
producer.send(message);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSL.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSL.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSL.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -25,12 +25,18 @@
import java.util.Arrays;
-import org.jboss.messaging.core.client.*;
+import org.jboss.messaging.core.client.ClientConnection;
+import org.jboss.messaging.core.client.ClientConnectionFactory;
+import org.jboss.messaging.core.client.ClientProducer;
+import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.client.ConnectionParams;
+import org.jboss.messaging.core.client.Location;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
+import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
import org.jboss.messaging.core.client.impl.LocationImpl;
-import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.ClientMessage;
+import org.jboss.messaging.core.message.impl.ClientMessageImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
/**
@@ -76,7 +82,7 @@
ClientSession session = conn.createClientSession(false, true, true, -1, false, false);
ClientProducer producer = session.createProducer(CoreClientOverSSLTest.QUEUE);
- MessageImpl message = new MessageImpl(JBossTextMessage.TYPE, false, 0,
+ ClientMessage message = new ClientMessageImpl(JBossTextMessage.TYPE, false, 0,
System.currentTimeMillis(), (byte) 1);
message.getBody().putString(CoreClientOverSSLTest.MESSAGE_TEXT_FROM_CLIENT);
producer.send(message);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/FilterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/FilterTest.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/filter/impl/FilterTest.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -26,8 +26,9 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.filter.impl.FilterImpl;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.impl.ServerMessageImpl;
import org.jboss.messaging.util.SimpleString;
/**
@@ -41,7 +42,7 @@
{
private Filter filter;
- private Message message;
+ private ServerMessage message;
public FilterTest(String name)
{
@@ -52,7 +53,7 @@
{
super.setUp();
- message = new MessageImpl();
+ message = new ServerMessageImpl();
}
public void testInvalidString() throws Exception
@@ -80,7 +81,7 @@
filter = new FilterImpl(new SimpleString("JBMDurable='NON_DURABLE'"));
- message = new MessageImpl();
+ message = new ServerMessageImpl();
message.setDurable(true);
assertFalse(filter.match(message));
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageTest.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/message/impl/MessageTest.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -21,9 +21,13 @@
*/
package org.jboss.messaging.tests.unit.core.message.impl;
+import org.jboss.messaging.core.message.ClientMessage;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
+import org.jboss.messaging.core.message.impl.ClientMessageImpl;
import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.impl.ServerMessageImpl;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.QueueFactory;
import org.jboss.messaging.tests.unit.core.server.impl.fakes.FakeQueueFactory;
@@ -52,10 +56,8 @@
long timestamp = 82798172;
byte priority = 32;
- Message message = new MessageImpl(type, reliable, expiration, timestamp, priority);
- message.setMessageID(id);
-
- assertEquals(id, message.getMessageID());
+ ClientMessage message = new ClientMessageImpl(type, reliable, expiration, timestamp, priority);
+
assertEquals(type, message.getType());
assertEquals(reliable, message.isDurable());
assertEquals(timestamp, message.getTimestamp());
@@ -63,10 +65,8 @@
reliable = false;
- message = new MessageImpl(type, reliable, expiration, timestamp, priority);
- message.setMessageID(id);
-
- assertEquals(id, message.getMessageID());
+ message = new ClientMessageImpl(type, reliable, expiration, timestamp, priority);
+
assertEquals(type, message.getType());
assertEquals(reliable, message.isDurable());
assertEquals(timestamp, message.getTimestamp());
@@ -77,37 +77,20 @@
{
long id = 56465;
- Message message = new MessageImpl(id);
+ ServerMessage message = new ServerMessageImpl(id);
assertEquals(id, message.getMessageID());
}
- public void testCopy()
- {
- long id = 56465;
- int type = 655;
- boolean reliable = true;
- long expiration = 6712671;
- long timestamp = 82798172;
- byte priority = 32;
-
- Message message = new MessageImpl(type, reliable, expiration, timestamp, priority);
- message.setMessageID(id);
-
- Message message2 = message.copy();
-
- assertEquivalent(message, message2);
- }
-
public void testSetAndGetMessageID()
{
- Message message = new MessageImpl();
+ ServerMessage message = new ServerMessageImpl();
assertEquals(0, message.getMessageID());
- message = new MessageImpl(655, true, 767676, 989898, (byte)32);
+ message = new ServerMessageImpl(23);
- assertEquals(0, message.getMessageID());
+ assertEquals(23, message.getMessageID());
long id = 765432;
message.setMessageID(id);
@@ -116,7 +99,7 @@
public void testSetAndGetReliable()
{
- Message message = new MessageImpl();
+ ServerMessage message = new ServerMessageImpl();
boolean reliable = true;
message.setDurable(reliable);
@@ -129,7 +112,7 @@
public void testSetAndGetExpiration()
{
- Message message = new MessageImpl();
+ ServerMessage message = new ServerMessageImpl();
long expiration = System.currentTimeMillis() + 10000;
message.setExpiration(expiration);
@@ -146,7 +129,7 @@
public void testSetAndGetTimestamp()
{
- Message message = new MessageImpl();
+ ServerMessage message = new ServerMessageImpl();
long timestamp = System.currentTimeMillis();
message.setTimestamp(timestamp);
@@ -155,7 +138,7 @@
public void testSetAndGetPriority()
{
- Message message = new MessageImpl();
+ ServerMessage message = new ServerMessageImpl();
byte priority = 7;
message.setPriority(priority);
assertEquals(priority, message.getPriority());
@@ -163,54 +146,17 @@
public void testSetAndGetConnectionID()
{
- Message message = new MessageImpl();
+ ServerMessage message = new ServerMessageImpl();
assertEquals(0, message.getConnectionID());
long connectionID = 781628;
message.setConnectionID(connectionID);
assertEquals(connectionID, message.getConnectionID());
}
-
-
- public void testEquals()
- {
- Message message1 = new MessageImpl();
- message1.setMessageID(1);
-
- Message message2 = new MessageImpl();
- message2.setMessageID(2);
-
- Message message3 = new MessageImpl();
- message3.setMessageID(1);
-
- assertTrue(message1.equals(message1));
- assertTrue(message2.equals(message2));
- assertTrue(message3.equals(message3));
-
- assertFalse(message1.equals(message2));
- assertFalse(message2.equals(message1));
-
- assertFalse(message2.equals(message3));
- assertFalse(message3.equals(message2));
-
- assertTrue(message1.equals(message3));
- assertTrue(message3.equals(message1));
-
- }
-
- public void testHashcode()
- {
- long id1 = 6567575;
- Message message1 = new MessageImpl();
- message1.setMessageID(id1);
-
- assertEquals((int) ((id1 >>> 32) ^ id1), message1.hashCode());
- }
-
public void testMessageReference()
{
- Message message = new MessageImpl();
+ ServerMessage message = new ServerMessageImpl();
SimpleString squeue1 = new SimpleString("queue1");
SimpleString squeue2 = new SimpleString("queue2");
@@ -248,10 +194,10 @@
public void testDurableReferences()
{
- Message messageDurable = new MessageImpl();
+ ServerMessage messageDurable = new ServerMessageImpl();
messageDurable.setDurable(true);
- Message messageNonDurable = new MessageImpl();
+ ServerMessage messageNonDurable = new ServerMessageImpl();
messageNonDurable.setDurable(false);
SimpleString squeue1 = new SimpleString("queue1");
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeTest.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeTest.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -26,7 +26,7 @@
import org.easymock.EasyMock;
import org.jboss.messaging.core.filter.Filter;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
@@ -245,9 +245,6 @@
assertEquals(0, mappings.size());
}
-
-
-
class FakeFilter implements Filter
{
public SimpleString getFilterString()
@@ -255,7 +252,7 @@
return new SimpleString("aardvark");
}
- public boolean match(Message message)
+ public boolean match(ServerMessage message)
{
return true;
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/concurrent/QueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/concurrent/QueueTest.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/concurrent/QueueTest.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -24,8 +24,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.server.HandleStatus;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.QueueFactory;
@@ -131,7 +131,7 @@
while (System.currentTimeMillis() - start < testTime)
{
- Message message = generateMessage(i);
+ ServerMessage message = generateMessage(i);
MessageReference ref = message.createReference(queue);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/fakes/FakeFilter.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/fakes/FakeFilter.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/fakes/FakeFilter.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -22,7 +22,7 @@
package org.jboss.messaging.tests.unit.core.server.impl.fakes;
import org.jboss.messaging.core.filter.Filter;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.util.SimpleString;
/**
@@ -49,7 +49,7 @@
{
}
- public boolean match(Message message)
+ public boolean match(ServerMessage message)
{
if (headerName != null)
{
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/transaction/impl/TransactionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/transaction/impl/TransactionTest.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/transaction/impl/TransactionTest.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -2,8 +2,6 @@
import static org.jboss.messaging.tests.util.RandomUtil.randomXid;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
@@ -12,6 +10,7 @@
import org.easymock.EasyMock;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
+import org.jboss.messaging.core.message.ServerMessage;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.server.Queue;
@@ -504,7 +503,7 @@
//Some refs to ack
- Message message1 = this.generateMessage(12);
+ ServerMessage message1 = this.generateMessage(12);
MessageReference ref1 = message1.createReference(queue1);
@@ -514,7 +513,7 @@
//Non durable message to ack
- Message message2 = this.generateMessage(23);
+ ServerMessage message2 = this.generateMessage(23);
message2.setDurable(false);
Modified: trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java 2008-05-08 09:38:50 UTC (rev 4161)
+++ trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java 2008-05-08 10:59:15 UTC (rev 4162)
@@ -35,11 +35,10 @@
import junit.framework.TestCase;
-import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
-import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.message.ServerMessage;
+import org.jboss.messaging.core.message.impl.ServerMessageImpl;
import org.jboss.messaging.core.server.Queue;
-import org.jboss.messaging.core.transaction.impl.XidImpl;
/**
*
@@ -198,9 +197,9 @@
}
}
- protected Message generateMessage(long id)
+ protected ServerMessage generateMessage(long id)
{
- Message message = new MessageImpl(0, true, 0, System.currentTimeMillis(), (byte)4);
+ ServerMessage message = new ServerMessageImpl(0, true, 0, System.currentTimeMillis(), (byte)4);
message.setMessageID(id);
@@ -220,17 +219,17 @@
protected MessageReference generateReference(Queue queue, long id)
{
- Message message = generateMessage(id);
+ ServerMessage message = generateMessage(id);
return message.createReference(queue);
}
- protected void assertEquivalent(Message msg1, Message msg2)
+ protected void assertEquivalent(ServerMessage msg1, ServerMessage msg2)
{
assertEquivalent(msg1, msg2, true);
}
- protected void assertEquivalent(Message msg1, Message msg2, boolean exactQueue)
+ protected void assertEquivalent(ServerMessage msg1, ServerMessage msg2, boolean exactQueue)
{
assertEquals(msg1.getMessageID(), msg2.getMessageID());
More information about the jboss-cvs-commits
mailing list