[jboss-cvs] JBossAS SVN: r68793 - in projects/ejb3/trunk/core/src: main/java/org/jboss/ejb3/stateful and 3 other directories.

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

Author: ALRubinger
Date: 2008-01-10 01:38:51 -0500 (Thu, 10 Jan 2008)
New Revision: 68793

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3DescriptorHandler.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1092/StatelessBean.java
Log:
[EJBTHREE-1167] Resolved compile errors as a result of resolving API leak in @Clustered

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3DescriptorHandler.java	2008-01-10 06:31:47 UTC (rev 68792)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3DescriptorHandler.java	2008-01-10 06:38:51 UTC (rev 68793)
@@ -1575,15 +1575,13 @@
          
          if (config.getBeanLoadBalancePolicy() != null)
          {
-            Class<? extends LoadBalancePolicy> policy = (Class<? extends LoadBalancePolicy>) di.getClassLoader()
-                  .loadClass(config.getBeanLoadBalancePolicy());
+            String policy = config.getBeanLoadBalancePolicy();
             clusteredAnnotation.setLoadBalancePolicy(policy);
          }
          
          if (config.getHomeLoadBalancePolicy() != null)
          {
-            Class<? extends LoadBalancePolicy> policy = (Class<? extends LoadBalancePolicy>) di.getClassLoader()
-                  .loadClass(config.getHomeLoadBalancePolicy());
+            String policy = config.getHomeLoadBalancePolicy();
             clusteredAnnotation.setHomeLoadBalancePolicy(policy);
          }
 

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java	2008-01-10 06:31:47 UTC (rev 68792)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java	2008-01-10 06:38:51 UTC (rev 68793)
@@ -109,7 +109,8 @@
       }
       else
       {
-         lbPolicy = clustered.loadBalancePolicy().newInstance();
+         lbPolicy = (LoadBalancePolicy)Thread.currentThread().getContextClassLoader().loadClass(clustered.loadBalancePolicy())
+               .newInstance();
       }
       wrapper = new FamilyWrapper(proxyFamilyName, hatarget.getReplicants());
       

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java	2008-01-10 06:31:47 UTC (rev 68792)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java	2008-01-10 06:38:51 UTC (rev 68793)
@@ -100,7 +100,8 @@
       }
       else
       {
-         lbPolicy = clustered.loadBalancePolicy().newInstance();
+         lbPolicy = (LoadBalancePolicy) Thread.currentThread().getContextClassLoader().loadClass(
+               clustered.loadBalancePolicy()).newInstance();
       }
       wrapper = new FamilyWrapper(proxyFamilyName, hatarget.getReplicants());
       

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java	2008-01-10 06:31:47 UTC (rev 68792)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/ClusteredStatelessSessionBean.java	2008-01-10 06:38:51 UTC (rev 68793)
@@ -13,7 +13,6 @@
 import javax.ejb.Stateless;
 
 import org.jboss.ejb3.annotation.Clustered;
-import org.jboss.ha.framework.interfaces.RoundRobin;
 
 /**
  * Simple stateless bean
@@ -21,7 +20,7 @@
  * @author Ben Wang
  */
 @Stateless(name="clusteredStateless")
- at Clustered(loadBalancePolicy = RoundRobin.class)
+ at Clustered(loadBalancePolicy = "RoundRobin")
 @Remote(ClusteredStatelessRemote.class)
 public class ClusteredStatelessSessionBean implements ClusteredStatelessRemote
 {

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java	2008-01-10 06:31:47 UTC (rev 68792)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java	2008-01-10 06:38:51 UTC (rev 68793)
@@ -34,7 +34,7 @@
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  */
 @Stateful(name="OverrideStateful")
- at Clustered(partition="BogusPartition", loadBalancePolicy=org.jboss.ejb3.test.clusteredsession.BogusPolicy.class)
+ at Clustered(partition="BogusPartition", loadBalancePolicy="BogusPolicy")
 @CacheConfig(maxSize=1000, idleTimeoutSeconds=2)
 @Remote(OverrideStatefulRemote.class)
 public class OverrideStatefulBean implements OverrideStatefulRemote

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1092/StatelessBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1092/StatelessBean.java	2008-01-10 06:31:47 UTC (rev 68792)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree1092/StatelessBean.java	2008-01-10 06:38:51 UTC (rev 68793)
@@ -34,7 +34,7 @@
  */
 @Stateless
 @Remote(StatelessRemote.class)
- at Clustered(loadBalancePolicy = RandomRobin.class)
+ at Clustered(loadBalancePolicy = "RandomRobin")
 public class StatelessBean implements StatelessRemote
 {
    private static final Logger log = Logger.getLogger(StatelessBean.class);