[jboss-cvs] JBoss Messaging SVN: r1559 - in branches/Branch_Client_Failover_Experiment: src/etc/server/default/deploy src/main/org/jboss/jms/server src/main/org/jboss/jms/server/remoting src/main/org/jboss/messaging/core/plugin src/main/org/jboss/messaging/core/plugin/postoffice/cluster tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 13 20:03:01 EST 2006
Author: clebert.suconic at jboss.com
Date: 2006-11-13 20:02:53 -0500 (Mon, 13 Nov 2006)
New Revision: 1559
Modified:
branches/Branch_Client_Failover_Experiment/src/etc/server/default/deploy/messaging-service.xml
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/ServerPeer.java
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/remoting/JMSServerInvocationHandler.java
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/ClusteredPostOfficeService.java
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/NodeAddressInfo.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeTest.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeWithDefaultRouterTest.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultRouterTest.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RecoveryTest.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RedistributionWithDefaultMessagePullPolicyTest.java
Log:
Adding RemotingLocator properties
Modified: branches/Branch_Client_Failover_Experiment/src/etc/server/default/deploy/messaging-service.xml
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/etc/server/default/deploy/messaging-service.xml 2006-11-10 22:57:35 UTC (rev 1558)
+++ branches/Branch_Client_Failover_Experiment/src/etc/server/default/deploy/messaging-service.xml 2006-11-14 01:02:53 UTC (rev 1559)
@@ -23,6 +23,7 @@
<depends optional-attribute-name="PersistenceManager">jboss.messaging:service=PersistenceManager</depends>
<depends optional-attribute-name="JMSUserManager">jboss.messaging:service=JMSUserManager</depends>
+ <depends>jboss.messaging:service=Connector,transport=socket</depends>
<attribute name="QueuePostOffice">jboss.messaging:service=QueuePostOffice</attribute>
<attribute name="TopicPostOffice">jboss.messaging:service=TopicPostOffice</attribute>
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/ServerPeer.java 2006-11-10 22:57:35 UTC (rev 1558)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/ServerPeer.java 2006-11-14 01:02:53 UTC (rev 1559)
@@ -21,23 +21,13 @@
*/
package org.jboss.jms.server;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Map;
-import java.util.Set;
-
-import javax.management.Attribute;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
import org.jboss.aop.AspectXmlLoader;
import org.jboss.jms.server.connectionfactory.ConnectionFactoryJNDIMapper;
import org.jboss.jms.server.connectionmanager.SimpleConnectionManager;
import org.jboss.jms.server.connectormanager.SimpleConnectorManager;
import org.jboss.jms.server.endpoint.ServerConsumerEndpoint;
import org.jboss.jms.server.plugin.contract.JMSUserManager;
-import org.jboss.jms.server.remoting.JMSServerInvocationHandler;
import org.jboss.jms.server.remoting.JMSWireFormat;
import org.jboss.jms.server.security.SecurityMetadataStore;
import org.jboss.jms.util.ExceptionUtil;
@@ -53,14 +43,20 @@
import org.jboss.messaging.core.tx.TransactionRepository;
import org.jboss.messaging.util.Util;
import org.jboss.mx.loading.UnifiedClassLoader3;
-import org.jboss.remoting.ServerInvocationHandler;
import org.jboss.remoting.marshal.MarshalFactory;
import org.jboss.remoting.serialization.SerializationStreamFactory;
import org.jboss.system.ServiceCreator;
import org.jboss.system.ServiceMBeanSupport;
import org.w3c.dom.Element;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import javax.management.Attribute;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Map;
+import java.util.Set;
/**
* A JMS server peer.
@@ -90,6 +86,7 @@
private int serverPeerID;
private byte[] clientAOPConfig;
private Version version;
+ private String remotingLocator;
private String defaultQueueJNDIContext;
private String defaultTopicJNDIContext;
@@ -130,8 +127,6 @@
protected JMSUserManager jmsUserManager;
//Other stuff
-
- private JMSServerInvocationHandler handler;
// We keep a map of consumers to prevent us to recurse through the attached session in order to
// find the ServerConsumerDelegate so we can acknowledge the message. Originally, this map was
@@ -296,6 +291,12 @@
// JMX Attributes ------------------------------------------------
+
+ public String getRemotingLocator()
+ {
+ return remotingLocator;
+ }
+
public ObjectName getPersistenceManager()
{
return persistenceManagerObjectName;
@@ -428,11 +429,6 @@
return channelIdManager;
}
- public ServerInvocationHandler getInvocationHandler()
- {
- return handler;
- }
-
public int getQueuedExecutorPoolSize()
{
return queuedExecutorPoolSize;
@@ -728,7 +724,10 @@
MarshalFactory.addMarshaller("jms", wf, wf);
- handler = new JMSServerInvocationHandler();
+ //TODO : Maybe we should put this name under a static definition. But where?
+ ObjectName name = new ObjectName("jboss.messaging:service=Connector,transport=socket");
+ this.remotingLocator = (String)getServer().getAttribute(name,"InvokerLocator");
+
}
private void loadServerAOPConfig() throws Exception
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/remoting/JMSServerInvocationHandler.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/remoting/JMSServerInvocationHandler.java 2006-11-10 22:57:35 UTC (rev 1558)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/remoting/JMSServerInvocationHandler.java 2006-11-14 01:02:53 UTC (rev 1559)
@@ -21,13 +21,6 @@
*/
package org.jboss.jms.server.remoting;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.management.MBeanServer;
-
import org.jboss.aop.joinpoint.InvocationResponse;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.aop.util.PayloadKey;
@@ -39,6 +32,12 @@
import org.jboss.remoting.callback.InvokerCallbackHandler;
import org.jboss.remoting.callback.ServerInvokerCallbackHandler;
+import javax.management.MBeanServer;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+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>
@@ -79,6 +78,11 @@
log.debug("set MBeanServer to " + this.server);
}
+ public ServerInvoker getInvoker()
+ {
+ return invoker;
+ }
+
public void setInvoker(ServerInvoker invoker)
{
this.invoker = invoker;
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/ClusteredPostOfficeService.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/ClusteredPostOfficeService.java 2006-11-10 22:57:35 UTC (rev 1558)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/ClusteredPostOfficeService.java 2006-11-14 01:02:53 UTC (rev 1559)
@@ -21,9 +21,6 @@
*/
package org.jboss.messaging.core.plugin;
-import javax.management.ObjectName;
-import javax.transaction.TransactionManager;
-
import org.jboss.jms.selector.SelectorFactory;
import org.jboss.jms.server.QueuedExecutorPool;
import org.jboss.jms.server.ServerPeer;
@@ -38,6 +35,9 @@
import org.jboss.messaging.core.tx.TransactionRepository;
import org.w3c.dom.Element;
+import javax.management.ObjectName;
+import javax.transaction.TransactionManager;
+
/**
* A ClusteredPostOfficeService
*
@@ -246,9 +246,9 @@
ClusterRouterFactory rf = (ClusterRouterFactory)clazz.newInstance();
FilterFactory ff = new SelectorFactory();
-
+
postOffice = new DefaultClusteredPostOffice(ds, tm, sqlProperties, createTablesOnStartup,
- nodeId, officeName, ms,
+ nodeId, serverPeer.getRemotingLocator(), officeName, ms,
pm, tr, ff, pool,
groupName,
syncChannelConfig, asyncChannelConfig,
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java 2006-11-10 22:57:35 UTC (rev 1558)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java 2006-11-14 01:02:53 UTC (rev 1559)
@@ -120,6 +120,9 @@
private Map failedBindings;
private StatsSender statsSender;
+
+ /** Used for failover mapping */
+ private String remotingLocator;
private boolean started;
@@ -140,7 +143,7 @@
*/
public DefaultClusteredPostOffice(DataSource ds, TransactionManager tm, Properties sqlProperties,
boolean createTablesOnStartup,
- int nodeId, String officeName, MessageStore ms,
+ int nodeId, String remotingLocator, String officeName, MessageStore ms,
PersistenceManager pm,
TransactionRepository tr,
FilterFactory filterFactory,
@@ -153,12 +156,12 @@
ClusterRouterFactory rf,
long statsSendPeriod) throws Exception
{
- this(ds, tm, sqlProperties, createTablesOnStartup, nodeId, officeName, ms,
+ this(ds, tm, sqlProperties, createTablesOnStartup, nodeId, remotingLocator, officeName, ms,
pm, tr, filterFactory, pool, groupName, stateTimeout, castTimeout, redistributionPolicy,
rf, statsSendPeriod);
this.syncChannelConfigE = syncChannelConfig;
- this.asyncChannelConfigE = asyncChannelConfig;
+ this.asyncChannelConfigE = asyncChannelConfig;
}
/*
@@ -166,7 +169,7 @@
*/
public DefaultClusteredPostOffice(DataSource ds, TransactionManager tm, Properties sqlProperties,
boolean createTablesOnStartup,
- int nodeId, String officeName, MessageStore ms,
+ int nodeId, String remotingLocator, String officeName, MessageStore ms,
PersistenceManager pm,
TransactionRepository tr,
FilterFactory filterFactory,
@@ -179,7 +182,7 @@
ClusterRouterFactory rf,
long statsSendPeriod) throws Exception
{
- this(ds, tm, sqlProperties, createTablesOnStartup, nodeId, officeName, ms,
+ this(ds, tm, sqlProperties, createTablesOnStartup, nodeId, remotingLocator, officeName, ms,
pm, tr, filterFactory, pool, groupName, stateTimeout, castTimeout, redistributionPolicy,
rf, statsSendPeriod);
@@ -189,7 +192,7 @@
private DefaultClusteredPostOffice(DataSource ds, TransactionManager tm, Properties sqlProperties,
boolean createTablesOnStartup,
- int nodeId, String officeName, MessageStore ms,
+ int nodeId, String remotingLocator, String officeName, MessageStore ms,
PersistenceManager pm,
TransactionRepository tr,
FilterFactory filterFactory,
@@ -203,6 +206,8 @@
super (ds, tm, sqlProperties, createTablesOnStartup, nodeId, officeName, ms, pm, tr, filterFactory,
pool);
+ this.remotingLocator = remotingLocator;
+
this.pm = pm;
this.groupName = groupName;
@@ -271,8 +276,8 @@
Address syncAddress = syncChannel.getLocalAddress();
Address asyncAddress = asyncChannel.getLocalAddress();
-
- NodeAddressInfo info = new NodeAddressInfo(syncAddress, asyncAddress);
+
+ NodeAddressInfo info = new NodeAddressInfo(syncAddress, asyncAddress, remotingLocator);
handleAddressNodeMapping(info, nodeId);
@@ -623,7 +628,7 @@
if (trace)
{
log.trace(this.nodeId + " Adding address node mapping for " + info.getSyncChannelAddress() +
- "," + info.getAsyncChannelAddress() + " and " + nodeId);
+ "," + info.getAsyncChannelAddress() + " nodeId=" + nodeId + " and remotingLocator=" + info.getRemotingLocator());
}
try
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/NodeAddressInfo.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/NodeAddressInfo.java 2006-11-10 22:57:35 UTC (rev 1558)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/NodeAddressInfo.java 2006-11-14 01:02:53 UTC (rev 1559)
@@ -21,13 +21,13 @@
*/
package org.jboss.messaging.core.plugin.postoffice.cluster;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-
import org.jboss.messaging.util.Streamable;
import org.jgroups.Address;
import org.jgroups.stack.IpAddress;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+
/**
* A NodeAddressInfo
*
@@ -42,16 +42,20 @@
private Address syncChannelAddress;
private Address asyncChannelAddress;
-
+
+ private String remotingLocator;
+
public NodeAddressInfo()
{
}
- NodeAddressInfo(Address syncChannelAddress, Address asyncChannelAddress)
+ NodeAddressInfo(Address syncChannelAddress, Address asyncChannelAddress, String locator)
{
this.syncChannelAddress = syncChannelAddress;
this.asyncChannelAddress = asyncChannelAddress;
+
+ this.remotingLocator = locator;
}
Address getSyncChannelAddress()
@@ -63,7 +67,13 @@
{
return asyncChannelAddress;
}
-
+
+
+ public String getRemotingLocator()
+ {
+ return remotingLocator;
+ }
+
public void read(DataInputStream in) throws Exception
{
syncChannelAddress = new IpAddress();
@@ -73,6 +83,8 @@
asyncChannelAddress = new IpAddress();
asyncChannelAddress.readFrom(in);
+
+ this.remotingLocator = in.readUTF();
}
public void write(DataOutputStream out) throws Exception
@@ -89,7 +101,9 @@
syncChannelAddress.writeTo(out);
- asyncChannelAddress.writeTo(out);
+ asyncChannelAddress.writeTo(out);
+
+ out.writeUTF(remotingLocator);
}
}
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeTest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeTest.java 2006-11-10 22:57:35 UTC (rev 1558)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeTest.java 2006-11-14 01:02:53 UTC (rev 1559)
@@ -21,22 +21,14 @@
*/
package org.jboss.test.messaging.core.plugin.postoffice.cluster;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
+import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
import org.jboss.messaging.core.FilterFactory;
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.PagingFilteredQueue;
import org.jboss.messaging.core.plugin.contract.ClusteredPostOffice;
import org.jboss.messaging.core.plugin.postoffice.Binding;
-import org.jboss.messaging.core.plugin.postoffice.cluster.ClusterRouterFactory;
-import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultClusteredPostOffice;
-import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultRouterFactory;
-import org.jboss.messaging.core.plugin.postoffice.cluster.LocalClusteredQueue;
-import org.jboss.messaging.core.plugin.postoffice.cluster.MessagePullPolicy;
-import org.jboss.messaging.core.plugin.postoffice.cluster.NullMessagePullPolicy;
+import org.jboss.messaging.core.plugin.postoffice.cluster.*;
import org.jboss.messaging.core.tx.Transaction;
import org.jboss.test.messaging.core.SimpleFilter;
import org.jboss.test.messaging.core.SimpleFilterFactory;
@@ -44,7 +36,9 @@
import org.jboss.test.messaging.core.plugin.postoffice.DefaultPostOfficeTest;
import org.jboss.test.messaging.util.CoreMessageFactory;
-import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
/**
*
@@ -2244,7 +2238,7 @@
DefaultClusteredPostOffice postOffice =
new DefaultClusteredPostOffice(sc.getDataSource(), sc.getTransactionManager(),
- sc.getClusteredPostOfficeSQLProperties(), true, nodeId, "Clustered", ms, pm, tr, ff, pool,
+ sc.getClusteredPostOfficeSQLProperties(), true, nodeId, "", "Clustered", ms, pm, tr, ff, pool,
groupName,
JGroupsUtil.getControlStackProperties(),
JGroupsUtil.getDataStackProperties(),
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeWithDefaultRouterTest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeWithDefaultRouterTest.java 2006-11-10 22:57:35 UTC (rev 1558)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOfficeWithDefaultRouterTest.java 2006-11-14 01:02:53 UTC (rev 1559)
@@ -21,22 +21,16 @@
*/
package org.jboss.test.messaging.core.plugin.postoffice.cluster;
-import java.util.List;
-
+import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
import org.jboss.messaging.core.FilterFactory;
import org.jboss.messaging.core.plugin.contract.ClusteredPostOffice;
import org.jboss.messaging.core.plugin.postoffice.Binding;
-import org.jboss.messaging.core.plugin.postoffice.cluster.ClusterRouterFactory;
-import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultClusteredPostOffice;
-import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultRouterFactory;
-import org.jboss.messaging.core.plugin.postoffice.cluster.LocalClusteredQueue;
-import org.jboss.messaging.core.plugin.postoffice.cluster.MessagePullPolicy;
-import org.jboss.messaging.core.plugin.postoffice.cluster.NullMessagePullPolicy;
+import org.jboss.messaging.core.plugin.postoffice.cluster.*;
import org.jboss.test.messaging.core.SimpleFilterFactory;
import org.jboss.test.messaging.core.SimpleReceiver;
import org.jboss.test.messaging.core.plugin.base.PostOfficeTestBase;
-import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
+import java.util.List;
/**
*
@@ -380,7 +374,7 @@
DefaultClusteredPostOffice postOffice =
new DefaultClusteredPostOffice(sc.getDataSource(), sc.getTransactionManager(),
- sc.getClusteredPostOfficeSQLProperties(), true, nodeId, "Clustered", ms, pm, tr, ff, pool,
+ sc.getClusteredPostOfficeSQLProperties(), true, nodeId, "", "Clustered", ms, pm, tr, ff, pool,
groupName,
JGroupsUtil.getControlStackProperties(),
JGroupsUtil.getDataStackProperties(),
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultRouterTest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultRouterTest.java 2006-11-10 22:57:35 UTC (rev 1558)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultRouterTest.java 2006-11-14 01:02:53 UTC (rev 1559)
@@ -21,35 +21,19 @@
*/
package org.jboss.test.messaging.core.plugin.postoffice.cluster;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.jboss.messaging.core.Delivery;
-import org.jboss.messaging.core.DeliveryObserver;
-import org.jboss.messaging.core.Filter;
-import org.jboss.messaging.core.FilterFactory;
-import org.jboss.messaging.core.Message;
-import org.jboss.messaging.core.MessageReference;
-import org.jboss.messaging.core.Queue;
-import org.jboss.messaging.core.Receiver;
-import org.jboss.messaging.core.SimpleDelivery;
+import org.jboss.messaging.core.*;
import org.jboss.messaging.core.plugin.contract.ClusteredPostOffice;
-import org.jboss.messaging.core.plugin.postoffice.cluster.ClusterRouter;
-import org.jboss.messaging.core.plugin.postoffice.cluster.ClusterRouterFactory;
-import org.jboss.messaging.core.plugin.postoffice.cluster.ClusteredQueue;
-import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultClusteredPostOffice;
-import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultRouter;
-import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultRouterFactory;
-import org.jboss.messaging.core.plugin.postoffice.cluster.MessagePullPolicy;
-import org.jboss.messaging.core.plugin.postoffice.cluster.NullMessagePullPolicy;
-import org.jboss.messaging.core.plugin.postoffice.cluster.QueueStats;
+import org.jboss.messaging.core.plugin.postoffice.cluster.*;
import org.jboss.messaging.core.tx.Transaction;
import org.jboss.test.messaging.core.SimpleFilterFactory;
import org.jboss.test.messaging.core.SimpleReceiver;
import org.jboss.test.messaging.core.plugin.base.PostOfficeTestBase;
import org.jboss.test.messaging.util.CoreMessageFactory;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
*
* A DefaultRouterTest
@@ -355,7 +339,7 @@
DefaultClusteredPostOffice postOffice =
new DefaultClusteredPostOffice(sc.getDataSource(), sc.getTransactionManager(),
- sc.getClusteredPostOfficeSQLProperties(), true, nodeId, "Clustered", ms, pm, tr, ff, pool,
+ sc.getClusteredPostOfficeSQLProperties(), true, nodeId, "", "Clustered", ms, pm, tr, ff, pool,
groupName,
JGroupsUtil.getControlStackProperties(),
JGroupsUtil.getDataStackProperties(),
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RecoveryTest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RecoveryTest.java 2006-11-10 22:57:35 UTC (rev 1558)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RecoveryTest.java 2006-11-14 01:02:53 UTC (rev 1559)
@@ -21,19 +21,13 @@
*/
package org.jboss.test.messaging.core.plugin.postoffice.cluster;
-import java.util.List;
-
+import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
import org.jboss.messaging.core.FilterFactory;
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.plugin.contract.ClusteredPostOffice;
import org.jboss.messaging.core.plugin.postoffice.Binding;
-import org.jboss.messaging.core.plugin.postoffice.cluster.ClusterRouterFactory;
-import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultClusteredPostOffice;
-import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultRouterFactory;
-import org.jboss.messaging.core.plugin.postoffice.cluster.LocalClusteredQueue;
-import org.jboss.messaging.core.plugin.postoffice.cluster.MessagePullPolicy;
-import org.jboss.messaging.core.plugin.postoffice.cluster.NullMessagePullPolicy;
+import org.jboss.messaging.core.plugin.postoffice.cluster.*;
import org.jboss.messaging.core.tx.Transaction;
import org.jboss.messaging.core.tx.TransactionException;
import org.jboss.test.messaging.core.SimpleFilterFactory;
@@ -41,7 +35,7 @@
import org.jboss.test.messaging.core.plugin.base.PostOfficeTestBase;
import org.jboss.test.messaging.util.CoreMessageFactory;
-import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
+import java.util.List;
/**
*
@@ -357,7 +351,7 @@
DefaultClusteredPostOffice postOffice =
new DefaultClusteredPostOffice(sc.getDataSource(), sc.getTransactionManager(),
- sc.getClusteredPostOfficeSQLProperties(), true, nodeId, "Clustered", ms, pm, tr, ff, pool,
+ sc.getClusteredPostOfficeSQLProperties(), true, nodeId,"", "Clustered", ms, pm, tr, ff, pool,
groupName,
JGroupsUtil.getControlStackProperties(),
JGroupsUtil.getDataStackProperties(),
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RedistributionWithDefaultMessagePullPolicyTest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RedistributionWithDefaultMessagePullPolicyTest.java 2006-11-10 22:57:35 UTC (rev 1558)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/RedistributionWithDefaultMessagePullPolicyTest.java 2006-11-14 01:02:53 UTC (rev 1559)
@@ -21,34 +21,21 @@
*/
package org.jboss.test.messaging.core.plugin.postoffice.cluster;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.jboss.messaging.core.Channel;
-import org.jboss.messaging.core.Delivery;
-import org.jboss.messaging.core.DeliveryObserver;
-import org.jboss.messaging.core.FilterFactory;
-import org.jboss.messaging.core.Message;
-import org.jboss.messaging.core.MessageReference;
-import org.jboss.messaging.core.Receiver;
-import org.jboss.messaging.core.SimpleDelivery;
+import EDU.oswego.cs.dl.util.concurrent.Executor;
+import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
+import org.jboss.messaging.core.*;
import org.jboss.messaging.core.plugin.contract.ClusteredPostOffice;
import org.jboss.messaging.core.plugin.postoffice.Binding;
-import org.jboss.messaging.core.plugin.postoffice.cluster.ClusterRouterFactory;
-import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultClusteredPostOffice;
-import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultMessagePullPolicy;
-import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultRouterFactory;
-import org.jboss.messaging.core.plugin.postoffice.cluster.LocalClusteredQueue;
-import org.jboss.messaging.core.plugin.postoffice.cluster.MessagePullPolicy;
+import org.jboss.messaging.core.plugin.postoffice.cluster.*;
import org.jboss.messaging.core.tx.Transaction;
import org.jboss.test.messaging.core.SimpleFilterFactory;
import org.jboss.test.messaging.core.SimpleReceiver;
import org.jboss.test.messaging.core.plugin.base.PostOfficeTestBase;
import org.jboss.test.messaging.util.CoreMessageFactory;
-import EDU.oswego.cs.dl.util.concurrent.Executor;
-import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
/**
*
@@ -1148,7 +1135,7 @@
DefaultClusteredPostOffice postOffice =
new DefaultClusteredPostOffice(sc.getDataSource(), sc.getTransactionManager(),
- sc.getClusteredPostOfficeSQLProperties(), true, nodeId, "Clustered", ms, pm, tr, ff, pool,
+ sc.getClusteredPostOfficeSQLProperties(), true, nodeId,"", "Clustered", ms, pm, tr, ff, pool,
groupName,
JGroupsUtil.getControlStackProperties(),
JGroupsUtil.getDataStackProperties(),
More information about the jboss-cvs-commits
mailing list