[weld-commits] Weld SVN: r5470 - in core/trunk: impl/src/main/java/org/jboss/weld/ejb and 5 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-01-14 17:54:30 -0500 (Thu, 14 Jan 2010)
New Revision: 5470

Added:
   core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/Cow.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/
   core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java
   core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/MilkMan.java
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/ejb/
   core/trunk/tests/src/test/resources/org/jboss/weld/tests/ejb/mdb/
Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java
   core/trunk/impl/src/main/java/org/jboss/weld/ejb/InternalEjbDescriptor.java
Log:
WELD-353

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java	2010-01-14 22:53:20 UTC (rev 5469)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java	2010-01-14 22:54:30 UTC (rev 5470)
@@ -112,7 +112,10 @@
       }
       for (InternalEjbDescriptor<?> ejbDescriptor : getEnvironment().getEjbDescriptors())
       {
-         createSessionBean(ejbDescriptor);
+         if (ejbDescriptor.isSingleton() || ejbDescriptor.isStateful() || ejbDescriptor.isStateless())
+         {
+            createSessionBean(ejbDescriptor);
+         }
       }
       
       // Now create the new beans

Modified: core/trunk/impl/src/main/java/org/jboss/weld/ejb/InternalEjbDescriptor.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/ejb/InternalEjbDescriptor.java	2010-01-14 22:53:20 UTC (rev 5469)
+++ core/trunk/impl/src/main/java/org/jboss/weld/ejb/InternalEjbDescriptor.java	2010-01-14 22:54:30 UTC (rev 5470)
@@ -19,7 +19,6 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 
 import org.jboss.weld.ejb.spi.BusinessInterfaceDescriptor;
 import org.jboss.weld.ejb.spi.EjbDescriptor;
@@ -45,19 +44,14 @@
    public InternalEjbDescriptor(EjbDescriptor<T> ejbDescriptor)
    {
       this.delegate = ejbDescriptor;
-      Iterator<BusinessInterfaceDescriptor<?>> it = ejbDescriptor.getLocalBusinessInterfaces().iterator();
-      if (it.hasNext())
-      {
-         this.objectInterface = it.next().getInterface();
-      }
-      else
-      {
-         this.objectInterface = null;
-      }
+      this.objectInterface = findObjectInterface(ejbDescriptor.getLocalBusinessInterfaces());
       removeMethodSignatures = new ArrayList<MethodSignature>();
-      for (Method method : delegate.getRemoveMethods())
+      if (ejbDescriptor.getRemoveMethods() != null)
       {
-         removeMethodSignatures.add(new MethodSignatureImpl(method));
+         for (Method method : ejbDescriptor.getRemoveMethods())
+         {
+            removeMethodSignatures.add(new MethodSignatureImpl(method));
+         }
       }
    }
    
@@ -77,4 +71,16 @@
       return removeMethodSignatures;
    }
    
+   private static Class<?> findObjectInterface(Collection<BusinessInterfaceDescriptor<?>> interfaces)
+   {
+      if (interfaces != null && !interfaces.isEmpty())
+      {
+         return interfaces.iterator().next().getInterface();
+      }
+      else
+      {
+         return null;
+      }
+   }
+   
 }

Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/Cow.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/Cow.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/Cow.java	2010-01-14 22:54:30 UTC (rev 5470)
@@ -0,0 +1,21 @@
+package org.jboss.weld.tests.ejb;
+
+import javax.ejb.Stateful;
+
+ at Stateful
+public class Cow
+{
+   
+   private boolean pinged;
+   
+   public boolean isPinged()
+   {
+      return pinged;
+   }
+   
+   public void ping()
+   {
+      pinged = true;
+   }
+
+}


Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/Cow.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java	2010-01-14 22:54:30 UTC (rev 5470)
@@ -0,0 +1,24 @@
+package org.jboss.weld.tests.ejb;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.EAR)
+ at IntegrationTest
+public class EJBTest extends AbstractWeldTest
+{
+   
+   @Test(groups="broken")
+   public void testNoInterface()
+   {
+      Cow cow = getReference(Cow.class);
+      cow.ping();
+      assert cow.isPinged();
+   }
+   
+}


Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/EJBTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java	2010-01-14 22:54:30 UTC (rev 5470)
@@ -0,0 +1,19 @@
+package org.jboss.weld.tests.ejb.mdb;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.EAR)
+public class EJBTest extends AbstractWeldTest
+{
+   
+   @Test
+   public void testMdbDeploys()
+   {
+   }
+   
+}


Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/EJBTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/MilkMan.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/MilkMan.java	                        (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/MilkMan.java	2010-01-14 22:54:30 UTC (rev 5470)
@@ -0,0 +1,20 @@
+package org.jboss.weld.tests.ejb.mdb;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+ at MessageDriven(activationConfig={
+      @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+      @ActivationConfigProperty(propertyName="destination",     propertyValue="queue/DLQ")
+  })
+public class MilkMan implements MessageListener
+{
+
+   public void onMessage(Message message)
+   {
+      
+   }
+
+}


Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/ejb/mdb/MilkMan.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native