[jboss-cvs] JBossAS SVN: r107644 - in branches/weld-ejb3-int: weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb and 1 other directory.

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

Author: pete.muir at jboss.org
Date: 2010-08-17 10:08:01 -0400 (Tue, 17 Aug 2010)
New Revision: 107644

Modified:
   branches/weld-ejb3-int/component-matrix/pom.xml
   branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossMessageDrivenBeanDescriptorAdaptor.java
   branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossSessionBeanDescriptorAdaptor.java
Log:
update to latest Weld 1.1 SPI

Modified: branches/weld-ejb3-int/component-matrix/pom.xml
===================================================================
--- branches/weld-ejb3-int/component-matrix/pom.xml	2010-08-17 13:39:59 UTC (rev 107643)
+++ branches/weld-ejb3-int/component-matrix/pom.xml	2010-08-17 14:08:01 UTC (rev 107644)
@@ -246,7 +246,7 @@
        <dependency>
         <groupId>org.jboss.weld</groupId>
         <artifactId>weld-spi</artifactId>
-        <version>${version.weld.api}</version>
+        <version>1.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>

Modified: branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossMessageDrivenBeanDescriptorAdaptor.java
===================================================================
--- branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossMessageDrivenBeanDescriptorAdaptor.java	2010-08-17 13:39:59 UTC (rev 107643)
+++ branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossMessageDrivenBeanDescriptorAdaptor.java	2010-08-17 14:08:01 UTC (rev 107644)
@@ -20,6 +20,12 @@
       // Not relevant for MDBs
       return null;
    }
+   
+   public Collection<BusinessInterfaceDescriptor<?>> getRemoteBusinessInterfaces()
+   {
+      // Not relevant for MDBs
+      return null;
+   }
 
    public Collection<Method> getRemoveMethods()
    {

Modified: branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossSessionBeanDescriptorAdaptor.java
===================================================================
--- branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossSessionBeanDescriptorAdaptor.java	2010-08-17 13:39:59 UTC (rev 107643)
+++ branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossSessionBeanDescriptorAdaptor.java	2010-08-17 14:08:01 UTC (rev 107644)
@@ -19,6 +19,7 @@
    private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
 
    private final List<BusinessInterfaceDescriptor<?>> localBusinessInterfaces;
+   private final List<BusinessInterfaceDescriptor<?>> remoteBusinessInterfaces;
    private final List<Method> removeMethods;
    private final boolean stateful;
    private final boolean stateless;
@@ -35,6 +36,7 @@
    {
       super(sessionBeanMetaData, deploymentUnit, resolver);
       this.localBusinessInterfaces = new ArrayList<BusinessInterfaceDescriptor<?>>();
+      this.remoteBusinessInterfaces = new ArrayList<BusinessInterfaceDescriptor<?>>();
       if (sessionBeanMetaData.getBusinessLocals() != null)
       {
          for (String interfaceName : sessionBeanMetaData.getBusinessLocals())
@@ -42,6 +44,13 @@
             this.localBusinessInterfaces.add(new JBossBussinessInterfaceDescriptorAdaptor<Object>(interfaceName, getEjbName(), deploymentUnit, resolver));
          }
       }
+      if (sessionBeanMetaData.getBusinessRemotes() != null)
+      {
+         for (String interfaceName : sessionBeanMetaData.getBusinessRemotes())
+         {
+            this.localBusinessInterfaces.add(new JBossBussinessInterfaceDescriptorAdaptor<Object>(interfaceName, getEjbName(), deploymentUnit, resolver));
+         }
+      }
 
       this.removeMethods = new ArrayList<Method>();
 
@@ -91,6 +100,11 @@
    {
       return localBusinessInterfaces;
    }
+   
+   public Collection<BusinessInterfaceDescriptor<?>> getRemoteBusinessInterfaces()
+   {
+      return remoteBusinessInterfaces;
+   }
 
    public Collection<Method> getRemoveMethods()
    {