[jboss-cvs] JBossAS SVN: r78957 - trunk/ejb3/src/main/org/jboss/ejb3/deployers.

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

Author: wolfc
Date: 2008-09-30 11:02:06 -0400 (Tue, 30 Sep 2008)
New Revision: 78957

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
Log:
JBAS-6007: return null if the scope is not of an ear

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2008-09-30 14:31:34 UTC (rev 78956)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2008-09-30 15:02:06 UTC (rev 78957)
@@ -32,11 +32,11 @@
 import org.jboss.deployment.dependency.ContainerDependencyMetaData;
 import org.jboss.ejb3.Container;
 import org.jboss.ejb3.DependencyPolicy;
-import org.jboss.ejb3.DeploymentScope;
 import org.jboss.ejb3.DeploymentUnit;
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.Ejb3Deployment;
 import org.jboss.ejb3.MCDependencyPolicy;
+import org.jboss.ejb3.javaee.JavaEEApplication;
 import org.jboss.ejb3.javaee.JavaEEComponent;
 import org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin;
 import org.jboss.kernel.Kernel;
@@ -60,7 +60,7 @@
    private org.jboss.deployers.structure.spi.DeploymentUnit jbossUnit;
    private Map<String, ContainerDependencyMetaData> endpoints;
 
-   public Ejb3JBoss5Deployment(DeploymentUnit ejb3Unit, Kernel kernel, MBeanServer mbeanServer, org.jboss.deployers.structure.spi.DeploymentUnit jbossUnit, DeploymentScope deploymentScope, JBossMetaData metaData, PersistenceMetaData persistenceUnitsMetaData)
+   public Ejb3JBoss5Deployment(DeploymentUnit ejb3Unit, Kernel kernel, MBeanServer mbeanServer, org.jboss.deployers.structure.spi.DeploymentUnit jbossUnit, JBoss5DeploymentScope deploymentScope, JBossMetaData metaData, PersistenceMetaData persistenceUnitsMetaData)
    {
       // Either call the old constructor and do process persistence units
       //super(ejb3Unit, deploymentScope, metaData, persistenceUnitsMetaData);
@@ -95,6 +95,16 @@
    }
 
    @Override
+   public JavaEEApplication getApplication()
+   {
+      // getApplication must return null if there is no ear
+      JavaEEApplication app = super.getApplication();
+      if(((JBoss5DeploymentScope) app).isEar())
+         return app;
+      return null;
+   }
+   
+   @Override
    protected void registerEJBContainer(Container container) throws Exception
    {
       // Add the jndi supplies

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java	2008-09-30 14:31:34 UTC (rev 78956)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java	2008-09-30 15:02:06 UTC (rev 78957)
@@ -59,10 +59,13 @@
    private String shortName;
    /** The deployment short name minus any .suffix */
    private String baseName;
+   
+   private boolean isEar;
 
    @SuppressWarnings("unchecked")
    public JBoss5DeploymentScope(VFSDeploymentUnit parent, boolean isEar)
    {
+      this.isEar = isEar;
       this.shortName = parent.getSimpleName();
       baseName = null;
       if(isEar)
@@ -244,4 +247,8 @@
       return baseName;
    }
 
+   protected boolean isEar()
+   {
+      return isEar;
+   }
 }