[jboss-cvs] JBossAS SVN: r57257 - trunk/system/src/main/org/jboss/system/server/profileservice

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

Author: adrian at jboss.org
Date: 2006-09-28 05:54:31 -0400 (Thu, 28 Sep 2006)
New Revision: 57257

Modified:
   trunk/system/src/main/org/jboss/system/server/profileservice/VFSScanner.java
Log:
Update the VFSScanner to the new isLeaf()

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/VFSScanner.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/VFSScanner.java	2006-09-28 09:49:20 UTC (rev 57256)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/VFSScanner.java	2006-09-28 09:54:31 UTC (rev 57257)
@@ -365,12 +365,12 @@
          for (Iterator i = vdfList.iterator(); i.hasNext();)
          {
             VirtualFile component = (VirtualFile)i.next();
-            if (component.isFile())
+            if (component.isLeaf())
             {
                // treat this as a deployable unit
                toDeployList.add(component);
             }
-            else if (component.isDirectory())
+            else
             {
                // process (possibly recursively) the dir
                addDeployments(toDeployList, component);
@@ -527,7 +527,7 @@
       
       for (VirtualFile component : components)
       {
-         if (component.isFile())
+         if (component.isLeaf())
          {
             // the first arg in filter.accept is not used!
             if (filter == null || filter.accept(null, component.getName()))
@@ -535,18 +535,16 @@
                list.add(component);
             }            
          }
-         else if (component.isDirectory())
+         // TODO replace . in the name with isArchive() == false?
+         else if (component.getName().indexOf('.') == -1 && this.doRecursiveSearch)
          {
-            if (component.getName().indexOf('.') == -1 && this.doRecursiveSearch)
-            {
-               // recurse if not '.' in name and recursive search is enabled
-               addDeployments(list, component);
-            }
-            else
-            {
-               list.add(component);
-            }
+            // recurse if not '.' in name and recursive search is enabled
+            addDeployments(list, component);
          }
+         else
+         {
+            list.add(component);
+         }
       }
    }