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

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

Author: scott.stark at jboss.org
Date: 2007-11-27 02:18:46 -0500 (Tue, 27 Nov 2007)
New Revision: 67481

Modified:
   trunk/server/src/main/org/jboss/deployment/AnnotatedClassFilter.java
   trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
Log:
Update the annotation identification

Modified: trunk/server/src/main/org/jboss/deployment/AnnotatedClassFilter.java
===================================================================
(Binary files differ)


Property changes on: trunk/server/src/main/org/jboss/deployment/AnnotatedClassFilter.java
___________________________________________________________________
Name: svn:mime-type
   + Id Revision

Modified: trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2007-11-27 07:17:49 UTC (rev 67480)
+++ trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java	2007-11-27 07:18:46 UTC (rev 67481)
@@ -22,8 +22,9 @@
 package org.jboss.deployment;
 
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
@@ -37,7 +38,7 @@
  * annotations
  * 
  * @author Scott.Stark at jboss.org
- * @version $Revision:$
+ * @version $Revision$
  */
 public class AnnotationMetaDataDeployer extends AbstractDeployer
 {
@@ -91,23 +92,26 @@
       if(classpath == null)
          return;
 
-      AnnotatedClassFilter classVisitor = new AnnotatedClassFilter(loader, classpath);
+      
       try
       {
-         ArrayList<VirtualFile> classpathClasses = new ArrayList<VirtualFile>();
+         Map<VirtualFile, Class<?>> classpathClasses = new HashMap<VirtualFile, Class<?>>();
          for(VirtualFile path : classpath)
          {
-            List<VirtualFile> classes = path.getChildren(classVisitor);
+            AnnotatedClassFilter classVisitor = new AnnotatedClassFilter(unit, loader, path);
+            path.visit(classVisitor);
+            Map<VirtualFile, Class<?>> classes = classVisitor.getAnnotatedClasses();
             if(classes != null && classes.size() > 0)
             {
                log.info("Annotated classes: "+classes);
-               classpathClasses.addAll(classes);
+               classpathClasses.putAll(classes);
             }
          }
+         // Create the metadata model...
       }
       catch(IOException e)
       {
-         e.printStackTrace();
+         throw new DeploymentException(e);
       }
    }
 


Property changes on: trunk/server/src/main/org/jboss/deployment/AnnotationMetaDataDeployer.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision