[jboss-cvs] JBossAS SVN: r76757 - projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3.

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

Author: wolfc
Date: 2008-08-07 07:58:13 -0400 (Thu, 07 Aug 2008)
New Revision: 76757

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java
Log:
EJBTHREE-1448: do not scan for annotated classes if metadata complete is true

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java	2008-08-07 10:17:14 UTC (rev 76756)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java	2008-08-07 11:58:13 UTC (rev 76757)
@@ -586,24 +586,30 @@
 
    protected void deploy() throws Exception
    {
-      Ejb3HandlerFactory factory = Ejb3HandlerFactory.getInstance(this);
-      if (unit.getUrl() != null)
-         deployUrl(factory);
-
-      if (unit.getClasses() != null)
+      if(metaData == null || !metaData.isMetadataComplete())
       {
-         for (Class explicit : unit.getClasses())
+         Ejb3HandlerFactory factory = Ejb3HandlerFactory.getInstance(this);
+         // Scan and deploy
+         if (unit.getUrl() != null)
+            deployUrl(factory);
+   
+         // Deploy any classes that have been explicitly marked
+         if (unit.getClasses() != null)
          {
-            if (explicit.isAnnotationPresent(Entity.class))
+            for (Class explicit : unit.getClasses())
             {
-               continue;
+               if (explicit.isAnnotationPresent(Entity.class))
+               {
+                  continue;
+               }
+               String name = explicit.getName().replace('.', '/') + ".class";
+               InputStream stream = explicit.getClassLoader().getResourceAsStream(name);
+               deployElement(stream, factory, initialContext);
             }
-            String name = explicit.getName().replace('.', '/') + ".class";
-            InputStream stream = explicit.getClassLoader().getResourceAsStream(name);
-            deployElement(stream, factory, initialContext);
          }
       }
 
+      // Deploy the beans from the descriptor
       deployBeansFromLib(initialContext);
    }