[Jboss-cvs] JBoss Messaging SVN: r1290 - in trunk: src/main/org/jboss/jms/server/destination src/main/org/jboss/jms/server/endpoint src/main/org/jboss/messaging/core/message src/main/org/jboss/messaging/core/plugin src/main/org/jboss/messaging/core/plugin/contract src/main/org/jboss/messaging/core/plugin/postoffice src/main/org/jboss/messaging/core/plugin/postoffice/cluster src/main/org/jboss/messaging/util tests/src/org/jboss/test/messaging/core/base tests/src/org/jboss/test/messaging/core/message tests/src/org/jboss/test/messaging/core/paging tests/src/org/jboss/test/messaging/core/plugin tests/src/org/jboss/test/messaging/core/plugin/base tests/src/org/jboss/test/messaging/util
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 14 14:42:58 EDT 2006
Author: timfox
Date: 2006-09-14 14:42:29 -0400 (Thu, 14 Sep 2006)
New Revision: 1290
Added:
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/Binding.java
trunk/tests/src/org/jboss/test/messaging/util/CoreMessageFactory.java
Removed:
trunk/src/main/org/jboss/messaging/core/plugin/contract/Binding.java
Modified:
trunk/src/main/org/jboss/jms/server/destination/ManagedQueue.java
trunk/src/main/org/jboss/jms/server/destination/ManagedTopic.java
trunk/src/main/org/jboss/jms/server/destination/QueueService.java
trunk/src/main/org/jboss/jms/server/destination/TopicService.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
trunk/src/main/org/jboss/messaging/core/message/MessageFactory.java
trunk/src/main/org/jboss/messaging/core/message/MessageSupport.java
trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
trunk/src/main/org/jboss/messaging/core/plugin/contract/ClusteredPostOffice.java
trunk/src/main/org/jboss/messaging/core/plugin/contract/PostOffice.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/BindingImpl.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/ConditionBindings.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/PostOfficeImpl.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/CastMessagesCallback.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/ClusterRequest.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/ClusteredBinding.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/ClusteredPostOfficeImpl.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/FavourLocalRoutingPolicy.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MessageHolder.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MessageRequest.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MessagesRequest.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MoveTransactionRequest.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/RoutingPolicy.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/SendNodeIdRequest.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/SendTransactionRequest.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/SharedState.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/TransactionRequest.java
trunk/src/main/org/jboss/messaging/util/StreamUtils.java
trunk/tests/src/org/jboss/test/messaging/core/base/QueueTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/message/CoreMessageTest.java
trunk/tests/src/org/jboss/test/messaging/core/message/JBossMessageTest.java
trunk/tests/src/org/jboss/test/messaging/core/message/SimpleMessageReferenceTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_2PCTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_NTTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_TTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_2PCTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_NTTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_TTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_2PCTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_NTTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_TTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
trunk/tests/src/org/jboss/test/messaging/core/plugin/ClusteredPostOfficeTest.java
trunk/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java
trunk/tests/src/org/jboss/test/messaging/core/plugin/SimplePostOfficeTest.java
trunk/tests/src/org/jboss/test/messaging/core/plugin/base/MessageStoreTestBase.java
Log:
More clustering work
Modified: trunk/src/main/org/jboss/jms/server/destination/ManagedQueue.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/ManagedQueue.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/jms/server/destination/ManagedQueue.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -27,7 +27,7 @@
import javax.jms.JMSException;
import org.jboss.jms.selector.Selector;
-import org.jboss.messaging.core.plugin.contract.Binding;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
/**
* A ManagedQueue
Modified: trunk/src/main/org/jboss/jms/server/destination/ManagedTopic.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/ManagedTopic.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/jms/server/destination/ManagedTopic.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -30,7 +30,7 @@
import org.jboss.jms.selector.Selector;
import org.jboss.jms.util.MessageQueueNameHelper;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.plugin.contract.Binding;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
/**
* A ManagedTopic
Modified: trunk/src/main/org/jboss/jms/server/destination/QueueService.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/QueueService.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/jms/server/destination/QueueService.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -11,7 +11,7 @@
import org.jboss.jms.util.ExceptionUtil;
import org.jboss.jms.util.XMLUtil;
-import org.jboss.messaging.core.plugin.contract.Binding;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
Modified: trunk/src/main/org/jboss/jms/server/destination/TopicService.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/TopicService.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/jms/server/destination/TopicService.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -15,7 +15,7 @@
import org.jboss.jms.server.QueuedExecutorPool;
import org.jboss.jms.util.ExceptionUtil;
import org.jboss.jms.util.XMLUtil;
-import org.jboss.messaging.core.plugin.contract.Binding;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -50,8 +50,8 @@
import org.jboss.messaging.core.Routable;
import org.jboss.messaging.core.SimpleDelivery;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.plugin.contract.Binding;
import org.jboss.messaging.core.plugin.contract.PostOffice;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
import org.jboss.messaging.core.tx.Transaction;
import org.jboss.messaging.core.tx.TransactionException;
import org.jboss.messaging.core.tx.TxCallback;
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -56,10 +56,10 @@
import org.jboss.logging.Logger;
import org.jboss.messaging.core.local.Queue;
import org.jboss.messaging.core.plugin.IdManager;
-import org.jboss.messaging.core.plugin.contract.Binding;
import org.jboss.messaging.core.plugin.contract.MessageStore;
import org.jboss.messaging.core.plugin.contract.PersistenceManager;
import org.jboss.messaging.core.plugin.contract.PostOffice;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
import org.jboss.util.id.GUID;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
Modified: trunk/src/main/org/jboss/messaging/core/message/MessageFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/MessageFactory.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/message/MessageFactory.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -21,19 +21,18 @@
*/
package org.jboss.messaging.core.message;
-import org.jboss.messaging.core.Message;
+import java.util.HashMap;
+import java.util.Map;
+
import org.jboss.jms.destination.JBossDestination;
-import org.jboss.jms.message.JBossMessage;
-import org.jboss.jms.message.JBossObjectMessage;
-import org.jboss.jms.message.JBossTextMessage;
import org.jboss.jms.message.JBossBytesMessage;
import org.jboss.jms.message.JBossMapMessage;
+import org.jboss.jms.message.JBossMessage;
+import org.jboss.jms.message.JBossObjectMessage;
import org.jboss.jms.message.JBossStreamMessage;
+import org.jboss.jms.message.JBossTextMessage;
+import org.jboss.messaging.core.Message;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -75,48 +74,15 @@
{
m = new JBossStreamMessage();
}
+ else if (type == CoreMessage.TYPE)
+ {
+ m = new CoreMessage();
+ }
return m;
}
- public static CoreMessage createCoreMessage(long messageID)
- {
- return createCoreMessage(messageID, false, 0, 0, (byte)4, null, null, 0);
- }
-
- public static CoreMessage createCoreMessage(long messageID,
- boolean reliable,
- Serializable payload)
- {
- return createCoreMessage(messageID, reliable, 0, 0, (byte)4, null, payload, 0);
- }
-
- public static CoreMessage createCoreMessage(long messageID,
- boolean reliable,
- long expiration,
- long timestamp,
- byte priority,
- Map coreHeaders,
- Serializable payload,
- int persistentChannelCount)
- {
- CoreMessage cm =
- new CoreMessage(messageID, reliable, expiration, timestamp, priority, coreHeaders, null, persistentChannelCount);
- cm.setPayload(payload);
- return cm;
- }
- public static CoreMessage createCoreMessage(long messageID,
- boolean reliable,
- long expiration,
- long timestamp,
- byte priority,
- Map coreHeaders,
- Serializable payload)
- {
- return createCoreMessage(messageID, reliable, expiration, timestamp, priority, coreHeaders, payload, 0);
- }
-
public static Message createJBossMessage(long messageID,
boolean reliable,
long expiration,
@@ -173,6 +139,10 @@
payloadAsByteArray, persistentChannelCount, jmsType, correlationID, correlationIDBytes,
destination, replyTo, jmsProperties);
}
+ else if (type == CoreMessage.TYPE)
+ {
+ m = new CoreMessage(messageID, reliable, expiration, timestamp, priority, coreHeaders, payloadAsByteArray, persistentChannelCount);
+ }
else
{
throw new IllegalArgumentException("Unknow type " + type);
@@ -181,7 +151,7 @@
return m;
}
-
+
// Attributes ----------------------------------------------------
// Constructors --------------------------------------------------
@@ -196,3 +166,4 @@
// Inner classes -------------------------------------------------
}
+
Modified: trunk/src/main/org/jboss/messaging/core/message/MessageSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/MessageSupport.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/message/MessageSupport.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -28,6 +28,7 @@
import java.io.Serializable;
import java.util.Map;
+import org.jboss.logging.Logger;
import org.jboss.messaging.core.Message;
import org.jboss.messaging.util.StreamUtils;
@@ -44,7 +45,9 @@
public abstract class MessageSupport extends RoutableSupport implements Message
{
// Constants -----------------------------------------------------
-
+
+ private static final Logger log = Logger.getLogger(MessageSupport.class);
+
// Attributes ----------------------------------------------------
// Must be hidden from subclasses
Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -506,18 +506,19 @@
}
m = MessageFactory.createJBossMessage(messageId, reliable, expiration, timestamp, priority,
- coreHeaders, payload, persistentChannelCount,
- type, jmsType, correlationID, correlationIDBytes,
- dest, replyToDest,
- jmsProperties);
+ coreHeaders, payload, persistentChannelCount,
+ type, jmsType, correlationID, correlationIDBytes,
+ dest, replyToDest,
+ jmsProperties);
}
else
{
- //Core message
- m = MessageFactory.createCoreMessage(messageId, reliable, expiration, timestamp, priority,
- coreHeaders, payload, persistentChannelCount);
+ m = MessageFactory.createJBossMessage(messageId, reliable, expiration, timestamp, priority,
+ coreHeaders, payload, persistentChannelCount, type,
+ null, null, null, null, null, null);
}
+
msgs.add(m);
}
Deleted: trunk/src/main/org/jboss/messaging/core/plugin/contract/Binding.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/contract/Binding.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/contract/Binding.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -1,59 +0,0 @@
-/*
- * 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.plugin.contract;
-
-import org.jboss.messaging.core.local.Queue;
-
-/**
- * A Binding
-
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision: 1.1 $</tt>
- *
- * $Id$
- *
- */
-public interface Binding
-{
- String getNodeId();
-
- String getQueueName();
-
- String getCondition();
-
- Queue getQueue();
-
- String getSelector();
-
- long getChannelId();
-
- boolean isDurable();
-
- boolean isActive();
-
- void activate();
-
- void deactivate();
-
- void setQueue(Queue queue);
-
-}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/contract/ClusteredPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/contract/ClusteredPostOffice.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/contract/ClusteredPostOffice.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -21,7 +21,8 @@
*/
package org.jboss.messaging.core.plugin.contract;
-import org.jboss.messaging.core.local.Queue;
+import org.jboss.messaging.core.plugin.postoffice.cluster.ClusteredBinding;
+import org.jboss.messaging.core.plugin.postoffice.cluster.ClusteredQueue;
/**
*
@@ -45,7 +46,7 @@
* @return
* @throws Exception
*/
- Binding bindClusteredQueue(String queueName, String condition, Queue queue) throws Exception;
+ ClusteredBinding bindClusteredQueue(String queueName, String condition, ClusteredQueue queue) throws Exception;
/**
* Unbind a clustered queue from the post office
@@ -53,6 +54,6 @@
* @return
* @throws Throwable
*/
- Binding unbindClusteredQueue(String queueName) throws Throwable;
+ ClusteredBinding unbindClusteredQueue(String queueName) throws Throwable;
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/contract/PostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/contract/PostOffice.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/contract/PostOffice.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -25,6 +25,7 @@
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.Queue;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
import org.jboss.messaging.core.tx.Transaction;
/**
Added: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/Binding.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/Binding.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/Binding.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -0,0 +1,59 @@
+/*
+ * 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.plugin.postoffice;
+
+import org.jboss.messaging.core.local.Queue;
+
+/**
+ * A Binding
+
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @version <tt>$Revision: 1.1 $</tt>
+ *
+ * $Id$
+ *
+ */
+public interface Binding
+{
+ String getNodeId();
+
+ String getQueueName();
+
+ String getCondition();
+
+ Queue getQueue();
+
+ String getSelector();
+
+ long getChannelId();
+
+ boolean isDurable();
+
+ boolean isActive();
+
+ void activate();
+
+ void deactivate();
+
+ void setQueue(Queue queue);
+
+}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/BindingImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/BindingImpl.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/BindingImpl.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -25,7 +25,6 @@
import java.io.DataOutputStream;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.plugin.contract.Binding;
import org.jboss.messaging.util.StreamUtils;
/**
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/ConditionBindings.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/ConditionBindings.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/ConditionBindings.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -23,10 +23,10 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.jboss.messaging.core.plugin.contract.Binding;
/**
* A ConditionBindings
@@ -60,6 +60,8 @@
nonDurableBindings = new ArrayList();
+ nameMap = new HashMap();
+
this.thisNode = thisNode;
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/PostOfficeImpl.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/PostOfficeImpl.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -41,7 +41,6 @@
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.Queue;
import org.jboss.messaging.core.plugin.JDBCSupport;
-import org.jboss.messaging.core.plugin.contract.Binding;
import org.jboss.messaging.core.plugin.contract.MessageStore;
import org.jboss.messaging.core.plugin.contract.PostOffice;
import org.jboss.messaging.core.tx.Transaction;
@@ -224,14 +223,16 @@
try
{
- List list = (List)conditionMap.get(condition);
-
- if (list == null)
+ ConditionBindings cb = (ConditionBindings)conditionMap.get(condition);
+
+ if (cb == null)
{
return Collections.EMPTY_LIST;
}
else
{
+ List list = cb.getAllBindings();
+
return list;
}
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/CastMessagesCallback.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/CastMessagesCallback.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/CastMessagesCallback.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -25,6 +25,7 @@
import java.util.List;
import java.util.Map;
+import org.jboss.logging.Logger;
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.tx.TxCallback;
@@ -60,6 +61,8 @@
*/
class CastMessagesCallback implements TxCallback
{
+ private static final Logger log = Logger.getLogger(CastMessagesCallback.class);
+
private List persistent;
private List nonPersistent;
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/ClusterRequest.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/ClusterRequest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/ClusterRequest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -24,6 +24,7 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
+import org.jboss.logging.Logger;
import org.jboss.messaging.util.Streamable;
/**
@@ -38,13 +39,15 @@
*/
abstract class ClusterRequest implements Streamable
{
+ private static final Logger log = Logger.getLogger(ClusterRequest.class);
+
/*
* Factory method
*/
static ClusterRequest createFromStream(DataInputStream dais) throws Exception
{
byte type = dais.readByte();
-
+
ClusterRequest request = null;
switch (type)
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/ClusteredBinding.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/ClusteredBinding.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/ClusteredBinding.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -21,7 +21,7 @@
*/
package org.jboss.messaging.core.plugin.postoffice.cluster;
-import org.jboss.messaging.core.plugin.contract.Binding;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
import org.jboss.messaging.util.Streamable;
/**
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/ClusteredPostOfficeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/ClusteredPostOfficeImpl.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/ClusteredPostOfficeImpl.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -40,10 +40,10 @@
import org.jboss.messaging.core.Delivery;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.plugin.contract.Binding;
import org.jboss.messaging.core.plugin.contract.ClusteredPostOffice;
import org.jboss.messaging.core.plugin.contract.MessageStore;
import org.jboss.messaging.core.plugin.contract.PersistenceManager;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
import org.jboss.messaging.core.plugin.postoffice.ConditionBindings;
import org.jboss.messaging.core.plugin.postoffice.PostOfficeImpl;
import org.jboss.messaging.core.tx.Transaction;
@@ -277,9 +277,9 @@
// PostOffice implementation ---------------------------------------
- public Binding bindClusteredQueue(String queueName, String condition, Queue queue) throws Exception
+ public ClusteredBinding bindClusteredQueue(String queueName, String condition, ClusteredQueue queue) throws Exception
{
- Binding binding = super.bindQueue(queueName, condition, queue);
+ ClusteredBinding binding = (ClusteredBinding)super.bindQueue(queueName, condition, queue);
boolean durable = queue.isRecoverable();
@@ -294,9 +294,9 @@
return binding;
}
- public Binding unbindClusteredQueue(String queueName) throws Throwable
+ public ClusteredBinding unbindClusteredQueue(String queueName) throws Throwable
{
- Binding binding = super.unbindQueue(queueName);
+ ClusteredBinding binding = (ClusteredBinding)super.unbindQueue(queueName);
UnbindRequest request = new UnbindRequest(nodeId, queueName);
@@ -368,6 +368,7 @@
Map queueNameNodeIdMap = null;
+
while (iter.hasNext())
{
//Each list is the list of bindings which have the same queue name
@@ -425,7 +426,7 @@
{
//It's a binding on a different office instance on the cluster
numberRemote++;
-
+
if (ref.isReliable() && binding.isDurable())
{
//Insert the reference into the database
@@ -451,7 +452,7 @@
if (tx == null)
{
- //We just throw the message on the network - no need to wait for any reply
+ //We just throw the message on the network - no need to wait for any reply
asyncSendRequest(new MessageRequest(condition, ref.getMessage(), queueNameNodeIdMap));
}
else
@@ -466,13 +467,14 @@
tx.addFirstCallback(callback, this);
}
- callback.addMessage(condition, ref.getMessage(), queueNameNodeIdMap);
+ callback.addMessage(condition, ref.getMessage(), queueNameNodeIdMap);
}
}
if (startInternalTx)
{
// TODO - do we need to rollback if an exception is thrown??
+
tx.commit();
}
}
@@ -499,6 +501,7 @@
try
{
//Sanity
+
if (!nodeIdAddressMap.containsKey(nodeId))
{
throw new IllegalStateException("Cannot find address for node: " + nodeId);
@@ -617,7 +620,7 @@
public void routeFromCluster(org.jboss.messaging.core.Message message, String routingKey,
Map queueNameNodeIdMap) throws Exception
{
- lock.readLock().acquire();
+ lock.readLock().acquire();
// Need to reference the message
MessageReference ref = null;
@@ -838,40 +841,43 @@
Map nameMap = (Map)nameMaps.get(nodeId);
- Iterator iter = nameMap.values().iterator();
-
- while (iter.hasNext())
- {
- ClusteredBinding bb = (ClusteredBinding)iter.next();
-
- ClusteredQueue q = (ClusteredQueue)bb.getQueue();
-
- //We don't bother sending the stat if there is less than STATS_DIFFERENCE_MARGIN_PERCENT % difference
-
- double newRate = q.getGrowthRate();
-
- int newMessageCount = q.messageCount();
-
- boolean sendStats = decideToSendStats(bb.getConsumptionRate(), newRate);
-
- if (!sendStats)
+ if (nameMap != null)
+ {
+ Iterator iter = nameMap.values().iterator();
+
+ while (iter.hasNext())
{
- sendStats = decideToSendStats(bb.getMessageCount(), newMessageCount);
- }
-
- if (sendStats)
- {
- bb.setConsumptionRate(newRate);
- bb.setMessageCount(newMessageCount);
+ ClusteredBinding bb = (ClusteredBinding)iter.next();
- if (stats == null)
+ ClusteredQueue q = (ClusteredQueue)bb.getQueue();
+
+ //We don't bother sending the stat if there is less than STATS_DIFFERENCE_MARGIN_PERCENT % difference
+
+ double newRate = q.getGrowthRate();
+
+ int newMessageCount = q.messageCount();
+
+ boolean sendStats = decideToSendStats(bb.getConsumptionRate(), newRate);
+
+ if (!sendStats)
{
- stats = new ArrayList();
+ sendStats = decideToSendStats(bb.getMessageCount(), newMessageCount);
}
- QueueStats qs = new QueueStats(bb.getQueueName(), newRate, newMessageCount);
- stats.add(qs);
- }
+ if (sendStats)
+ {
+ bb.setConsumptionRate(newRate);
+ bb.setMessageCount(newMessageCount);
+
+ if (stats == null)
+ {
+ stats = new ArrayList();
+ }
+ QueueStats qs = new QueueStats(bb.getQueueName(), newRate, newMessageCount);
+
+ stats.add(qs);
+ }
+ }
}
}
finally
@@ -991,9 +997,7 @@
private void syncSendRequest(ClusterRequest request) throws Exception
{
- //TODO - handle serialization more efficiently
-
- byte[] bytes = StreamUtils.toBytes(request);
+ byte[] bytes = writeRequest(request);
Message message = new Message(null, null, bytes);
@@ -1168,6 +1172,8 @@
*/
private void moveMessages(String queueName, String toNodeId, int num) throws Throwable
{
+ log.info("Moving " + num + " messages from " + this.nodeId + " to " + toNodeId + " for queue name");
+
Binding binding = getBindingForQueueName(queueName);
if (binding == null)
@@ -1247,6 +1253,7 @@
}
catch (Exception e)
{
+ log.error("Caught Exception in MessageListener", e);
IllegalStateException e2 = new IllegalStateException(e.getMessage());
e2.setStackTrace(e.getStackTrace());
throw e2;
@@ -1281,6 +1288,7 @@
}
catch (Exception e)
{
+ log.error("Caught Exception in MessageListener", e);
IllegalStateException e2 = new IllegalStateException(e.getMessage());
e2.setStackTrace(e.getStackTrace());
throw e2;
@@ -1339,6 +1347,7 @@
}
catch (Exception e)
{
+ log.error("Caught Exception in MembershipListener", e);
IllegalStateException e2 = new IllegalStateException(e.getMessage());
e2.setStackTrace(e.getStackTrace());
throw e2;
@@ -1397,6 +1406,7 @@
}
catch (Exception e)
{
+ log.error("Caught Exception in Receiver", e);
IllegalStateException e2 = new IllegalStateException(e.getMessage());
e2.setStackTrace(e.getStackTrace());
throw e2;
@@ -1426,6 +1436,7 @@
}
catch (Exception e)
{
+ log.error("Caught Exception in RequestHandler", e);
IllegalStateException e2 = new IllegalStateException(e.getMessage());
e2.setStackTrace(e.getStackTrace());
throw e2;
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/FavourLocalRoutingPolicy.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/FavourLocalRoutingPolicy.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/FavourLocalRoutingPolicy.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -24,7 +24,7 @@
import java.util.Iterator;
import java.util.List;
-import org.jboss.messaging.core.plugin.contract.Binding;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
/**
* A FavourLocalRoutingPolicy
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MessageHolder.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MessageHolder.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MessageHolder.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -25,6 +25,7 @@
import java.io.DataOutputStream;
import java.util.Map;
+import org.jboss.logging.Logger;
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.util.StreamUtils;
@@ -41,6 +42,8 @@
*/
class MessageHolder implements Streamable
{
+ private static final Logger log = Logger.getLogger(MessageHolder.class);
+
private String routingKey;
private Message message;
@@ -80,8 +83,9 @@
routingKey = in.readUTF();
byte type = in.readByte();
- Message msg = MessageFactory.createMessage(type);
- msg.read(in);
+
+ message = MessageFactory.createMessage(type);
+ message.read(in);
queueNameToNodeIdMap = (Map)StreamUtils.readObject(in, false);
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MessageRequest.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MessageRequest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MessageRequest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -78,8 +78,8 @@
routingKey = in.readUTF();
byte type = in.readByte();
- Message msg = MessageFactory.createMessage(type);
- msg.read(in);
+ message = MessageFactory.createMessage(type);
+ message.read(in);
queueNameNodeIdMap = (Map)StreamUtils.readObject(in, false);
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MessagesRequest.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MessagesRequest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MessagesRequest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -79,6 +79,7 @@
{
MessageHolder holder = new MessageHolder();
holder.read(in);
+ messageHolders.add(holder);
}
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MoveTransactionRequest.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MoveTransactionRequest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/MoveTransactionRequest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -29,6 +29,7 @@
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.message.MessageFactory;
+import org.jboss.messaging.util.StreamUtils;
/**
*
@@ -82,17 +83,26 @@
queueName = in.readUTF();
- int size = in.readInt();
+ int b = in.readByte();
- messages = new ArrayList(size);
-
- for (int i = 0; i < size; i++)
+ if (b == StreamUtils.NULL)
{
- byte type = in.readByte();
- Message msg = MessageFactory.createMessage(type);
- msg.read(in);
- messages.add(msg);
+ messages = null;
}
+ else
+ {
+ int size = in.readInt();
+
+ messages = new ArrayList(size);
+
+ for (int i = 0; i < size; i++)
+ {
+ byte type = in.readByte();
+ Message msg = MessageFactory.createMessage(type);
+ msg.read(in);
+ messages.add(msg);
+ }
+ }
}
public void write(DataOutputStream out) throws Exception
@@ -101,15 +111,26 @@
out.writeUTF(queueName);
- out.writeInt(messages.size());
-
- Iterator iter = messages.iterator();
- while (iter.hasNext())
+ if (messages == null)
{
- Message message = (Message)iter.next();
- out.writeByte(message.getType());
- message.write(out);
+ out.writeByte(StreamUtils.NULL);
}
+ else
+ {
+ out.writeByte(StreamUtils.LIST);
+
+ out.writeInt(messages.size());
+
+ Iterator iter = messages.iterator();
+ while (iter.hasNext())
+ {
+ Message message = (Message)iter.next();
+ out.writeByte(message.getType());
+ message.write(out);
+ }
+ }
+
+
}
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/RoutingPolicy.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/RoutingPolicy.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/RoutingPolicy.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jboss.messaging.core.plugin.contract.Binding;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
/**
* A RoutingPolicy
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/SendNodeIdRequest.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/SendNodeIdRequest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/SendNodeIdRequest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -25,6 +25,7 @@
import java.io.DataOutputStream;
import org.jgroups.Address;
+import org.jgroups.stack.IpAddress;
/**
* A SendNodeIdRequest
@@ -67,13 +68,22 @@
public void read(DataInputStream in) throws Exception
{
- // TODO Auto-generated method stub
+ address = new IpAddress();
+ address.readFrom(in);
+
+ nodeId = in.readUTF();
}
public void write(DataOutputStream out) throws Exception
{
- // TODO Auto-generated method stub
+ if (!(address instanceof IpAddress))
+ {
+ throw new IllegalStateException("Address must be IpAddress");
+ }
+ address.writeTo(out);
+
+ out.writeUTF(nodeId);
}
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/SendTransactionRequest.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/SendTransactionRequest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/SendTransactionRequest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -27,7 +27,10 @@
import java.util.Iterator;
import java.util.List;
+import org.jboss.logging.Logger;
+import org.jboss.messaging.util.StreamUtils;
+
/**
* A SendTransactionRequest
*
@@ -41,6 +44,8 @@
*/
class SendTransactionRequest extends TransactionRequest
{
+ private static final Logger log = Logger.getLogger(SendTransactionRequest.class);
+
static final int TYPE = 8;
private List messageHolders;
@@ -64,7 +69,7 @@
public void commit(PostOfficeInternal office) throws Exception
{
Iterator iter = messageHolders.iterator();
-
+
while (iter.hasNext())
{
MessageHolder holder = (MessageHolder)iter.next();
@@ -81,25 +86,43 @@
public void read(DataInputStream in) throws Exception
{
super.read(in);
- int size = in.readInt();
- messageHolders = new ArrayList(size);
- for (int i = 0; i < size; i++)
+
+ int b = in.readByte();
+ if (b == StreamUtils.NULL)
{
- MessageHolder holder = new MessageHolder();
- holder.read(in);
+ messageHolders = null;
}
+ else
+ {
+ int size = in.readInt();
+ messageHolders = new ArrayList(size);
+ for (int i = 0; i < size; i++)
+ {
+ MessageHolder holder = new MessageHolder();
+ holder.read(in);
+ messageHolders.add(holder);
+ }
+ }
}
public void write(DataOutputStream out) throws Exception
{
super.write(out);
- out.writeInt(messageHolders.size());
- Iterator iter = messageHolders.iterator();
- while (iter.hasNext())
+ if (messageHolders != null)
{
- MessageHolder holder = (MessageHolder)iter.next();
- holder.write(out);
+ out.writeByte(StreamUtils.LIST);
+ out.writeInt(messageHolders.size());
+ Iterator iter = messageHolders.iterator();
+ while (iter.hasNext())
+ {
+ MessageHolder holder = (MessageHolder)iter.next();
+ holder.write(out);
+ }
}
+ else
+ {
+ out.writeByte(StreamUtils.NULL);
+ }
}
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/SharedState.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/SharedState.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/SharedState.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -28,7 +28,7 @@
import java.util.List;
import java.util.Map;
-import org.jboss.messaging.core.plugin.contract.Binding;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
import org.jboss.messaging.util.StreamUtils;
import org.jboss.messaging.util.Streamable;
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/TransactionRequest.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/TransactionRequest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/TransactionRequest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -24,8 +24,10 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
+import org.jboss.logging.Logger;
+
/**
* A TransactionRequest
*
@@ -37,6 +39,8 @@
*/
abstract class TransactionRequest extends ClusterRequest implements ClusterTransaction
{
+ private static final Logger log = Logger.getLogger(TransactionRequest.class);
+
private String nodeId;
private long txId;
@@ -57,7 +61,7 @@
}
public void execute(PostOfficeInternal office) throws Exception
- {
+ {
TransactionId id = new TransactionId(nodeId, txId);
if (hold)
Modified: trunk/src/main/org/jboss/messaging/util/StreamUtils.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/StreamUtils.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/src/main/org/jboss/messaging/util/StreamUtils.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -56,31 +56,31 @@
{
private static final int BUFFER_SIZE = 4096;
- private static final byte NULL = 0;
+ public static final byte NULL = 0;
- private static final byte STRING = 1;
+ public static final byte STRING = 1;
- private static final byte MAP = 2;
+ public static final byte MAP = 2;
- private static final byte BYTE = 3;
+ public static final byte BYTE = 3;
- private static final byte SHORT = 4;
+ public static final byte SHORT = 4;
- private static final byte INT = 5;
+ public static final byte INT = 5;
- private static final byte LONG = 6;
+ public static final byte LONG = 6;
- private static final byte FLOAT = 7;
+ public static final byte FLOAT = 7;
- private static final byte DOUBLE = 8;
+ public static final byte DOUBLE = 8;
- private static final byte BOOLEAN = 9;
+ public static final byte BOOLEAN = 9;
- private static final byte BYTES = 10;
+ public static final byte BYTES = 10;
- private static final byte LIST = 11;
+ public static final byte LIST = 11;
- private static final byte SERIALIZABLE = 12;
+ public static final byte SERIALIZABLE = 12;
private static boolean useJBossSerialization = false;
@@ -199,7 +199,7 @@
}
else if (containerTypes && object instanceof Map)
{
- out.write(MAP);
+ out.writeByte(MAP);
writeMap(out, (Map)object, false);
}
else if (object instanceof Integer)
@@ -244,7 +244,7 @@
out.writeInt(bytes.length);
out.write(bytes);
}
- else if (containerTypes && object instanceof ArrayList)
+ else if (containerTypes && object instanceof List)
{
out.write(LIST);
writeList(out, (List)object);
Modified: trunk/tests/src/org/jboss/test/messaging/core/base/QueueTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/base/QueueTestBase.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/base/QueueTestBase.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -31,7 +31,6 @@
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.Receiver;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.IdManager;
import org.jboss.messaging.core.plugin.JDBCPersistenceManager;
import org.jboss.messaging.core.plugin.SimpleMessageStore;
@@ -44,6 +43,7 @@
import org.jboss.test.messaging.core.SimpleDeliveryObserver;
import org.jboss.test.messaging.core.SimpleReceiver;
import org.jboss.test.messaging.tools.jmx.ServiceContainer;
+import org.jboss.test.messaging.util.CoreMessageFactory;
/**
* The QueueTest test strategy is to try as many combination as it makes sense of the following
@@ -6374,12 +6374,12 @@
private MessageReference createReference(long id, boolean reliable, Serializable payload)
{
- return ms.reference(MessageFactory.createCoreMessage(id, reliable, payload));
+ return ms.reference(CoreMessageFactory.createCoreMessage(id, reliable, payload));
}
private MessageReference createReference(long id)
{
- return ms.reference(MessageFactory.createCoreMessage(id));
+ return ms.reference(CoreMessageFactory.createCoreMessage(id));
}
// Inner classes -------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/core/message/CoreMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/message/CoreMessageTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/message/CoreMessageTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -21,8 +21,8 @@
*/
package org.jboss.test.messaging.core.message;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.test.messaging.core.message.base.MessageSupportTestBase;
+import org.jboss.test.messaging.util.CoreMessageFactory;
/**
@@ -54,7 +54,7 @@
protected void setUp() throws Exception
{
- rs = MessageFactory.createCoreMessage(0);
+ rs = CoreMessageFactory.createCoreMessage(0);
super.setUp();
Modified: trunk/tests/src/org/jboss/test/messaging/core/message/JBossMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/message/JBossMessageTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/message/JBossMessageTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -21,10 +21,10 @@
*/
package org.jboss.test.messaging.core.message;
-import org.jboss.test.messaging.core.message.base.MessageSupportTestBase;
import org.jboss.jms.message.JBossMessage;
import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.message.MessageSupport;
+import org.jboss.test.messaging.core.message.base.MessageSupportTestBase;
/**
Modified: trunk/tests/src/org/jboss/test/messaging/core/message/SimpleMessageReferenceTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/message/SimpleMessageReferenceTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/message/SimpleMessageReferenceTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -21,16 +21,16 @@
*/
package org.jboss.test.messaging.core.message;
-import org.jboss.test.messaging.core.message.base.RoutableSupportTestBase;
+import java.util.Set;
+
+import org.jboss.messaging.core.Message;
+import org.jboss.messaging.core.message.RoutableSupport;
import org.jboss.messaging.core.plugin.SimpleMessageReference;
-import org.jboss.messaging.core.message.MessageFactory;
-import org.jboss.messaging.core.message.RoutableSupport;
import org.jboss.messaging.core.plugin.SimpleMessageStore;
import org.jboss.messaging.core.plugin.contract.MessageStore;
-import org.jboss.messaging.core.Message;
+import org.jboss.test.messaging.core.message.base.RoutableSupportTestBase;
+import org.jboss.test.messaging.util.CoreMessageFactory;
-import java.util.Set;
-
/**
* @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
* @version <tt>$Revision$</tt>
@@ -68,7 +68,7 @@
protected void setUp() throws Exception
{
- Message m = MessageFactory.createCoreMessage(0);
+ Message m = CoreMessageFactory.createCoreMessage(0);
m.putHeader("headerName01", "headerValue01");
MessageStore ms = new SimpleMessageStore();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_2PCTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_2PCTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_2PCTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -26,9 +26,9 @@
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.LockMap;
import org.jboss.messaging.core.tx.Transaction;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -79,7 +79,7 @@
Transaction tx = this.createXATx();
for (int i = 0; i < 50; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs1[i] = ms.reference(msgs[i]);
@@ -131,7 +131,7 @@
tx = this.createXATx();
for (int i = 50; i < 75; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs1[i] = ms.reference(msgs[i]);
@@ -187,7 +187,7 @@
tx = this.createXATx();
for (int i = 75; i < 100; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs1[i] = ms.reference(msgs[i]);
@@ -242,7 +242,7 @@
tx = this.createXATx();
for (int i = 100; i < 150; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs1[i] = ms.reference(msgs[i]);
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_NTTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_NTTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_NTTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -26,8 +26,8 @@
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.LockMap;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -77,7 +77,7 @@
for (int i = 0; i < 50; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs1[i] = ms.reference(msgs[i]);
@@ -128,7 +128,7 @@
for (int i = 50; i < 75; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs1[i] = ms.reference(msgs[i]);
@@ -182,7 +182,7 @@
for (int i = 75; i < 100; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs1[i] = ms.reference(msgs[i]);
@@ -235,7 +235,7 @@
for (int i = 100; i < 150; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs1[i] = ms.reference(msgs[i]);
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_TTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_TTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_TTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -26,9 +26,9 @@
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.LockMap;
import org.jboss.messaging.core.tx.Transaction;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -79,7 +79,7 @@
Transaction tx = tr.createTransaction();
for (int i = 0; i < 50; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs1[i] = ms.reference(msgs[i]);
@@ -132,7 +132,7 @@
tx = tr.createTransaction();
for (int i = 50; i < 75; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs1[i] = ms.reference(msgs[i]);
@@ -187,7 +187,7 @@
tx = tr.createTransaction();
for (int i = 75; i < 100; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs1[i] = ms.reference(msgs[i]);
@@ -241,7 +241,7 @@
tx = tr.createTransaction();
for (int i = 100; i < 150; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs1[i] = ms.reference(msgs[i]);
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_2PCTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_2PCTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_2PCTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -26,9 +26,9 @@
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.LockMap;
import org.jboss.messaging.core.tx.Transaction;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -73,7 +73,7 @@
Transaction tx = this.createXATx();
for (int i = 0; i < 50; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs1[i] = ms.reference(msgs[i]);
@@ -132,7 +132,7 @@
tx = createXATx();
for (int i = 50; i < 75; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs1[i] = ms.reference(msgs[i]);
@@ -194,7 +194,7 @@
tx = createXATx();
for (int i = 75; i < 100; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs1[i] = ms.reference(msgs[i]);
@@ -255,7 +255,7 @@
tx = createXATx();
for (int i = 100; i < 150; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs1[i] = ms.reference(msgs[i]);
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_NTTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_NTTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_NTTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -26,8 +26,8 @@
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.LockMap;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -77,7 +77,7 @@
for (int i = 0; i < 50; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs1[i] = ms.reference(msgs[i]);
@@ -134,7 +134,7 @@
for (int i = 50; i < 75; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs1[i] = ms.reference(msgs[i]);
@@ -194,7 +194,7 @@
for (int i = 75; i < 100; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs1[i] = ms.reference(msgs[i]);
@@ -253,7 +253,7 @@
for (int i = 100; i < 150; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs1[i] = ms.reference(msgs[i]);
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_TTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_TTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_TTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -26,9 +26,9 @@
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.LockMap;
import org.jboss.messaging.core.tx.Transaction;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -77,7 +77,7 @@
Transaction tx = tr.createTransaction();
for (int i = 0; i < 50; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs1[i] = ms.reference(msgs[i]);
@@ -135,7 +135,7 @@
tx = tr.createTransaction();
for (int i = 50; i < 75; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs1[i] = ms.reference(msgs[i]);
@@ -196,7 +196,7 @@
tx = tr.createTransaction();
for (int i = 75; i < 100; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs1[i] = ms.reference(msgs[i]);
@@ -256,7 +256,7 @@
tx = tr.createTransaction();
for (int i = 100; i < 150; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs1[i] = ms.reference(msgs[i]);
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -23,13 +23,13 @@
import org.jboss.messaging.core.local.Queue;
import org.jboss.messaging.core.message.CoreMessage;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.JDBCPersistenceManager;
import org.jboss.messaging.core.plugin.SimpleMessageStore;
import org.jboss.messaging.core.plugin.contract.MessageStore;
import org.jboss.messaging.core.plugin.contract.PersistenceManager;
import org.jboss.test.messaging.MessagingTestCase;
import org.jboss.test.messaging.tools.jmx.ServiceContainer;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -67,10 +67,10 @@
CoreMessage m = null;
- m = MessageFactory.createCoreMessage(0);
+ m = CoreMessageFactory.createCoreMessage(0);
p.handle(null, ms.reference(m), null);
- m = MessageFactory.createCoreMessage(1);
+ m = CoreMessageFactory.createCoreMessage(1);
p.handle(null, ms.reference(m), null);
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -27,9 +27,9 @@
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.SimpleDelivery;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.LockMap;
import org.jboss.messaging.core.tx.Transaction;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -78,7 +78,7 @@
for (int i = 0; i < 99; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
@@ -117,7 +117,7 @@
tx = createXATx();
- msgs[99] = MessageFactory.createCoreMessage(99, false, null);
+ msgs[99] = CoreMessageFactory.createCoreMessage(99, false, null);
refs[99] = ms.reference(msgs[99]);
queue.handle(null, refs[99], tx);
refs[99].releaseMemoryReference();
@@ -155,7 +155,7 @@
tx = createXATx();
for (int i = 100; i < 109; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -193,7 +193,7 @@
//Send one more ref - should clear the down cache
tx = createXATx();
- msgs[109] = MessageFactory.createCoreMessage(109, false, null);
+ msgs[109] = CoreMessageFactory.createCoreMessage(109, false, null);
refs[109] = ms.reference(msgs[109]);
queue.handle(null, refs[109], tx);
refs[109].releaseMemoryReference();
@@ -231,7 +231,7 @@
//Send one more ref
tx = createXATx();
- msgs[110] = MessageFactory.createCoreMessage(110, false, null);
+ msgs[110] = CoreMessageFactory.createCoreMessage(110, false, null);
refs[110] = ms.reference(msgs[110]);
queue.handle(null, refs[110], tx);
refs[110].releaseMemoryReference();
@@ -271,7 +271,7 @@
tx = createXATx();
for (int i = 111; i < 120; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -309,7 +309,7 @@
tx = this.createXATx();
for (int i = 200; i < 300; i++)
{
- Message m = MessageFactory.createCoreMessage(i, true, null);
+ Message m = CoreMessageFactory.createCoreMessage(i, true, null);
MessageReference ref = ms.reference(m);
queue.handle(null, ref, tx);
ref.releaseMemoryReference();
@@ -323,7 +323,7 @@
tx = createXATx();
for (int i = 120; i < 130; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -365,7 +365,7 @@
tx = createXATx();
for (int i = 130; i < 140; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -405,7 +405,7 @@
//Send one more ref
tx = createXATx();
- msgs[140] = MessageFactory.createCoreMessage(140, false, null);
+ msgs[140] = CoreMessageFactory.createCoreMessage(140, false, null);
refs[140] = ms.reference(msgs[140]);
queue.handle(null, refs[140], tx);
refs[140].releaseMemoryReference();
@@ -679,7 +679,7 @@
tx = createXATx();
for (int i = 141; i < 161; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -718,7 +718,7 @@
tx = createXATx();
for (int i = 161; i < 181; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -756,7 +756,7 @@
tx = createXATx();
for (int i = 181; i < 241; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -27,8 +27,8 @@
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.SimpleDelivery;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.LockMap;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -75,7 +75,7 @@
for (int i = 0; i < 99; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -108,7 +108,7 @@
//Send one more ref
- msgs[99] = MessageFactory.createCoreMessage(99, false, null);
+ msgs[99] = CoreMessageFactory.createCoreMessage(99, false, null);
refs[99] = ms.reference(msgs[99]);
queue.handle(null, refs[99], null);
refs[99].releaseMemoryReference();
@@ -141,7 +141,7 @@
for (int i = 100; i < 109; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -176,7 +176,7 @@
//Send one more ref - should clear the down cache
- msgs[109] = MessageFactory.createCoreMessage(109, false, null);
+ msgs[109] = CoreMessageFactory.createCoreMessage(109, false, null);
refs[109] = ms.reference(msgs[109]);
queue.handle(null, refs[109], null);
refs[109].releaseMemoryReference();
@@ -211,7 +211,7 @@
//Send one more ref
- msgs[110] = MessageFactory.createCoreMessage(110, false, null);
+ msgs[110] = CoreMessageFactory.createCoreMessage(110, false, null);
refs[110] = ms.reference(msgs[110]);
queue.handle(null, refs[110], null);
refs[110].releaseMemoryReference();
@@ -248,7 +248,7 @@
for (int i = 111; i < 120; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -287,7 +287,7 @@
for (int i = 120; i < 130; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -326,7 +326,7 @@
for (int i = 130; i < 140; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -363,7 +363,7 @@
//Send one more ref
- msgs[140] = MessageFactory.createCoreMessage(140, false, null);
+ msgs[140] = CoreMessageFactory.createCoreMessage(140, false, null);
refs[140] = ms.reference(msgs[140]);
queue.handle(null, refs[140], null);
refs[140].releaseMemoryReference();
@@ -637,7 +637,7 @@
//Add 20 more messages
for (int i = 141; i < 161; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -673,7 +673,7 @@
//Add 20 more messages
for (int i = 161; i < 181; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -708,7 +708,7 @@
//Add 60 more messages
for (int i = 181; i < 241; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -27,9 +27,9 @@
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.SimpleDelivery;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.LockMap;
import org.jboss.messaging.core.tx.Transaction;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -78,7 +78,7 @@
for (int i = 0; i < 99; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
@@ -115,7 +115,7 @@
tx = tr.createTransaction();
- msgs[99] = MessageFactory.createCoreMessage(99, false, null);
+ msgs[99] = CoreMessageFactory.createCoreMessage(99, false, null);
refs[99] = ms.reference(msgs[99]);
queue.handle(null, refs[99], tx);
refs[99].releaseMemoryReference();
@@ -152,7 +152,7 @@
tx = tr.createTransaction();
for (int i = 100; i < 109; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -189,7 +189,7 @@
//Send one more ref - should clear the down cache
tx = tr.createTransaction();
- msgs[109] = MessageFactory.createCoreMessage(109, false, null);
+ msgs[109] = CoreMessageFactory.createCoreMessage(109, false, null);
refs[109] = ms.reference(msgs[109]);
queue.handle(null, refs[109], tx);
refs[109].releaseMemoryReference();
@@ -226,7 +226,7 @@
//Send one more ref
tx = tr.createTransaction();
- msgs[110] = MessageFactory.createCoreMessage(110, false, null);
+ msgs[110] = CoreMessageFactory.createCoreMessage(110, false, null);
refs[110] = ms.reference(msgs[110]);
queue.handle(null, refs[110], tx);
refs[110].releaseMemoryReference();
@@ -265,7 +265,7 @@
tx = tr.createTransaction();
for (int i = 111; i < 120; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -303,7 +303,7 @@
for (int i = 200; i < 300; i++)
{
- Message m = MessageFactory.createCoreMessage(i, true, null);
+ Message m = CoreMessageFactory.createCoreMessage(i, true, null);
MessageReference ref = ms.reference(m);
queue.handle(null, ref, tx);
ref.releaseMemoryReference();
@@ -316,7 +316,7 @@
tx = tr.createTransaction();
for (int i = 120; i < 130; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -357,7 +357,7 @@
tx = tr.createTransaction();
for (int i = 130; i < 140; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -396,7 +396,7 @@
//Send one more ref
tx = tr.createTransaction();
- msgs[140] = MessageFactory.createCoreMessage(140, false, null);
+ msgs[140] = CoreMessageFactory.createCoreMessage(140, false, null);
refs[140] = ms.reference(msgs[140]);
queue.handle(null, refs[140], tx);
refs[140].releaseMemoryReference();
@@ -671,7 +671,7 @@
tx = tr.createTransaction();
for (int i = 141; i < 161; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -709,7 +709,7 @@
tx = tr.createTransaction();
for (int i = 161; i < 181; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -746,7 +746,7 @@
tx = tr.createTransaction();
for (int i = 181; i < 241; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_2PCTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_2PCTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_2PCTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -27,9 +27,9 @@
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.SimpleDelivery;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.LockMap;
import org.jboss.messaging.core.tx.Transaction;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -77,7 +77,7 @@
Transaction tx = createXATx();
for (int i = 0; i < 99; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -119,7 +119,7 @@
//Send one more ref
tx = createXATx();
- msgs[99] = MessageFactory.createCoreMessage(99, true, null);
+ msgs[99] = CoreMessageFactory.createCoreMessage(99, true, null);
refs[99] = ms.reference(msgs[99]);
queue.handle(null, refs[99], tx);
refs[99].releaseMemoryReference();
@@ -162,7 +162,7 @@
tx = createXATx();
for (int i = 100; i < 109; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -206,7 +206,7 @@
//Send one more ref - should clear the down cache
tx = createXATx();
- msgs[109] = MessageFactory.createCoreMessage(109, true, null);
+ msgs[109] = CoreMessageFactory.createCoreMessage(109, true, null);
refs[109] = ms.reference(msgs[109]);
queue.handle(null, refs[109], null);
refs[109].releaseMemoryReference();
@@ -248,7 +248,7 @@
//Send one more ref
tx = createXATx();
- msgs[110] = MessageFactory.createCoreMessage(110, true, null);
+ msgs[110] = CoreMessageFactory.createCoreMessage(110, true, null);
refs[110] = ms.reference(msgs[110]);
queue.handle(null, refs[110], null);
refs[110].releaseMemoryReference();
@@ -292,7 +292,7 @@
tx = createXATx();
for (int i = 111; i < 120; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -335,7 +335,7 @@
tx = this.createXATx();
for (int i = 200; i < 300; i++)
{
- Message m = MessageFactory.createCoreMessage(i, true, null);
+ Message m = CoreMessageFactory.createCoreMessage(i, true, null);
MessageReference ref = ms.reference(m);
queue.handle(null, ref, tx);
ref.releaseMemoryReference();
@@ -348,7 +348,7 @@
tx = createXATx();
for (int i = 120; i < 130; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -394,7 +394,7 @@
tx = createXATx();;
for (int i = 130; i < 140; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -438,7 +438,7 @@
//Send one more ref
tx = createXATx();
- msgs[140] = MessageFactory.createCoreMessage(140, true, null);
+ msgs[140] = CoreMessageFactory.createCoreMessage(140, true, null);
refs[140] = ms.reference(msgs[140]);
queue.handle(null, refs[140], null);
refs[140].releaseMemoryReference();
@@ -756,7 +756,7 @@
tx = createXATx();
for (int i = 141; i < 161; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -799,7 +799,7 @@
tx = createXATx();
for (int i = 161; i < 181; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -841,7 +841,7 @@
tx = createXATx();
for (int i = 181; i < 241; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_NTTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_NTTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_NTTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -27,8 +27,8 @@
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.SimpleDelivery;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.LockMap;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -75,7 +75,7 @@
for (int i = 0; i < 99; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -114,7 +114,7 @@
//Send one more ref
- msgs[99] = MessageFactory.createCoreMessage(99, true, null);
+ msgs[99] = CoreMessageFactory.createCoreMessage(99, true, null);
refs[99] = ms.reference(msgs[99]);
queue.handle(null, refs[99], null);
refs[99].releaseMemoryReference();
@@ -154,7 +154,7 @@
for (int i = 100; i < 109; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -192,7 +192,7 @@
//Send one more ref - should clear the down cache
- msgs[109] = MessageFactory.createCoreMessage(109, true, null);
+ msgs[109] = CoreMessageFactory.createCoreMessage(109, true, null);
refs[109] = ms.reference(msgs[109]);
queue.handle(null, refs[109], null);
refs[109].releaseMemoryReference();
@@ -232,7 +232,7 @@
//Send one more ref
- msgs[110] = MessageFactory.createCoreMessage(110, true, null);
+ msgs[110] = CoreMessageFactory.createCoreMessage(110, true, null);
refs[110] = ms.reference(msgs[110]);
queue.handle(null, refs[110], null);
refs[110].releaseMemoryReference();
@@ -274,7 +274,7 @@
for (int i = 111; i < 120; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -318,7 +318,7 @@
for (int i = 120; i < 130; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -362,7 +362,7 @@
for (int i = 130; i < 140; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -404,7 +404,7 @@
//Send one more ref
- msgs[140] = MessageFactory.createCoreMessage(140, true, null);
+ msgs[140] = CoreMessageFactory.createCoreMessage(140, true, null);
refs[140] = ms.reference(msgs[140]);
queue.handle(null, refs[140], null);
refs[140].releaseMemoryReference();
@@ -718,7 +718,7 @@
//Add 20 more messages
for (int i = 141; i < 161; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -758,7 +758,7 @@
//Add 20 more messages
for (int i = 161; i < 181; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
@@ -797,7 +797,7 @@
//Add 60 more messages
for (int i = 181; i < 241; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], null);
refs[i].releaseMemoryReference();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_TTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_TTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_TTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -27,9 +27,9 @@
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.SimpleDelivery;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.LockMap;
import org.jboss.messaging.core.tx.Transaction;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -77,7 +77,7 @@
Transaction tx = tr.createTransaction();
for (int i = 0; i < 99; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -118,7 +118,7 @@
//Send one more ref
tx = tr.createTransaction();
- msgs[99] = MessageFactory.createCoreMessage(99, true, null);
+ msgs[99] = CoreMessageFactory.createCoreMessage(99, true, null);
refs[99] = ms.reference(msgs[99]);
queue.handle(null, refs[99], tx);
refs[99].releaseMemoryReference();
@@ -160,7 +160,7 @@
tx = tr.createTransaction();
for (int i = 100; i < 109; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -203,7 +203,7 @@
//Send one more ref - should clear the down cache
tx = tr.createTransaction();
- msgs[109] = MessageFactory.createCoreMessage(109, true, null);
+ msgs[109] = CoreMessageFactory.createCoreMessage(109, true, null);
refs[109] = ms.reference(msgs[109]);
queue.handle(null, refs[109], tx);
refs[109].releaseMemoryReference();
@@ -244,7 +244,7 @@
//Send one more ref
tx = tr.createTransaction();
- msgs[110] = MessageFactory.createCoreMessage(110, true, null);
+ msgs[110] = CoreMessageFactory.createCoreMessage(110, true, null);
refs[110] = ms.reference(msgs[110]);
queue.handle(null, refs[110], tx);
refs[110].releaseMemoryReference();
@@ -287,7 +287,7 @@
tx = tr.createTransaction();
for (int i = 111; i < 120; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -332,7 +332,7 @@
tx = tr.createTransaction();
for (int i = 120; i < 130; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -374,7 +374,7 @@
tx = tr.createTransaction();
for (int i = 200; i < 300; i++)
{
- Message m = MessageFactory.createCoreMessage(i, true, null);
+ Message m = CoreMessageFactory.createCoreMessage(i, true, null);
MessageReference ref = ms.reference(m);
queue.handle(null, ref, tx);
ref.releaseMemoryReference();
@@ -386,7 +386,7 @@
tx = tr.createTransaction();
for (int i = 130; i < 140; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -429,7 +429,7 @@
//Send one more ref
tx = tr.createTransaction();
- msgs[140] = MessageFactory.createCoreMessage(140, true, null);
+ msgs[140] = CoreMessageFactory.createCoreMessage(140, true, null);
refs[140] = ms.reference(msgs[140]);
queue.handle(null, refs[140], tx);
refs[140].releaseMemoryReference();
@@ -746,7 +746,7 @@
tx = tr.createTransaction();
for (int i = 141; i < 161; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -788,7 +788,7 @@
tx = tr.createTransaction();
for (int i = 161; i < 181; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
@@ -829,7 +829,7 @@
tx = tr.createTransaction();
for (int i = 181; i < 241; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
queue.handle(null, refs[i], tx);
refs[i].releaseMemoryReference();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -26,12 +26,12 @@
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.IdManager;
import org.jboss.messaging.core.plugin.JDBCPersistenceManager;
import org.jboss.messaging.core.plugin.LockMap;
import org.jboss.messaging.core.plugin.SimpleMessageStore;
import org.jboss.messaging.core.tx.TransactionRepository;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -75,7 +75,7 @@
//Send 150 np mesages
for (int i = 0; i < 150; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
@@ -87,7 +87,7 @@
//Send 50 p messages
for (int i = 150; i < 200; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
@@ -164,7 +164,7 @@
//Send 150 np mesages
for (int i = 0; i < 150; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
@@ -176,7 +176,7 @@
//Send 50 p messages
for (int i = 150; i < 200; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
@@ -251,7 +251,7 @@
//Send 150 np mesages
for (int i = 0; i < 150; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, false, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, false, null);
refs[i] = ms.reference(msgs[i]);
@@ -263,7 +263,7 @@
//Send 50 p messages
for (int i = 150; i < 200; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
@@ -315,7 +315,7 @@
//Send 150 p messages
for (int i = 0; i < 150; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
@@ -413,7 +413,7 @@
//Send 150 p messages
for (int i = 0; i < 150; i++)
{
- msgs[i] = MessageFactory.createCoreMessage(i, true, null);
+ msgs[i] = CoreMessageFactory.createCoreMessage(i, true, null);
refs[i] = ms.reference(msgs[i]);
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/ClusteredPostOfficeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/ClusteredPostOfficeTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/ClusteredPostOfficeTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -25,17 +25,17 @@
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
-import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
-import org.jboss.messaging.core.plugin.contract.Binding;
import org.jboss.messaging.core.plugin.contract.ClusteredPostOffice;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
import org.jboss.messaging.core.plugin.postoffice.cluster.BasicRedistributionPolicy;
import org.jboss.messaging.core.plugin.postoffice.cluster.ClusteredPostOfficeImpl;
+import org.jboss.messaging.core.plugin.postoffice.cluster.ClusteredQueue;
import org.jboss.messaging.core.plugin.postoffice.cluster.FavourLocalRoutingPolicy;
import org.jboss.messaging.core.plugin.postoffice.cluster.RedistributionPolicy;
import org.jboss.messaging.core.plugin.postoffice.cluster.RoutingPolicy;
import org.jboss.messaging.core.tx.Transaction;
import org.jboss.test.messaging.core.SimpleReceiver;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -93,10 +93,10 @@
//Add a couple of bindings
- Queue queue1 = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ ClusteredQueue queue1 = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
Binding binding1 =
office1.bindClusteredQueue("sub1", "topic1", queue1);
- Queue queue2 = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ ClusteredQueue queue2 = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
Binding binding2 =
office1.bindClusteredQueue("sub2", "topic1", queue2);
@@ -113,7 +113,7 @@
//Add another binding on node 2
- Queue queue3 = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ ClusteredQueue queue3 = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
Binding binding3 =
office2.bindClusteredQueue("sub3", "topic1", queue3);
@@ -137,7 +137,7 @@
//Add another binding on node 1
- Queue queue4 = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ ClusteredQueue queue4 = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
Binding binding4 =
office2.bindClusteredQueue("sub4", "topic1", queue4);
@@ -196,7 +196,7 @@
//Add another binding on node 3
- Queue queue5 = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ ClusteredQueue queue5 = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
Binding binding5 =
office3.bindClusteredQueue("sub5", "topic1", queue5);
@@ -228,11 +228,11 @@
//Add a durable and a non durable binding on node 1
- Queue queue6 = new Queue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ ClusteredQueue queue6 = new ClusteredQueue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
Binding binding6 =
office1.bindClusteredQueue("sub6", "topic1", queue6);
- Queue queue7 = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ ClusteredQueue queue7 = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
Binding binding7 =
office1.bindClusteredQueue("sub7", "topic1", queue7);
@@ -424,55 +424,55 @@
//Two topics with a mixture of durable and non durable subscriptions
- Queue[] queues = new Queue[16];
+ ClusteredQueue[] queues = new ClusteredQueue[16];
Binding[] bindings = new Binding[16];
- queues[0] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[0] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[0] = office1.bindClusteredQueue("sub1", "topic1", queues[0]);
- queues[1] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[1] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[1] = office1.bindClusteredQueue("sub2", "topic1", queues[1]);
- queues[2] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[2] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[2] = office2.bindClusteredQueue("sub3", "topic1", queues[2]);
- queues[3] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[3] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[3] = office2.bindClusteredQueue("sub4", "topic1", queues[3]);
- queues[4] = new Queue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[4] = new ClusteredQueue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[4] = office2.bindClusteredQueue("sub5", "topic1", queues[4]);
- queues[5] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[5] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[5] = office1.bindClusteredQueue("sub6", "topic1", queues[5]);
- queues[6] = new Queue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[6] = new ClusteredQueue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[6] = office1.bindClusteredQueue("sub7", "topic1", queues[6]);
- queues[7] = new Queue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[7] = new ClusteredQueue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[7] = office1.bindClusteredQueue("sub8", "topic1", queues[7]);
- queues[8] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[8] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[8] = office1.bindClusteredQueue("sub9", "topic2", queues[8]);
- queues[9] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[9] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[9] = office1.bindClusteredQueue("sub10", "topic2", queues[9]);
- queues[10] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[10] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[10] = office2.bindClusteredQueue("sub11", "topic2", queues[10]);
- queues[11] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[11] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[11] = office2.bindClusteredQueue("sub12", "topic2", queues[11]);
- queues[12] = new Queue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[12] = new ClusteredQueue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[12] = office2.bindClusteredQueue("sub13", "topic2", queues[12]);
- queues[13] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[13] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[13] = office1.bindClusteredQueue("sub14", "topic2", queues[13]);
- queues[14] = new Queue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[14] = new ClusteredQueue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[14] = office1.bindClusteredQueue("sub15", "topic2", queues[14]);
- queues[15] = new Queue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[15] = new ClusteredQueue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[15] = office1.bindClusteredQueue("sub16", "topic2", queues[15]);
SimpleReceiver[] receivers = new SimpleReceiver[16];
@@ -483,7 +483,7 @@
queues[i].add(receivers[i]);
}
- Message msg = MessageFactory.createCoreMessage(1, persistentMessage, null);
+ Message msg = CoreMessageFactory.createCoreMessage(1, persistentMessage, null);
MessageReference ref = ms.reference(msg);
boolean routed = office1.route(ref, "topic1", null);
@@ -518,7 +518,7 @@
//Now route to topic2
- msg = MessageFactory.createCoreMessage(2, persistentMessage, null);;
+ msg = CoreMessageFactory.createCoreMessage(2, persistentMessage, null);;
ref = ms.reference(msg);
routed = office1.route(ref, "topic2", null);
@@ -586,55 +586,55 @@
office1 = createClusteredPostOffice("node1", "testgroup");
office2 = createClusteredPostOffice("node2", "testgroup");
- Queue[] queues = new Queue[16];
+ ClusteredQueue[] queues = new ClusteredQueue[16];
Binding[] bindings = new Binding[16];
- queues[0] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[0] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[0] = office1.bindClusteredQueue("sub1", "topic1", queues[0]);
- queues[1] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[1] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[1] = office1.bindClusteredQueue("sub2", "topic1", queues[1]);
- queues[2] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[2] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[2] = office2.bindClusteredQueue("sub3", "topic1", queues[2]);
- queues[3] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[3] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[3] = office2.bindClusteredQueue("sub4", "topic1", queues[3]);
- queues[4] = new Queue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[4] = new ClusteredQueue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[4] = office2.bindClusteredQueue("sub5", "topic1", queues[4]);
- queues[5] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[5] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[5] = office1.bindClusteredQueue("sub6", "topic1", queues[5]);
- queues[6] = new Queue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[6] = new ClusteredQueue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[6] = office1.bindClusteredQueue("sub7", "topic1", queues[6]);
- queues[7] = new Queue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[7] = new ClusteredQueue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[7] = office1.bindClusteredQueue("sub8", "topic1", queues[7]);
- queues[8] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[8] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[8] = office1.bindClusteredQueue("sub9", "topic2", queues[8]);
- queues[9] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[9] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[9] = office1.bindClusteredQueue("sub10", "topic2", queues[9]);
- queues[10] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[10] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[10] = office2.bindClusteredQueue("sub11", "topic2", queues[10]);
- queues[11] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[11] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[11] = office2.bindClusteredQueue("sub12", "topic2", queues[11]);
- queues[12] = new Queue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[12] = new ClusteredQueue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[12] = office2.bindClusteredQueue("sub13", "topic2", queues[12]);
- queues[13] = new Queue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[13] = new ClusteredQueue(im.getId(), ms, pm, true, false, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[13] = office1.bindClusteredQueue("sub14", "topic2", queues[13]);
- queues[14] = new Queue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[14] = new ClusteredQueue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[14] = office1.bindClusteredQueue("sub15", "topic2", queues[14]);
- queues[15] = new Queue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
+ queues[15] = new ClusteredQueue(im.getId(), ms, pm, true, true, 2000, 100, 100, (QueuedExecutor)pool.get(), null);
bindings[15] = office1.bindClusteredQueue("sub16", "topic2", queues[15]);
SimpleReceiver[] receivers = new SimpleReceiver[16];
@@ -647,10 +647,10 @@
//First for topic 1
- Message msg1 = MessageFactory.createCoreMessage(1, persistent, null);;
+ Message msg1 = CoreMessageFactory.createCoreMessage(1, persistent, null);;
MessageReference ref1 = ms.reference(msg1);
- Message msg2 = MessageFactory.createCoreMessage(2, persistent, null);;
+ Message msg2 = CoreMessageFactory.createCoreMessage(2, persistent, null);;
MessageReference ref2 = ms.reference(msg2);
Transaction tx = tr.createTransaction();
@@ -703,10 +703,10 @@
assertTrue(msgs.isEmpty());
}
- msg1 = MessageFactory.createCoreMessage(1, persistent, null);;
+ msg1 = CoreMessageFactory.createCoreMessage(1, persistent, null);;
ref1 = ms.reference(msg1);
- msg2 = MessageFactory.createCoreMessage(2, persistent, null);;
+ msg2 = CoreMessageFactory.createCoreMessage(2, persistent, null);;
ref2 = ms.reference(msg2);
tx = tr.createTransaction();
@@ -743,10 +743,10 @@
//Now send some non transactionally
- msg1 = MessageFactory.createCoreMessage(1, persistent, null);
+ msg1 = CoreMessageFactory.createCoreMessage(1, persistent, null);
ref1 = ms.reference(msg1);
- msg2 = MessageFactory.createCoreMessage(2, persistent, null);
+ msg2 = CoreMessageFactory.createCoreMessage(2, persistent, null);
ref2 = ms.reference(msg2);
routed = office1.route(ref1, "topic1", null);
@@ -811,10 +811,10 @@
// and the rollback
- msg1 = MessageFactory.createCoreMessage(1, persistent, null);;
+ msg1 = CoreMessageFactory.createCoreMessage(1, persistent, null);;
ref1 = ms.reference(msg1);
- msg2 = MessageFactory.createCoreMessage(2, persistent, null);;
+ msg2 = CoreMessageFactory.createCoreMessage(2, persistent, null);;
ref2 = ms.reference(msg2);
routed = office1.route(ref1, "topic1", null);
@@ -900,10 +900,10 @@
// Now for topic 2
- msg1 = MessageFactory.createCoreMessage(1, persistent, null);
+ msg1 = CoreMessageFactory.createCoreMessage(1, persistent, null);
ref1 = ms.reference(msg1);
- msg2 = MessageFactory.createCoreMessage(2, persistent, null);
+ msg2 = CoreMessageFactory.createCoreMessage(2, persistent, null);
ref2 = ms.reference(msg2);
tx = tr.createTransaction();
@@ -957,10 +957,10 @@
receivers[i].clear();
}
- msg1 = MessageFactory.createCoreMessage(1, persistent, null);;
+ msg1 = CoreMessageFactory.createCoreMessage(1, persistent, null);;
ref1 = ms.reference(msg1);
- msg2 = MessageFactory.createCoreMessage(2, persistent, null);;
+ msg2 = CoreMessageFactory.createCoreMessage(2, persistent, null);;
ref2 = ms.reference(msg2);
tx = tr.createTransaction();
@@ -994,10 +994,10 @@
//Now send some non transactionally
- msg1 = MessageFactory.createCoreMessage(1, persistent, null);
+ msg1 = CoreMessageFactory.createCoreMessage(1, persistent, null);
ref1 = ms.reference(msg1);
- msg2 = MessageFactory.createCoreMessage(2, persistent, null);
+ msg2 = CoreMessageFactory.createCoreMessage(2, persistent, null);
ref2 = ms.reference(msg2);
routed = office1.route(ref1, "topic2", null);
@@ -1063,10 +1063,10 @@
// and the rollback
- msg1 = MessageFactory.createCoreMessage(1, persistent, null);;
+ msg1 = CoreMessageFactory.createCoreMessage(1, persistent, null);;
ref1 = ms.reference(msg1);
- msg2 = MessageFactory.createCoreMessage(2, persistent, null);;
+ msg2 = CoreMessageFactory.createCoreMessage(2, persistent, null);;
ref2 = ms.reference(msg2);
routed = office1.route(ref1, "topic2", null);
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/JDBCPersistenceManagerTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -39,7 +39,6 @@
import org.jboss.messaging.core.Channel;
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.IdManager;
import org.jboss.messaging.core.plugin.JDBCPersistenceManager;
import org.jboss.messaging.core.plugin.SimpleMessageStore;
@@ -51,6 +50,7 @@
import org.jboss.test.messaging.core.SimpleChannel;
import org.jboss.test.messaging.tools.ServerManagement;
import org.jboss.test.messaging.tools.jmx.ServiceContainer;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import org.jboss.tm.TransactionManagerService;
import org.jboss.util.id.GUID;
@@ -962,7 +962,7 @@
{
Map headers = generateFilledMap(true);
- return MessageFactory.
+ return CoreMessageFactory.
createCoreMessage(i,
reliable,
System.currentTimeMillis() + 1000 * 60 * 60,
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/SimplePostOfficeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/SimplePostOfficeTest.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/SimplePostOfficeTest.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -29,14 +29,13 @@
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.Queue;
-import org.jboss.messaging.core.message.MessageFactory;
import org.jboss.messaging.core.plugin.IdManager;
import org.jboss.messaging.core.plugin.JDBCPersistenceManager;
import org.jboss.messaging.core.plugin.SimpleMessageStore;
-import org.jboss.messaging.core.plugin.contract.Binding;
import org.jboss.messaging.core.plugin.contract.MessageStore;
import org.jboss.messaging.core.plugin.contract.PersistenceManager;
import org.jboss.messaging.core.plugin.contract.PostOffice;
+import org.jboss.messaging.core.plugin.postoffice.Binding;
import org.jboss.messaging.core.plugin.postoffice.PostOfficeImpl;
import org.jboss.messaging.core.tx.Transaction;
import org.jboss.messaging.core.tx.TransactionRepository;
@@ -44,6 +43,7 @@
import org.jboss.test.messaging.core.SimpleReceiver;
import org.jboss.test.messaging.tools.ServerManagement;
import org.jboss.test.messaging.tools.jmx.ServiceContainer;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -402,7 +402,7 @@
assertTrue(binding3.isActive());
assertTrue(binding4.isActive());
- Message msg1 = MessageFactory.createCoreMessage(1);
+ Message msg1 = CoreMessageFactory.createCoreMessage(1);
MessageReference ref1 = ms.reference(msg1);
boolean routed = postOffice.route(ref1, "topic1", null);
@@ -440,7 +440,7 @@
receiver3.clear();
- Message msg2 = MessageFactory.createCoreMessage(2);
+ Message msg2 = CoreMessageFactory.createCoreMessage(2);
MessageReference ref2 = ms.reference(msg2);
routed = postOffice.route(ref2, "topic2", null);
@@ -503,7 +503,7 @@
assertTrue(binding1.isActive());
- Message msg1 = MessageFactory.createCoreMessage(1);
+ Message msg1 = CoreMessageFactory.createCoreMessage(1);
MessageReference ref1 = ms.reference(msg1);
boolean routed = postOffice.route(ref1, "this won't match anything", null);
@@ -582,7 +582,7 @@
assertTrue(binding5.isActive());
assertTrue(binding6.isActive());
- Message msg1 = MessageFactory.createCoreMessage(1, persistentMessage, null);
+ Message msg1 = CoreMessageFactory.createCoreMessage(1, persistentMessage, null);
MessageReference ref1 = ms.reference(msg1);
boolean routed = postOffice.route(ref1, "topic1", null);
@@ -635,7 +635,7 @@
receiver3.clear();
- Message msg2 = MessageFactory.createCoreMessage(2, persistentMessage, null);
+ Message msg2 = CoreMessageFactory.createCoreMessage(2, persistentMessage, null);
MessageReference ref2 = ms.reference(msg2);
routed = postOffice.route(ref2, "topic2", null);
@@ -718,10 +718,10 @@
assertTrue(binding1.isActive());
assertTrue(binding2.isActive());
- Message msg1 = MessageFactory.createCoreMessage(1, persistentMessage, null);
+ Message msg1 = CoreMessageFactory.createCoreMessage(1, persistentMessage, null);
MessageReference ref1 = ms.reference(msg1);
- Message msg2 = MessageFactory.createCoreMessage(2, persistentMessage, null);
+ Message msg2 = CoreMessageFactory.createCoreMessage(2, persistentMessage, null);
MessageReference ref2 = ms.reference(msg2);
Transaction tx = tr.createTransaction();
@@ -776,10 +776,10 @@
receiver2.clear();
- Message msg3 = MessageFactory.createCoreMessage(3, persistentMessage, null);
+ Message msg3 = CoreMessageFactory.createCoreMessage(3, persistentMessage, null);
MessageReference ref3 = ms.reference(msg3);
- Message msg4 = MessageFactory.createCoreMessage(4, persistentMessage, null);
+ Message msg4 = CoreMessageFactory.createCoreMessage(4, persistentMessage, null);
MessageReference ref4 = ms.reference(msg4);
tx = tr.createTransaction();
@@ -812,10 +812,10 @@
receiver2.clear();
- Message msg5 = MessageFactory.createCoreMessage(5, persistentMessage, null);
+ Message msg5 = CoreMessageFactory.createCoreMessage(5, persistentMessage, null);
MessageReference ref5 = ms.reference(msg5);
- Message msg6 = MessageFactory.createCoreMessage(6, persistentMessage, null);
+ Message msg6 = CoreMessageFactory.createCoreMessage(6, persistentMessage, null);
MessageReference ref6 = ms.reference(msg6);
routed = postOffice.route(ref5, "topic1", null);
@@ -879,10 +879,10 @@
receiver2.clear();
- Message msg7 = MessageFactory.createCoreMessage(7, persistentMessage, null);
+ Message msg7 = CoreMessageFactory.createCoreMessage(7, persistentMessage, null);
MessageReference ref7 = ms.reference(msg7);
- Message msg8 = MessageFactory.createCoreMessage(8, persistentMessage, null);
+ Message msg8 = CoreMessageFactory.createCoreMessage(8, persistentMessage, null);
MessageReference ref8 = ms.reference(msg8);
routed = postOffice.route(ref7, "topic1", null);
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/base/MessageStoreTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/base/MessageStoreTestBase.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/base/MessageStoreTestBase.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -29,7 +29,7 @@
import org.jboss.messaging.core.MessageReference;
import org.jboss.test.messaging.MessagingTestCase;
import org.jboss.test.messaging.tools.jmx.ServiceContainer;
-import org.jboss.messaging.core.message.MessageFactory;
+import org.jboss.test.messaging.util.CoreMessageFactory;
import org.jboss.messaging.core.plugin.contract.MessageStore;
@@ -138,7 +138,7 @@
public void testMessageStore_1() throws Exception
{
- Message m = MessageFactory.
+ Message m = CoreMessageFactory.
createCoreMessage(0, false, 777l, 888l, (byte)9, headers, "payload");
// recoverable store, non-reliable message, one message
@@ -157,7 +157,7 @@
public void testMessageStore_1_1() throws Exception
{
- Message m = MessageFactory.
+ Message m = CoreMessageFactory.
createCoreMessage(0, false, 777l, 888l, (byte)9, headers, "payload");
// recoverable store, non-reliable message, one message
@@ -179,7 +179,7 @@
MessageReference[] refs = new MessageReference[NUMBER_OF_MESSAGES];
for(int i = 0; i < NUMBER_OF_MESSAGES; i++ )
{
- m[i] = MessageFactory.createCoreMessage(i, false, 700 + i, 800 + i,
+ m[i] = CoreMessageFactory.createCoreMessage(i, false, 700 + i, 800 + i,
(byte)(i % 10), headers, "payload" + i);
// recoverable store, non-reliable message, one message
@@ -215,7 +215,7 @@
public void testMessageStore_3() throws Exception
{
- Message m = MessageFactory.
+ Message m = CoreMessageFactory.
createCoreMessage(0, true, 777l, 888l, (byte)9, headers, "payload");
// recoverable store, non-reliable message, one message
@@ -237,7 +237,7 @@
public void testMessageStore_3_1() throws Exception
{
- Message m = MessageFactory.
+ Message m = CoreMessageFactory.
createCoreMessage(0, true, 777l, 888l, (byte)9, headers, "payload");
// recoverable store, non-reliable message, one message
@@ -259,7 +259,7 @@
MessageReference[] refs = new MessageReference[NUMBER_OF_MESSAGES];
for(int i = 0; i < NUMBER_OF_MESSAGES; i++ )
{
- m[i] = MessageFactory.createCoreMessage(i, true, 700 + i, 800 + i,
+ m[i] = CoreMessageFactory.createCoreMessage(i, true, 700 + i, 800 + i,
(byte)(i % 10), headers, "payload" + i);
// recoverable store, non-reliable message, one message
@@ -286,7 +286,7 @@
public void testMessageStore_6() throws Exception
{
- Message m = MessageFactory.
+ Message m = CoreMessageFactory.
createCoreMessage(0, true, 777l, 888l, (byte)9, headers, "payload");
// non-recoverable store, non-reliable message, one message
@@ -315,7 +315,7 @@
public void testMessageStore_7() throws Exception
{
- Message m = MessageFactory.
+ Message m = CoreMessageFactory.
createCoreMessage(0, true, 777l, 888l, (byte)9, headers, "payload");
// non-recoverable store, non-reliable message, one message
Added: trunk/tests/src/org/jboss/test/messaging/util/CoreMessageFactory.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/util/CoreMessageFactory.java 2006-09-14 13:59:28 UTC (rev 1289)
+++ trunk/tests/src/org/jboss/test/messaging/util/CoreMessageFactory.java 2006-09-14 18:42:29 UTC (rev 1290)
@@ -0,0 +1,94 @@
+/*
+ * 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.test.messaging.util;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.jboss.messaging.core.message.CoreMessage;
+
+/**
+ * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @version <tt>$Revision: 764 $</tt>
+ *
+ * $Id: MessageFactory.java 764 2006-03-22 10:23:38Z timfox $
+ */
+public class CoreMessageFactory
+{
+ // Constants -----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ public static CoreMessage createCoreMessage(long messageID)
+ {
+ return createCoreMessage(messageID, false, 0, 0, (byte)4, null, null, 0);
+ }
+
+ public static CoreMessage createCoreMessage(long messageID,
+ boolean reliable,
+ Serializable payload)
+ {
+ return createCoreMessage(messageID, reliable, 0, 0, (byte)4, null, payload, 0);
+ }
+
+ public static CoreMessage createCoreMessage(long messageID,
+ boolean reliable,
+ long expiration,
+ long timestamp,
+ byte priority,
+ Map coreHeaders,
+ Serializable payload,
+ int persistentChannelCount)
+ {
+ CoreMessage cm =
+ new CoreMessage(messageID, reliable, expiration, timestamp, priority, coreHeaders, null, persistentChannelCount);
+ cm.setPayload(payload);
+ return cm;
+ }
+
+ public static CoreMessage createCoreMessage(long messageID,
+ boolean reliable,
+ long expiration,
+ long timestamp,
+ byte priority,
+ Map coreHeaders,
+ Serializable payload)
+ {
+ return createCoreMessage(messageID, reliable, expiration, timestamp, priority, coreHeaders, payload, 0);
+ }
+
+
+ // Attributes ----------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+}
More information about the jboss-cvs-commits
mailing list