[jboss-cvs] JBossAS SVN: r76465 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection.

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

Author: emuckenhuber
Date: 2008-07-30 06:44:59 -0400 (Wed, 30 Jul 2008)
New Revision: 76465

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebEJBRemoteHandler.java
Log:
[JBAS-5673] handle annotated ejb refs, still not used

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebEJBRemoteHandler.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebEJBRemoteHandler.java	2008-07-30 09:12:05 UTC (rev 76464)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebEJBRemoteHandler.java	2008-07-30 10:44:59 UTC (rev 76465)
@@ -82,10 +82,24 @@
       if (xml != null)
       {
          log.trace("ejbRefs = " + xml.getEjbReferences());
-         if (xml.getEjbReferences() != null) loadEjbRefXml(xml.getEjbReferences(), container);
+         if (xml.getAnnotatedEjbReferences() != null)
+            loadEjbRefXml(xml.getAnnotatedEjbReferences(), container);
+         if (xml.getEjbReferences() != null)
+            loadEjbRefXml(xml.getEjbReferences(), container);
       }
    }
+   
+   protected void loadEjbRefXml(AnnotatedEJBReferencesMetaData refs, InjectionContainer container)
+   {
+      for (AnnotatedEJBReferenceMetaData ref : refs)
+      {
+         String interfaceName = ref.getBeanInterface().getName();
+         String errorType = "@EJB";
 
+         ejbRefXml(ref, interfaceName, container, errorType);
+      }      
+   }
+
    protected void loadEjbRefXml(Collection<EJBReferenceMetaData> refs, InjectionContainer container)
    {
       for (EJBReferenceMetaData ref : refs)