[jboss-cvs] JBossAS SVN: r67152 - in trunk/cluster/src/main/org/jboss/ha: framework/server and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-11-15 17:21:44 -0500 (Thu, 15 Nov 2007)
New Revision: 67152

Modified:
   trunk/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java
   trunk/cluster/src/main/org/jboss/ha/framework/server/HARMIServerImpl.java
   trunk/cluster/src/main/org/jboss/ha/jndi/HANamingService.java
Log:
[JBAS-4979] Convert HARMIClient and HARMIServer to use new LoadBalancePolicy

Modified: trunk/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java	2007-11-15 22:21:07 UTC (rev 67151)
+++ trunk/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java	2007-11-15 22:21:44 UTC (rev 67152)
@@ -34,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
 import org.jboss.invocation.MarshalledInvocation;
 import org.jboss.logging.Logger;
 
@@ -112,7 +113,10 @@
 
       //this.targets = targets;
       this.loadBalancePolicy = policy;
-      this.loadBalancePolicy.init(this);
+      if (this.loadBalancePolicy instanceof org.jboss.ha.framework.interfaces.LoadBalancePolicy)
+      {
+         ((org.jboss.ha.framework.interfaces.LoadBalancePolicy)this.loadBalancePolicy).init(this);
+      }
       this.key = key;
       this.local = local;
       this.trace = log.isTraceEnabled();
@@ -145,7 +149,7 @@
    public Object getRemoteTarget()
    {
       //      System.out.println("number of targets: " + targets.size());
-      return loadBalancePolicy.chooseTarget(this.familyClusterInfo, null); // legacy, no Invocation object in raw HA-RMI
+      return loadBalancePolicy.chooseTarget(this.familyClusterInfo); // legacy, no Invocation object in raw HA-RMI
    }
 
    public void remoteTargetHasFailed(Object target)
@@ -350,8 +354,12 @@
       //
       this.familyClusterInfo = ClusteringTargetsRepository.initTarget (this.key, targets, vid);
 
-      this.loadBalancePolicy.init(this);
 
+      if (this.loadBalancePolicy instanceof org.jboss.ha.framework.interfaces.LoadBalancePolicy)
+      {
+         ((org.jboss.ha.framework.interfaces.LoadBalancePolicy)this.loadBalancePolicy).init(this);
+      }
+
       if (server != null)
       {
          synchronized (targets)

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/HARMIServerImpl.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/HARMIServerImpl.java	2007-11-15 22:21:07 UTC (rev 67151)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/HARMIServerImpl.java	2007-11-15 22:21:44 UTC (rev 67152)
@@ -34,12 +34,12 @@
 import java.util.List;
 import java.util.Map;
 
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
 import org.jboss.ha.framework.interfaces.HAPartition;
 import org.jboss.ha.framework.interfaces.HARMIClient;
 import org.jboss.ha.framework.interfaces.HARMIProxy;
 import org.jboss.ha.framework.interfaces.HARMIResponse;
 import org.jboss.ha.framework.interfaces.HARMIServer;
-import org.jboss.ha.framework.interfaces.LoadBalancePolicy;
 import org.jboss.invocation.MarshalledInvocation;
 import org.jboss.logging.Logger;
 import org.jboss.net.sockets.DefaultSocketFactory;
@@ -161,7 +161,7 @@
     * be bound in JNDI for client use. Each client stub may incorporate a specific load-balancing
     * policy.
     *
-    * @param policy {@link org.jboss.ha.framework.interfaces.LoadBalancePolicy} implementation to ues on the client.
+    * @param policy {@link org.jboss.ha.client.loadbalance.LoadBalancePolicy} implementation to ues on the client.
     * @return proxy instance object
     */
    public Object createHAStub(LoadBalancePolicy policy)

Modified: trunk/cluster/src/main/org/jboss/ha/jndi/HANamingService.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/jndi/HANamingService.java	2007-11-15 22:21:07 UTC (rev 67151)
+++ trunk/cluster/src/main/org/jboss/ha/jndi/HANamingService.java	2007-11-15 22:21:44 UTC (rev 67152)
@@ -24,8 +24,8 @@
 import java.rmi.server.RMIServerSocketFactory;
 import java.rmi.server.RMIClientSocketFactory;
 
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
 import org.jboss.ha.framework.server.HARMIServerImpl;
-import org.jboss.ha.framework.interfaces.LoadBalancePolicy;
 import org.jboss.ha.framework.interfaces.RoundRobin;
 import org.jnp.interfaces.Naming;