[webbeans-commits] Webbeans SVN: r3544 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env and 2 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Mon Aug 17 18:38:44 EDT 2009


Author: pete.muir at jboss.org
Date: 2009-08-17 18:38:44 -0400 (Mon, 17 Aug 2009)
New Revision: 3544

Added:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Bean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java
Removed:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjb.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjbBean.java
Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Monitor.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/ResourceProducer.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ResourceProducer.java
   tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Remove some pointless tests
Split out assertions

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Bean.java (from rev 3542, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjbBean.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Bean.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Bean.java	2009-08-17 22:38:44 UTC (rev 3544)
@@ -0,0 +1,61 @@
+package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
+
+import javax.annotation.PreDestroy;
+import javax.annotation.Resource;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
+import javax.enterprise.inject.Current;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
+
+public
+ at Stateful
+ at TransactionManagement(TransactionManagementType.BEAN)
+class Bean implements BeanLocal
+{
+   private int knocks = 0;
+   
+   private @Current Monitor monitor;
+   
+   private @Resource UserTransaction transaction;
+   
+   public String knockKnock()
+   {
+      knocks++;
+      return "We're home";
+   }
+   
+   public int getKnocks()
+   {
+      return knocks;
+   }
+   
+   public boolean isUserTransactionInjected()
+   {
+      try
+      {
+         if (transaction != null)
+         {
+            transaction.getStatus();
+            return true;
+         }
+      }
+      catch (SystemException e)
+      {
+      }
+      return false;
+   }
+
+   @PreDestroy 
+   public void cleanup()
+   {
+      monitor.remoteEjbDestroyed();
+   }
+
+   @Remove
+   public void dispose()
+   {
+   }
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Bean.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java (from rev 3542, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjb.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java	2009-08-17 22:38:44 UTC (rev 3544)
@@ -0,0 +1,18 @@
+package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
+
+import javax.ejb.Local;
+import javax.ejb.Remote;
+
+ at Local
+public interface BeanLocal extends AnotherInterface
+{
+   public String knockKnock();
+   
+   public int getKnocks();
+   
+   public boolean isUserTransactionInjected();
+   
+   public void cleanup();
+   
+   public void dispose();
+}


Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java	2009-08-17 21:20:50 UTC (rev 3543)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java	2009-08-17 22:38:44 UTC (rev 3544)
@@ -17,12 +17,7 @@
 
 package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -60,42 +55,5 @@
       assert instance.getMyEjb() != null : "EJB reference was not produced and injected into bean";
       assert instance.getMyEjb().knockKnock().equals("We're home");
    }
-   
-   // Marked as review because I think the EJB proxy should have the AnotherInterface interface
-   // also, need to verify that the instance is passivation capable
-   @Test(groups = { "beanLifecycle", "commonsAnnotations", "integration", "rewrite" })
-   @SpecAssertions({
-      @SpecAssertion(section = "7.3.6", id = "l"),
-      @SpecAssertion(section = "7.3.6", id = "m"),
-      @SpecAssertion(section = "7.3.6", id = "o")
-   })
-   public void testProduceEjbProxyWithContainerInjections()
-   {
-      Bean<RemoteEjb> remoteEjbBean = getBeans(RemoteEjb.class, new AnnotationLiteral<Lazy>(){}).iterator().next();
-      CreationalContext<RemoteEjb> remoteEjbCc = getCurrentManager().createCreationalContext(remoteEjbBean);
-      RemoteEjb instance = remoteEjbBean.create(remoteEjbCc);
-      assert instance != null;
 
-      instance.knockKnock();
-      assert instance.getKnocks() == 1;
-      
-      //assert getCurrentConfiguration().getBeans().isProxy(instance);
-      Set<Class> interfaces = new HashSet<Class>(Arrays.asList(instance.getClass().getInterfaces()));
-      assert interfaces.contains(RemoteEjb.class);
-      //assert interfaces.contains(AnotherInterface.class);
-   }
-   
-   @Test(groups = { "beanLifecycle", "commonsAnnotations", "integration" })
-   @SpecAssertion(section = "7.3.6", id = "na")
-   public void testRemoveProducedEjbProxy()
-   {
-      Monitor monitor = getInstanceByType(Monitor.class);
-      Bean<RemoteEjb> remoteEjbBean = getBeans(RemoteEjb.class).iterator().next();
-      CreationalContext<RemoteEjb> remoteEjbCc = getCurrentManager().createCreationalContext(remoteEjbBean);
-      RemoteEjb instance = remoteEjbBean.create(remoteEjbCc);
-      instance.knockKnock();
-      remoteEjbBean.destroy(instance, remoteEjbCc);
-      // QUESTION is this the right assertion?
-      assert !monitor.isRemoteEjbDestroyed();
-   }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java	2009-08-17 21:20:50 UTC (rev 3543)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java	2009-08-17 22:38:44 UTC (rev 3544)
@@ -3,9 +3,9 @@
 
 class ManagedBean
 {
-   private @Lazy RemoteEjb myEjb;
+   private @Lazy BeanLocal myEjb;
    
-   public RemoteEjb getMyEjb()
+   public BeanLocal getMyEjb()
    {
       return myEjb;
    }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Monitor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Monitor.java	2009-08-17 21:20:50 UTC (rev 3543)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Monitor.java	2009-08-17 22:38:44 UTC (rev 3544)
@@ -4,13 +4,14 @@
 
 import javax.enterprise.context.RequestScoped;
 
- at RequestScoped class Monitor implements Serializable
+ at RequestScoped 
+class Monitor implements Serializable
 {
    /**
 	 * 
 	 */
 	private static final long serialVersionUID = 4495864336368063408L;
-private boolean remoteEjbDestroyed = false;
+	private boolean remoteEjbDestroyed = false;
    
    public void remoteEjbDestroyed()
    {

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjb.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjb.java	2009-08-17 21:20:50 UTC (rev 3543)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjb.java	2009-08-17 22:38:44 UTC (rev 3544)
@@ -1,16 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
-
-import javax.ejb.Remote;
-
-public @Remote interface RemoteEjb extends AnotherInterface
-{
-   public String knockKnock();
-   
-   public int getKnocks();
-   
-   public boolean isUserTransactionInjected();
-   
-   public void cleanup();
-   
-   public void dispose();
-}

Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjbBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjbBean.java	2009-08-17 21:20:50 UTC (rev 3543)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/RemoteEjbBean.java	2009-08-17 22:38:44 UTC (rev 3544)
@@ -1,59 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
-
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.enterprise.inject.Current;
-import javax.transaction.SystemException;
-import javax.transaction.UserTransaction;
-
-public
- at Stateful
- at TransactionManagement(TransactionManagementType.BEAN)
-class RemoteEjbBean implements RemoteEjb
-{
-   private int knocks = 0;
-   
-   private @Current Monitor monitor;
-   
-   private @Resource UserTransaction transaction;
-   
-   public String knockKnock()
-   {
-      knocks++;
-      return "We're home";
-   }
-   
-   public int getKnocks()
-   {
-      return knocks;
-   }
-   
-   public boolean isUserTransactionInjected()
-   {
-      try
-      {
-         if (transaction != null)
-         {
-            transaction.getStatus();
-            return true;
-         }
-      }
-      catch (SystemException e)
-      {
-      }
-      return false;
-   }
-
-   public @PreDestroy void cleanup()
-   {
-      monitor.remoteEjbDestroyed();
-   }
-
-   public @Remove void dispose()
-   {
-   }
-}

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java	2009-08-17 21:20:50 UTC (rev 3543)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java	2009-08-17 22:38:44 UTC (rev 3544)
@@ -5,5 +5,5 @@
 
 class ResourceProducer
 {
-   private @Produces @EJB @Lazy RemoteEjb remoteEjb;
+   private @Produces @EJB @Lazy BeanLocal remoteEjb;
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java	2009-08-17 21:20:50 UTC (rev 3543)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java	2009-08-17 22:38:44 UTC (rev 3544)
@@ -20,10 +20,10 @@
 import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
 
+import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecAssertions;
 import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.IntegrationTest;
 import org.jboss.testharness.impl.packaging.Packaging;
@@ -58,8 +58,8 @@
    
    @Test(groups = { "beanLifecycle", "commonsAnnotations", "integration" })
    @SpecAssertions({
-      @SpecAssertion(section = "7.3.6", id = "l"),
-      @SpecAssertion(section = "7.3.6", id = "m"),
+      @SpecAssertion(section = "7.3.6", id = "la"),
+      @SpecAssertion(section = "7.3.6", id = "ma"),
       @SpecAssertion(section = "7.3.6", id = "o")
    })
    public void testProduceEnvProxy()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/ResourceProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/ResourceProducer.java	2009-08-17 21:20:50 UTC (rev 3543)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/ResourceProducer.java	2009-08-17 22:38:44 UTC (rev 3544)
@@ -5,5 +5,7 @@
 
 class ResourceProducer
 {
-   private @Produces @Resource(name = "greeting") @Greeting String greeting;
+   @Produces @Greeting
+   @Resource(name = "greeting")
+   private String greeting;
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java	2009-08-17 21:20:50 UTC (rev 3543)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java	2009-08-17 22:38:44 UTC (rev 3544)
@@ -5,10 +5,10 @@
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
+import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecAssertions;
 import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.IntegrationTest;
 import org.jboss.testharness.impl.packaging.Packaging;
@@ -36,8 +36,8 @@
    
    @Test(groups = { "beanLifecycle", "commonsAnnotations", "integration" })
    @SpecAssertions({
-      @SpecAssertion(section = "7.3.6", id = "l"),
-      @SpecAssertion(section = "7.3.6", id = "m"),
+      @SpecAssertion(section = "7.3.6", id = "la"),
+      @SpecAssertion(section = "7.3.6", id = "ma"),
       @SpecAssertion(section = "7.3.6", id = "o")
    })
    public void testProduceResourceProxy()

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ResourceProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ResourceProducer.java	2009-08-17 21:20:50 UTC (rev 3543)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ResourceProducer.java	2009-08-17 22:38:44 UTC (rev 3544)
@@ -6,5 +6,7 @@
 
 class ResourceProducer
 {
-   private @Produces @Another @Resource(mappedName = "java:app/BeanManager") BeanManager manager;
+   @Produces @Another 
+   @Resource(mappedName = "java:app/BeanManager") 
+   private BeanManager manager;
 }

Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml	2009-08-17 21:20:50 UTC (rev 3543)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml	2009-08-17 22:38:44 UTC (rev 3544)
@@ -3611,24 +3611,108 @@
   </section>
 
   <section id="7.3.6" title="Lifecycle of resources">
-    <assertion id="l">
+    <group>
       <text>When the |create()| method of a |Bean| object that represents a resource is called, the container creates and returns a container-specific internal reference to the Java EE component environment resource, entity manager, entity manager factory, remote EJB instance or web service reference. This reference is not directly exposed to the application.</text>
-    </assertion>
-
-    <assertion id="m">
+      
+      <assertion id="la">
+         <text>Check Java EE component environment resource</text>
+      </assertion>
+      
+      <assertion id="lb">
+         <text>Check Entity Manager</text>
+      </assertion>
+      
+      <assertion id="lc">
+         <text>Check Entity Manager Factory</text>
+      </assertion>
+      
+      <assertion id="ld">
+         <text>Check Remote EJB instance</text>
+      </assertion>
+      <assertion id="le">
+         <text>Check Web Service Reference</text>
+      </assertion>
+    </group>
+    
+    <group>
       <text>Before injecting or returning a contextual instance to the application, the container transforms its internal reference into an object that implements the bean types expected by the application and delegates method invocations to the underlying resource, entity manager, entity manager factory, remote EJB instance or web service reference. This object must be passivation capable.</text>
-    </assertion>
-
-    <assertion id="na">
+      
+      <assertion id="ma">
+         <text>Check delegations to underlying Java EE component environment resource</text> 
+      </assertion>
+      
+      <assertion id="mb">
+         <text>Check injected Java EE component environment resource is passivation capable</text> 
+      </assertion>
+      
+      <assertion id="mc">
+         <text>Check delegations to underlying Entity Manager</text>
+      </assertion>
+      
+      <assertion id="md">
+         <text>Check injected Entity Manager is passivation capable</text> 
+      </assertion>
+      
+      <assertion id="me">
+         <text>Check delegations to Entity Manager Factory</text>
+      </assertion>
+      
+      <assertion id="mf">
+         <text>Check injected Entity Manager Factory is passivation capable</text> 
+      </assertion>
+      
+      <assertion id="mg">
+         <text>Check delegations to underlying Remote EJB instance</text>
+      </assertion>
+      
+      <assertion id="mh">
+         <text>Check injected Remote EJB instance is passivation capable</text>
+      </assertion>
+      
+      <assertion id="mj">
+         <text>Check delegations to underlying Web Service Reference</text>
+      </assertion>
+      
+      <assertion id="mk">
+         <text>Check injected Web Service Reference is passivation capable</text> 
+      </assertion>
+    </group>
+    
+    <group>
       <text>When the |destroy()| method is called, the container discards this internal reference.  For certain kinds of resource, for example persistence contexts, the container eventually performs additional cleanup to destroy state associated with the client or transaction, as required by the Java EE platform specification.</text>
-    </assertion>
+      
+      <assertion id="na">
+         <text>Check Java EE component environment resource</text>
+      </assertion>
+      
+      <assertion id="nb">
+         <text>Check Entity Manager</text>
+      </assertion>
+      
+      <assertion id="nc">
+         <text>Check Entity Manager Factory</text>
+      </assertion>
+      
+      <assertion id="nd">
+         <text>Check Remote EJB instance</text>
+      </assertion>
+      
+      <assertion id="ne">
+         <text>Check Web Service Reference</text>
+      </assertion>
+    </group>
     
-    <assertion id="o">
+    <group>
       <text>The container must perform ordinary Java EE component environment injection upon any non-static field that functions as a resource declaration, as defined by the Java EE platform and Common Annotations for the Java platform specifications.</text>
-    </assertion>
+      <assertion id="o">
+         <text>Check @Resource injection</text>
+      </assertion>
+    </group>
     
+    
     <assertion id="p" testable="false">
       <text>The container is not required to perform Java EE component environment injection upon a static field. Portable applications should not rely upon the value of a static field that functions as a resource declaration.</text>
+      <note>Defines non-portable behavior</note>
     </assertion>
   </section>
 
@@ -5127,34 +5211,62 @@
       <text>Bean classes must be deployed in bean deployment archives.</text>
     </assertion>
     
-    <assertion id="ab">
-      <text>A library jar, EJB jar or rar archive is a bean deployment archive if it has a file named |beans.xml| in the |META-INF| directory.</text>
+    <assertion id="a" testable="false">
+      <text>A library jar, EJB jar or rar archive is a bean deployment archive if it has a file named |beans.xml| in the |META-INF| directory. The |WEB-INF/classes| directory of a war is a bean deployment archive if there is a file named |beans.xml| in the |WEBINF| directory of the war. A directory in the JVM classpath is a bean deployment archive if it has a file named |beans.xml| in the |META-INF| directory.</text>
+      <note>Covered by b* assertions</note>
     </assertion>
-    
-    <assertion id="ac">
-      <text>The |WEB-INF/classes| directory of a war is a bean deployment archive if there is a file named |beans.xml| in the |WEBINF| directory of the war.</text>
-    </assertion>
-    
-    <assertion id="ad">
-      <text>A directory in the JVM classpath is a bean deployment archive if it has a file named |beans.xml| in the |META-INF| directory.</text>
-    </assertion>
 
     <assertion id="ba">
       <text>The container searches for beans in bean deployment archives in the application classpath.</text>
+      <note>Check for a jar installed as a library</note>
     </assertion>
     
-    <assertion id="bb">
+    <group>
       <text>In an application deployed as an ear, the container searches every bean deployment archive belonging to the ear, including bean deployment archives contained inside wars. The bean deployment archives might be library jars, EJB jars, rars or war |WEB-INF/classes| directories.</text>
-    </assertion>
+      <assertion id="bba">
+         <text>Check an EJB jar in an EAR</text>
+      </assertion>
+      <assertion id="bbb">
+         <text>Check a library in an EAR</text>
+      </assertion>
+      <assertion id="bbc">
+         <text>Check a library in a WAR</text>
+      </assertion>
+      <assertion id="bbd">
+         <text>Check a rar</text>
+      </assertion>
+      <assertion id="bbe">
+         <text>Check a war in an ear</text>
+      </assertion>
+    </group>
     
-    <assertion id="bc">
+    <group>
       <text>In an application deployed as a war, the container searches every bean deployment archive contained in the war. The bean deployment archives might be library jars or the |WEB-INF/classes| directory.</text>
-    </assertion>
+      <assertion id="bca">
+         <text>Check classes in the war</text>
+      </assertion>
+      <assertion id="bca">
+         <text>Check libraries in the war</text>
+      </assertion>
+    </group>
     
-    <assertion id="bd">
+    <group>
       <text>An embeddable EJB container searches each bean deployment archive in the JVM classpath that is listed in the value of the embeddable container initialization property |javax.ejb.embeddable.modules|, or every bean deployment archive in the JVM classpath if the property is not specified. The bean deployment archives might be directories, library jars or EJB jars.</text>
-    </assertion>
+      <assertion id="bda">
+         <text>Check modules specified by |javax.ejb.embeddable.modules|</text>
+      </assertion>
+      <assertion id="bdb">
+         <text>Check libraries</text>
+      </assertion>
+      <assertion id="bdc">
+         <text>Check directories</text>
+      </assertion>
+      <assertion id="bda">
+         <text>Check ejb jars</text>
+      </assertion>
+    </group>   
     
+    
     <assertion id="be">
       <text>When searching for beans, the container considers any Java class in any bean deployment archive, and any |ejb-jar.xml| file in the metadata directory of any EJB bean deployment archive.</text>
     </assertion>




More information about the weld-commits mailing list