Merge EjbModule -> BeanDeploymentArchive

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@3023 1c488680-804c-0410-94cd-c6b725194a0e
weld · Jul 7, 2009 · c02587b · c02587b
1 parent 46f9a14
commit c02587b
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 141 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java b/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
@@ -23,8 +23,8 @@
 import javax.enterprise.inject.spi.BeforeShutdown;
 import javax.enterprise.inject.spi.Extension;
 
-import org.jboss.webbeans.ContextualIdStore;
 import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.ContextualIdStore;
 import org.jboss.webbeans.CurrentManager;
 import org.jboss.webbeans.DefinitionException;
 import org.jboss.webbeans.DeploymentException;
@@ -53,7 +53,6 @@
 import org.jboss.webbeans.conversation.ServletConversationManager;
 import org.jboss.webbeans.ejb.EJBApiAbstraction;
 import org.jboss.webbeans.ejb.EjbDescriptorCache;
-import org.jboss.webbeans.ejb.spi.EJBModule;
 import org.jboss.webbeans.ejb.spi.EjbDescriptor;
 import org.jboss.webbeans.ejb.spi.EjbServices;
 import org.jboss.webbeans.jsf.JsfApiAbstraction;
@@ -120,13 +119,9 @@ private void visit(BeanDeploymentArchive beanDeploymentArchive)
          {
             beansXmlUrls.add(url);
          }
-         if (beanDeploymentArchive instanceof EJBModule)
+         for (EjbDescriptor<?> ejbDescriptor : beanDeploymentArchive.getEjbs())
          {
-            EJBModule ejbModule = (EJBModule) beanDeploymentArchive;
-            for (EjbDescriptor<?> ejbDescriptor : ejbModule.getEjbs())
-            {
-               ejbDescriptors.add(ejbDescriptor);
-            }
+            ejbDescriptors.add(ejbDescriptor);
          }
          for (BeanDeploymentArchive archive : beanDeploymentArchive.getBeanDeploymentArchives())
          {

diff --git a/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/BeanDeploymentArchive.java b/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/BeanDeploymentArchive.java
@@ -19,7 +19,7 @@
 import java.net.URL;
 import java.util.List;
 
-import org.jboss.webbeans.ejb.spi.EJBModule;
+import org.jboss.webbeans.ejb.spi.EjbDescriptor;
 
 /**
  * Represents a CDI bean deployment archive.
@@ -39,7 +39,6 @@
  * container could define a deployment archive with container specific metadata
  * to be a bean deployment archive).
  * 
- * @see EJBModule
  * @see Deployment
  * 
  * @author Pete Muir
@@ -80,4 +79,12 @@ public interface BeanDeploymentArchive
     */
    public Iterable<URL> getBeansXml();
 
+   /**
+    * Get all the EJBs in the deployment archive
+    * 
+    * @return an iteration of the EJBs, or empty if no EJBs are present or if
+    *         this is not an EJB archive
+    */
+   public Iterable<EjbDescriptor<?>> getEjbs();
+
 }
diff --git a/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/Deployment.java b/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/Deployment.java
@@ -19,7 +19,6 @@
 import java.util.List;
 
 import org.jboss.webbeans.bootstrap.api.Service;
-import org.jboss.webbeans.ejb.spi.EJBModule;
 
 /**
  * Represents a deployment of a CDI application.
@@ -45,7 +44,6 @@
  * TODO Java SE structure
  * 
  * @see BeanDeploymentArchive
- * @see EJBModule
  * 
  * @author Pete Muir
  * 

diff --git a/spi/src/main/java/org/jboss/webbeans/ejb/spi/EJBModule.java b/spi/src/main/java/org/jboss/webbeans/ejb/spi/EJBModule.java
diff --git a/tests/src/main/java/org/jboss/webbeans/mock/MockBeanDeploymentArchive.java b/tests/src/main/java/org/jboss/webbeans/mock/MockBeanDeploymentArchive.java
@@ -17,11 +17,19 @@
 package org.jboss.webbeans.mock;
 
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+
+import javax.ejb.MessageDriven;
+import javax.ejb.Singleton;
+import javax.ejb.Stateful;
+import javax.ejb.Stateless;
 
 import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.webbeans.ejb.spi.EjbDescriptor;
 
 /**
  * @author pmuir
@@ -45,11 +53,6 @@ public Iterable<URL> getBeansXml()
       return webBeansXmlFiles;
    }
 
-   public void setBeanClasses(Iterable<Class<?>> webBeanClasses)
-   {
-      this.beanClasses = webBeanClasses;
-   }
-
    public void setWebBeansXmlFiles(Iterable<URL> webBeansXmlFiles)
    {
       this.webBeansXmlFiles = webBeansXmlFiles;
@@ -59,5 +62,35 @@ public List<BeanDeploymentArchive> getBeanDeploymentArchives()
    {
       return Collections.emptyList();
    }
+
+   private List<EjbDescriptor<?>> ejbs;
+
+   public void setBeanClasses(Iterable<Class<?>> beanClasses)
+   {
+      this.beanClasses = beanClasses;
+      ejbs = new ArrayList<EjbDescriptor<?>>();
+      for (Class<?> ejbClass : discoverEjbs(getBeanClasses()))
+      {
+         ejbs.add(MockEjbDescriptor.of(ejbClass));
+      }
+   }
+
+   public Iterable<EjbDescriptor<?>> getEjbs()
+   {
+      return ejbs;
+   }
+
+   protected static Iterable<Class<?>> discoverEjbs(Iterable<Class<?>> webBeanClasses)
+   {
+      Set<Class<?>> ejbs = new HashSet<Class<?>>();
+      for (Class<?> clazz : webBeanClasses)
+      {
+         if (clazz.isAnnotationPresent(Stateless.class) || clazz.isAnnotationPresent(Stateful.class) || clazz.isAnnotationPresent(MessageDriven.class) || clazz.isAnnotationPresent(Singleton.class)) 
+         {
+            ejbs.add(clazz);
+         }
+      }
+      return ejbs;
+   }
 
 }
diff --git a/tests/src/main/java/org/jboss/webbeans/mock/MockDeployment.java b/tests/src/main/java/org/jboss/webbeans/mock/MockDeployment.java
@@ -25,15 +25,15 @@
 public class MockDeployment implements Deployment
 {
 
-   private MockEjbModule ejbModule;
+   private MockBeanDeploymentArchive archive;
 
    private List<BeanDeploymentArchive> beanDeploymentArchives;
 
    public MockDeployment()
    {
-      this.ejbModule = new MockEjbModule();
+      this.archive = new MockBeanDeploymentArchive();
       this.beanDeploymentArchives = new ArrayList<BeanDeploymentArchive>();
-      this.beanDeploymentArchives.add(ejbModule);
+      this.beanDeploymentArchives.add(archive);
    }
 
    public List<BeanDeploymentArchive> getBeanDeploymentArchives()
@@ -43,12 +43,12 @@ public List<BeanDeploymentArchive> getBeanDeploymentArchives()
 
    public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
    {
-      return ejbModule;
+      return archive;
    }
 
-   public MockEjbModule getEjbModule()
+   public MockBeanDeploymentArchive getArchive()
    {
-      return ejbModule;
+      return archive;
    }
 
 }
diff --git a/tests/src/main/java/org/jboss/webbeans/mock/MockEjbModule.java b/tests/src/main/java/org/jboss/webbeans/mock/MockEjbModule.java
diff --git a/tests/src/main/java/org/jboss/webbeans/test/harness/AbstractStandaloneContainersImpl.java b/tests/src/main/java/org/jboss/webbeans/test/harness/AbstractStandaloneContainersImpl.java
@@ -20,7 +20,7 @@ public boolean deploy(Iterable<Class<?>> classes, Iterable<URL> beansXml)
       lifecycle.initialize();
       try
       {
-         MockBeanDeploymentArchive archive = lifecycle.getDeployment().getEjbModule();
+         MockBeanDeploymentArchive archive = lifecycle.getDeployment().getArchive();
          archive.setBeanClasses(classes);
          if (beansXml != null)
          {

diff --git a/...c/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletEnvironmentTest.java b/...c/test/java/org/jboss/webbeans/test/unit/environments/servlet/ServletEnvironmentTest.java
@@ -28,7 +28,7 @@ public void beforeClass() throws Throwable
    {
       lifecycle = new MockServletLifecycle(); 
       lifecycle.initialize();
-      MockBeanDeploymentArchive archive = lifecycle.getDeployment().getEjbModule();
+      MockBeanDeploymentArchive archive = lifecycle.getDeployment().getArchive();
       archive.setBeanClasses(Arrays.asList(Animal.class, DeadlyAnimal.class, DeadlySpider.class, DeadlyAnimal.class, Hound.class, HoundLocal.class, Salmon.class, ScottishFish.class, SeaBass.class, Sole.class, Spider.class, Tarantula.class, TarantulaProducer.class, Tuna.class));
       lifecycle.beginApplication();
       lifecycle.beginSession();