[jboss-cvs] JBossAS SVN: r79707 - projects/aop/trunk/aop/src/main/org/jboss/aop/standalone.

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

Author: flavia.rainone at jboss.com
Date: 2008-10-19 01:24:55 -0400 (Sun, 19 Oct 2008)
New Revision: 79707

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/Compiler.java
Log:
[JBAOP-669] Now, Compiler supports to load directories as paths on report mode. This has been tested with aopc.sh script.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/Compiler.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/Compiler.java	2008-10-18 19:32:04 UTC (rev 79706)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/Compiler.java	2008-10-19 05:24:55 UTC (rev 79707)
@@ -199,7 +199,18 @@
          for (int i = 0; i < files.size(); i++)
          {
             File f = files.get(i);
-            loadFile(f);
+            if (f.isDirectory())
+            {
+               loadDirectory(f);
+            }
+            else if (classFileFilter.accept(f))
+            {
+               loadFile(f);
+            }
+            else
+            {
+               if (verbose) System.out.println("[aopc] " + f + " is neither a java class or a directory");
+            }
          }
          FileOutputStream reportFile = new FileOutputStream("aop-report.xml");
          reportFile.write(XmlReport.toXml().getBytes());
@@ -248,9 +259,22 @@
       {
           addDirectory(directories[i]);
       }
-      
    }
    
+   private void loadDirectory(File dir) throws Exception
+   {
+      File[] directories = dir.listFiles(directoryFilter);
+      File[] classFiles = dir.listFiles(classFileFilter);
+      for (int i = 0; i < classFiles.length; i++)
+      {
+         loadFile(classFiles[i]);
+      }
+      for (int i = 0; i < directories.length; i++)
+      {
+          loadDirectory(directories[i]);
+      }
+   }
+   
    private void addFile(File file)throws Exception
    {
       int index = file.getName().indexOf('$');