[jboss-cvs] JBossAS SVN: r87462 - trunk/cluster/src/main/org/jboss/ha/framework/server/deployers.

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

Author: bstansberry at jboss.com
Date: 2009-04-16 17:51:46 -0400 (Thu, 16 Apr 2009)
New Revision: 87462

Modified:
   trunk/cluster/src/main/org/jboss/ha/framework/server/deployers/AbstractHAPartitionDependencyDeployer.java
   trunk/cluster/src/main/org/jboss/ha/framework/server/deployers/Ejb2HAPartitionDependencyDeployer.java
   trunk/cluster/src/main/org/jboss/ha/framework/server/deployers/Ejb3HAPartitionDependencyDeployer.java
Log:
[JBAS-6800] Don't add dependency to non-clustered beans

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/deployers/AbstractHAPartitionDependencyDeployer.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/deployers/AbstractHAPartitionDependencyDeployer.java	2009-04-16 21:48:34 UTC (rev 87461)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/deployers/AbstractHAPartitionDependencyDeployer.java	2009-04-16 21:51:46 UTC (rev 87462)
@@ -33,7 +33,9 @@
 import org.jboss.metadata.ejb.jboss.ClusterConfigMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 
 public abstract class AbstractHAPartitionDependencyDeployer extends AbstractDeployer
 {
@@ -88,12 +90,35 @@
       }
    }
    
+   // --------------------------------------------------------------  Protected
+   
    protected abstract boolean accepts(JBossMetaData metaData);
    
    protected abstract void configureDeploymentStage();
    
-   protected abstract ClusterConfigMetaData getClusteredBeanClusterConfig(JBossEnterpriseBeanMetaData bmd);
-
+   protected ClusterConfigMetaData getClusteredBeanClusterConfig(JBossEnterpriseBeanMetaData bmd)
+   {
+      if (bmd instanceof JBossSessionBeanMetaData)
+      {
+         JBossSessionBeanMetaData sbmd = (JBossSessionBeanMetaData) bmd;
+         if (sbmd.isClustered())
+         {
+            return sbmd.getClusterConfig();
+         }               
+      }
+      else if (bmd instanceof JBossEntityBeanMetaData)
+      {
+         JBossEntityBeanMetaData ebmd = (JBossEntityBeanMetaData) bmd;
+         if (ebmd.isClustered())
+         {
+            return ebmd.getClusterConfig();
+         }               
+      }
+      return null;
+   }
+   
+   // ----------------------------------------------------------------  Private
+   
    private void addHAPartitionDependency(JBossEnterpriseBeanMetaData bmd, ClusterConfigMetaData ccmd)
    {
       String dependencyName = getHaPartitionDependencyCreator().getHAPartitionDependencyName(ccmd.getPartitionName());

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/deployers/Ejb2HAPartitionDependencyDeployer.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/deployers/Ejb2HAPartitionDependencyDeployer.java	2009-04-16 21:48:34 UTC (rev 87461)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/deployers/Ejb2HAPartitionDependencyDeployer.java	2009-04-16 21:51:46 UTC (rev 87462)
@@ -24,11 +24,7 @@
 
 
 import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.metadata.ejb.jboss.ClusterConfigMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 
 /**
  * Adds a dependency on the HAPartition to any JBossSessionBeanMetaData
@@ -60,25 +56,4 @@
    {
       setStage(DeploymentStages.PRE_DESCRIBE);
    }
-   
-   protected ClusterConfigMetaData getClusteredBeanClusterConfig(JBossEnterpriseBeanMetaData bmd)
-   {
-      if (bmd instanceof JBossSessionBeanMetaData)
-      {
-         JBossSessionBeanMetaData sbmd = (JBossSessionBeanMetaData) bmd;
-         if (sbmd.isClustered())
-         {
-            return sbmd.getClusterConfig();
-         }               
-      }
-      else if (bmd instanceof JBossEntityBeanMetaData)
-      {
-         JBossEntityBeanMetaData ebmd = (JBossEntityBeanMetaData) bmd;
-         if (ebmd.isClustered())
-         {
-            return ebmd.getClusterConfig();
-         }               
-      }
-      return null;
-   }
 }

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/deployers/Ejb3HAPartitionDependencyDeployer.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/deployers/Ejb3HAPartitionDependencyDeployer.java	2009-04-16 21:48:34 UTC (rev 87461)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/deployers/Ejb3HAPartitionDependencyDeployer.java	2009-04-16 21:51:46 UTC (rev 87462)
@@ -23,11 +23,7 @@
 package org.jboss.ha.framework.server.deployers;
 
 import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.metadata.ejb.jboss.ClusterConfigMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 
 /**
  * @author Brian Stansberry
@@ -60,25 +56,5 @@
    {
       setStage(DeploymentStages.PRE_REAL);
    }
-
-   /**
-    * FIXME: use superclass behavior when JBMETA-100 is fixed.
-    */
-   @Override
-   protected ClusterConfigMetaData getClusteredBeanClusterConfig(JBossEnterpriseBeanMetaData bmd)
-   {
-      if (bmd instanceof JBossSessionBeanMetaData)
-      {
-         JBossSessionBeanMetaData sbmd = (JBossSessionBeanMetaData) bmd;
-         return sbmd.getClusterConfig();                        
-      }
-      else if (bmd instanceof JBossEntityBeanMetaData)
-      {
-         JBossEntityBeanMetaData ebmd = (JBossEntityBeanMetaData) bmd;
-         return ebmd.getClusterConfig();                        
-      }
-      return null;
-   }
-
    
 }