User: patriot1burke
Date: 02/02/04 13:26:48
Modified:src/main/org/jboss/ha/framework/server ClusterPartition.java
HAPartitionImpl.java
Log:
JavaGroups 2.0
Revision ChangesPath
1.11 +26 -11
jbossmx/src/main/org/jboss/ha/framework/server/ClusterPartition.java
Index: ClusterPartition.java
===
RCS file:
/cvsroot/jboss/jbossmx/src/main/org/jboss/ha/framework/server/ClusterPartition.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ClusterPartition.java 2001/12/31 20:41:17 1.10
+++ ClusterPartition.java 2002/02/04 21:26:48 1.11
@@ -13,7 +13,7 @@
import javax.management.ObjectName;
-import JavaGroups.Channel;
+import org.javagroups.Channel;
import org.jboss.system.ServiceMBeanSupport;
@@ -23,7 +23,7 @@
*
* @author a href=mailto:[EMAIL PROTECTED];Bill Burke/a.
* @author a href=mailto:[EMAIL PROTECTED];Sacha Labourey/a.
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*
* pbRevisions:/bbr
*/
@@ -40,6 +40,20 @@
protected String jgProps =
UDP: +
PING: +
+ FD(timeout=5000): +
+ VERIFY_SUSPECT(timeout=1500): +
+ MERGE: +
+ NAKACK: +
+ UNICAST(timeout=5000;min_wait_time=2000): +
+ FRAG: +
+ FLUSH: +
+ GMS: +
+ STATE_TRANSFER: +
+ QUEUE;
+ /*
+ protected String jgProps =
+ UDP: +
+ PING: +
FD(trace=true;timeout=5000): +
VERIFY_SUSPECT(trace=false;timeout=1500): +
MERGE: +
@@ -50,9 +64,10 @@
GMS: +
STATE_TRANSFER(trace=true): +
QUEUE;
+ */
protected HAPartitionImpl partition;
protected boolean deadlock_detection = false;
- protected JavaGroups.JChannel channel;
+ protected org.javagroups.JChannel channel;
// Static
@@ -114,11 +129,11 @@
throws Exception
{
log.info (Creating JavaGroups JChannel);
- this.channel = new JavaGroups.JChannel(jgProps);
- channel.SetOpt(Channel.LOCAL, new Boolean(false));
- channel.SetOpt(Channel.GET_STATE_EVENTS, new Boolean(true));
- channel.SetOpt(Channel.AUTO_RECONNECT, new Boolean(true));
- channel.SetOpt(Channel.AUTO_GETSTATE, new Boolean(true));
+ this.channel = new org.javagroups.JChannel(jgProps);
+ channel.setOpt(Channel.LOCAL, new Boolean(false));
+ channel.setOpt(Channel.GET_STATE_EVENTS, new Boolean(true));
+ channel.setOpt(Channel.AUTO_RECONNECT, new Boolean(true));
+ channel.setOpt(Channel.AUTO_GETSTATE, new Boolean(true));
log.info(Creating HAPartition...);
partition = new HAPartitionImpl(partitionName, channel, deadlock_detection,
getServer());
@@ -134,10 +149,10 @@
log.info(Starting ClusterPartition: + partitionName);
log.info( Connecting to channel);
- channel.Connect(partitionName);
+ channel.connect(partitionName);
log.info( Starting channel);
- partition.start();
+ partition.startPartition();
log.info(Started ClusterPartition: + partitionName);
}
@@ -147,7 +162,7 @@
try
{
log.info(Stopping HAPartition: + partitionName);
- partition.close();
+ partition.closePartition();
log.info(Stopped HAPartition: + partitionName);
}
catch (Exception e)
1.15 +65 -65
jbossmx/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java
Index: HAPartitionImpl.java
===
RCS file:
/cvsroot/jboss/jbossmx/src/main/org/jboss/ha/framework/server/HAPartitionImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- HAPartitionImpl.java 2002/01/12 16:53:38 1.14
+++ HAPartitionImpl.java 2002/02/04 21:26:48 1.15
@@ -16,7 +16,7 @@
import javax.naming.InitialContext;
import javax.management.MBeanServer;
-import JavaGroups.MethodCall;
+import org.javagroups.blocks.MethodCall;
import org.jboss.ha.framework.interfaces.DistributedReplicantManager;
import org.jboss.ha.framework.interfaces.DistributedState;
@@ -33,18 +33,18 @@
*
* @author a href=mailto:[EMAIL PROTECTED];Sacha Labourey/a.
* @author a href=mailto:[EMAIL PROTECTED];Bill Burke/a.
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*
* pbRevisions:/bbr
*/
public class HAPartitionImpl
- extends JavaGroups.RpcDispatcher
- implements JavaGroups.MessageListener, JavaGroups.MembershipListener, HAPartition
+ extends
