[jboss-cvs] JBossAS SVN: r67930 - trunk/server/src/main/org/jboss/deployment.

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

Author: scott.stark at jboss.org
Date: 2007-12-05 04:26:14 -0500 (Wed, 05 Dec 2007)
New Revision: 67930

Modified:
   trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java
Log:
Add more info to dump

Modified: trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java	2007-12-05 07:55:38 UTC (rev 67929)
+++ trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java	2007-12-05 09:26:14 UTC (rev 67930)
@@ -39,6 +39,9 @@
 import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
+import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
+import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
 import org.jboss.metadata.javaee.spec.EJBLocalReferenceMetaData;
 import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
 import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
@@ -56,6 +59,9 @@
 public class ReferenceMetaDataResolverDeployer extends AbstractRealDeployer
 {
    private static Logger log = Logger.getLogger(ReferenceMetaDataResolverDeployer.class);
+   /** */
+   private boolean failOnUnresolvedRefs;
+
    /**
     * A map of vfs paths to reference endpoint mappedNames
     */
@@ -92,11 +98,14 @@
       if(ejbMetaData == null && webMetaData == null && clientMetaData == null)
          return;
 
+      // Create a map of the ejbs
       dump(unit);
       if(ejbMetaData != null)
       {
+         JBossEnterpriseBeansMetaData beans = ejbMetaData.getEnterpriseBeans();
+         // Map the ejbs
+         this.mapEjbs(unit.getRelativePath(), beans);
          // Process ejb references
-         JBossEnterpriseBeansMetaData beans = ejbMetaData.getEnterpriseBeans();
          List<String> unresolvedPaths = resolve(unit, beans);
          if(unresolvedPaths != null && unresolvedPaths.size() > 0)
             log.warn("Unresolved references exist in JBossMetaData: "+unresolvedPaths);
@@ -128,6 +137,26 @@
          String mappedName = bean.getMappedName();
          if(mappedName != null)
             mappedNameMap.put(ejbPath, mappedName);
+         if(bean instanceof JBossSessionBeanMetaData)
+         {
+            JBossSessionBeanMetaData sbean = (JBossSessionBeanMetaData) bean;
+            BusinessLocalsMetaData locals = sbean.getBusinessLocals();
+            if(locals != null)
+            {
+               for(String local : locals)
+               {
+                  // TODO: what is the correct key name
+               }
+            }
+            BusinessRemotesMetaData remotes = sbean.getBusinessRemotes();
+            if(remotes != null)
+            {
+               for(String remote : remotes)
+               {
+                  // TODO: what is the correct key name                  
+               }
+            }
+         }
       }
    }
 
@@ -137,6 +166,8 @@
          return null;
 
       ArrayList<String> unresolvedRefs = new ArrayList<String>();
+      AnnotatedEJBReferencesMetaData annotatedRefs = env.getAnnotatedEjbReferences();
+      
       EJBLocalReferencesMetaData localRefs = env.getEjbLocalReferences();
       resolveEjbLocalRefs(unit, localRefs, unresolvedRefs);
       EJBReferencesMetaData ejbRefs = env.getEjbReferences();
@@ -189,6 +220,7 @@
             String target = null;
             if(link != null)
                target = findEjbLink(unit, link, searched);
+            else if(ref.getType() != null)
             if(target == null)
                unresolvedRefs.add(ref.getEjbRefName()+"/ejb-ref/"+link + " available: " + searched);
             else
@@ -559,6 +591,50 @@
       for(int n = 0; n < depth; n ++)
          tmp.append('+');
       tmp.append(unit.getRelativePath());
+      JBossMetaData metaData = unit.getAttachment(JBossMetaData.class);
+      if(metaData != null)
+      {
+         JBossEnterpriseBeansMetaData beans = metaData.getEnterpriseBeans();
+         if(beans != null)
+         {
+            for(JBossEnterpriseBeanMetaData bean : beans)
+            {
+               tmp.append(",ejbName=");
+               tmp.append(bean.getEjbName());
+               if(bean.getEjbClass() != null)
+               {
+                  tmp.append(",ejbClass=");
+                  tmp.append(bean.getEjbClass());
+               }
+               if(bean instanceof JBossSessionBeanMetaData)
+               {
+                  JBossSessionBeanMetaData sbean = (JBossSessionBeanMetaData) bean;
+                  if(sbean.getHome() != null)
+                  {
+                     tmp.append(",home=");
+                     tmp.append(sbean.getHome());
+                  }
+                  if(sbean.getRemote() != null)
+                  {
+                     tmp.append(",remote=");
+                     tmp.append(sbean.getRemote());
+                  }
+                  BusinessLocalsMetaData locals = sbean.getBusinessLocals();
+                  if(locals != null)
+                  {
+                     tmp.append(",BusinessLocals: ");
+                     tmp.append(locals);
+                  }
+                  BusinessRemotesMetaData remotes = sbean.getBusinessRemotes();
+                  if(remotes != null)
+                  {
+                     tmp.append(",BusinessRemotes: ");
+                     tmp.append(remotes);
+                  }
+               }               
+            }
+         }
+      }
       tmp.append('\n');
       List<DeploymentUnit> children = unit.getChildren();
       if(children != null)