[jboss-cvs] JBossAS SVN: r100213 - in projects/weld-int/trunk/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-02-01 11:04:47 -0500 (Mon, 01 Feb 2010)
New Revision: 100213

Modified:
   projects/weld-int/trunk/ejb/pom.xml
   projects/weld-int/trunk/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossEjbServices.java
Log:
Try to use no-interface views

Modified: projects/weld-int/trunk/ejb/pom.xml
===================================================================
--- projects/weld-int/trunk/ejb/pom.xml	2010-02-01 15:38:02 UTC (rev 100212)
+++ projects/weld-int/trunk/ejb/pom.xml	2010-02-01 16:04:47 UTC (rev 100213)
@@ -105,6 +105,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.metadata</groupId>
+      <artifactId>jboss-metadata-ejb</artifactId>
+    </dependency>
 
   </dependencies>  
 </project>

Modified: projects/weld-int/trunk/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossEjbServices.java
===================================================================
--- projects/weld-int/trunk/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossEjbServices.java	2010-02-01 15:38:02 UTC (rev 100212)
+++ projects/weld-int/trunk/ejb/src/main/java/org/jboss/weld/integration/ejb/JBossEjbServices.java	2010-02-01 16:04:47 UTC (rev 100213)
@@ -19,6 +19,7 @@
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.jboss.JBossSessionBean31MetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 import org.jboss.weld.ejb.api.SessionObjectReference;
 import org.jboss.weld.ejb.spi.EjbDescriptor;
@@ -161,10 +162,17 @@
       // Ensure it's an EJB3 DU (by looking for the processed metadata)
       if (du.getAttachment(AttachmentNames.PROCESSED_METADATA, JBossMetaData.class) != null && du.getAttachment(JBossMetaData.class).isEJB3x())
       {
-         for (JBossEnterpriseBeanMetaData enterpriseBeanMetaData : du.getAttachment(JBossMetaData.class).getEnterpriseBeans())
+         JBossMetaData jBossMetaData = du.getAttachment(JBossMetaData.class);
+         for (JBossEnterpriseBeanMetaData enterpriseBeanMetaData : jBossMetaData.getEnterpriseBeans())
          {
-            if (enterpriseBeanMetaData.isSession())
+            if (enterpriseBeanMetaData.isSession() && enterpriseBeanMetaData instanceof JBossSessionBean31MetaData)
             {
+               JBossSessionBean31MetaData sessionBeanMetaData = (JBossSessionBean31MetaData) enterpriseBeanMetaData;
+               EjbDescriptor<?> ejbDescriptor = new JBossSessionBean31DescriptorAdaptor<Object>(sessionBeanMetaData, du, resolver);
+               ejbs.add(ejbDescriptor);
+            }
+            else if (enterpriseBeanMetaData.isSession())
+            {
                JBossSessionBeanMetaData sessionBeanMetaData = (JBossSessionBeanMetaData) enterpriseBeanMetaData;
                EjbDescriptor<?> ejbDescriptor = new JBossSessionBeanDescriptorAdaptor<Object>(sessionBeanMetaData, du, resolver);
                ejbs.add(ejbDescriptor);
@@ -216,6 +224,7 @@
       return interceptorBindings.get(ejbDescriptor);
    }
 
+   @Override
    public void cleanup()
    {
       ejbContainerNames.clear();