[seam-commits] Seam SVN: r9699 - trunk/src/main/org/jboss/seam/deployment.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-12-03 04:03:13 -0500 (Wed, 03 Dec 2008)
New Revision: 9699

Modified:
   trunk/src/main/org/jboss/seam/deployment/AbstractScanner.java
   trunk/src/main/org/jboss/seam/deployment/Scanner.java
   trunk/src/main/org/jboss/seam/deployment/URLScanner.java
   trunk/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java
Log:
JBSEAM-3722 (excluded dirs)

Modified: trunk/src/main/org/jboss/seam/deployment/AbstractScanner.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/AbstractScanner.java	2008-12-02 15:35:28 UTC (rev 9698)
+++ trunk/src/main/org/jboss/seam/deployment/AbstractScanner.java	2008-12-03 09:03:13 UTC (rev 9699)
@@ -1,6 +1,7 @@
 package org.jboss.seam.deployment;
 
 import java.io.DataInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.annotation.Annotation;
@@ -206,5 +207,10 @@
    {
       return new Handler(name, deploymentStrategy.getDeploymentHandlers().entrySet(), deploymentStrategy.getClassLoader()).handle();
    }
+   
+   public void scanDirectories(File[] directories, File[] excludedDirectories)
+   {
+      scanDirectories(directories);
+   }
 
 }

Modified: trunk/src/main/org/jboss/seam/deployment/Scanner.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/Scanner.java	2008-12-02 15:35:28 UTC (rev 9698)
+++ trunk/src/main/org/jboss/seam/deployment/Scanner.java	2008-12-03 09:03:13 UTC (rev 9699)
@@ -17,11 +17,18 @@
     * Recursively scan directories, skipping directories in the exclusion list.
     * 
     * @param directories An array of the roots of the directory trees to scan
-    * @param excludedDirectories Directories to skip over during the recursive scan
     */
    public void scanDirectories(File[] directories);
    
    /**
+    * Recursively scan directories, skipping directories in the exclusion list.
+    * 
+    * @param directories An array of the roots of the directory trees to scan
+    * @param excludedDirectories Directories to skip over during the recursive scan
+    */
+   public void scanDirectories(File[] directories, File[] excludedDirectories);
+   
+   /**
     * Scan for structures which contain any of the given resources in their root
     * 
     * @param resources The resources to scan for

Modified: trunk/src/main/org/jboss/seam/deployment/URLScanner.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/URLScanner.java	2008-12-02 15:35:28 UTC (rev 9698)
+++ trunk/src/main/org/jboss/seam/deployment/URLScanner.java	2008-12-03 09:03:13 UTC (rev 9699)
@@ -40,7 +40,8 @@
       scanDirectories(directories, new File[0]);
    }
    
-   public void scanDirectories(File[] directories, File... excludedDirectories)
+   @Override
+   public void scanDirectories(File[] directories, File[] excludedDirectories)
    {
       for (File directory : directories)
       {

Modified: trunk/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java	2008-12-02 15:35:28 UTC (rev 9698)
+++ trunk/src/main/org/jboss/seam/deployment/WarRootDeploymentStrategy.java	2008-12-03 09:03:13 UTC (rev 9699)
@@ -69,7 +69,7 @@
    @Override
    public void scan()
    {
-      getScanner().scanDirectories(warRoot/*, excludedDirectories*/);
+      getScanner().scanDirectories(warRoot, excludedDirectories);
       postScan();
    }