[jboss-cvs] JBossAS SVN: r67154 - in trunk/ejb3/src: main/org/jboss/ejb3/stateful and 2 other directories.

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

Author: bstansberry at jboss.com
Date: 2007-11-15 17:26:10 -0500 (Thu, 15 Nov 2007)
New Revision: 67154

Modified:
   trunk/ejb3/src/main/org/jboss/annotation/ejb/ClusteredImpl.java
   trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
   trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusteredProxy.java
   trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
   trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusteredProxy.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java
Log:
[EJBTHREE-1117] Convert EJB3 and aspects module to use new LoadBalancePolicy

Modified: trunk/ejb3/src/main/org/jboss/annotation/ejb/ClusteredImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/ClusteredImpl.java	2007-11-15 22:23:58 UTC (rev 67153)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/ClusteredImpl.java	2007-11-15 22:26:10 UTC (rev 67154)
@@ -22,7 +22,7 @@
 package org.jboss.annotation.ejb;
 
 import org.jboss.annotation.ejb.Clustered;
-import org.jboss.ha.framework.interfaces.LoadBalancePolicy;
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
 
 /**
  * Comment

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java	2007-11-15 22:23:58 UTC (rev 67153)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java	2007-11-15 22:26:10 UTC (rev 67154)
@@ -40,11 +40,11 @@
 import org.jboss.ejb3.ProxyFactoryHelper;
 import org.jboss.ejb3.remoting.RemoteProxyFactory;
 import org.jboss.ejb3.session.SessionContainer;
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
 import org.jboss.ha.framework.interfaces.ClusteringTargetsRepository;
 import org.jboss.ha.framework.interfaces.DistributedReplicantManager;
 import org.jboss.ha.framework.interfaces.FirstAvailable;
 import org.jboss.ha.framework.interfaces.HAPartition;
-import org.jboss.ha.framework.interfaces.LoadBalancePolicy;
 import org.jboss.ha.framework.server.HATarget;
 import org.jboss.logging.Logger;
 import org.jboss.naming.Util;

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusteredProxy.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusteredProxy.java	2007-11-15 22:23:58 UTC (rev 67153)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusteredProxy.java	2007-11-15 22:26:10 UTC (rev 67154)
@@ -36,7 +36,7 @@
 import org.jboss.ejb3.ProxyUtils;
 import org.jboss.ejb3.asynchronous.AsynchronousInterceptor;
 import org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor;
-import org.jboss.ha.framework.interfaces.LoadBalancePolicy;
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
 import org.jboss.util.id.GUID;
 
 /**

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java	2007-11-15 22:23:58 UTC (rev 67153)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java	2007-11-15 22:26:10 UTC (rev 67154)
@@ -34,10 +34,10 @@
 import org.jboss.ejb3.ProxyFactoryHelper;
 import org.jboss.ejb3.remoting.RemoteProxyFactory;
 import org.jboss.ejb3.session.SessionContainer;
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
 import org.jboss.ha.framework.interfaces.ClusteringTargetsRepository;
 import org.jboss.ha.framework.interfaces.DistributedReplicantManager;
 import org.jboss.ha.framework.interfaces.HAPartition;
-import org.jboss.ha.framework.interfaces.LoadBalancePolicy;
 import org.jboss.ha.framework.interfaces.RandomRobin;
 import org.jboss.ha.framework.server.HATarget;
 import org.jboss.logging.Logger;

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusteredProxy.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusteredProxy.java	2007-11-15 22:23:58 UTC (rev 67153)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusteredProxy.java	2007-11-15 22:26:10 UTC (rev 67154)
@@ -38,7 +38,7 @@
 import org.jboss.ejb3.asynchronous.AsynchronousInterceptor;
 import org.jboss.ejb3.remoting.BaseRemoteProxy;
 import org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor;
-import org.jboss.ha.framework.interfaces.LoadBalancePolicy;
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
 
 /**
  * InvocationHandler for a clustered SLSB proxy.

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java	2007-11-15 22:23:58 UTC (rev 67153)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/BogusPolicy.java	2007-11-15 22:26:10 UTC (rev 67154)
@@ -21,30 +21,21 @@
  */
 package org.jboss.ejb3.test.clusteredsession;
 
-import org.jboss.ha.framework.interfaces.LoadBalancePolicy;
-import org.jboss.ha.framework.interfaces.HARMIClient;
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
 import org.jboss.ha.framework.interfaces.FamilyClusterInfo;
 
-import org.jboss.invocation.Invocation;
-
 /**
  * @version <tt>$Revision$</tt>
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  */
 public class BogusPolicy implements LoadBalancePolicy
 {
-   public void init (HARMIClient father)
-   {
-      throw new RuntimeException("Bogus implementation!");
-   }
-
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 1L;
+   
    public Object chooseTarget (FamilyClusterInfo clusterFamily)
    {
       throw new RuntimeException("Bogus implementation!");
    }
-   public Object chooseTarget (FamilyClusterInfo clusterFamily, Invocation routingDecision)
-   {
-      throw new RuntimeException("Bogus implementation!");
-   }
 
 }