[jboss-cvs] JBossAS SVN: r78703 - projects/demos/microcontainer/trunk/jmx/src/main/java/org/jboss/demos/deployers/legacy.

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

Author: alesj
Date: 2008-09-19 06:30:09 -0400 (Fri, 19 Sep 2008)
New Revision: 78703

Modified:
   projects/demos/microcontainer/trunk/jmx/src/main/java/org/jboss/demos/deployers/legacy/DirectoryStructure.java
Log:
[JBAS-5900]; removing recognision of directory, only its children could be recognized.

Modified: projects/demos/microcontainer/trunk/jmx/src/main/java/org/jboss/demos/deployers/legacy/DirectoryStructure.java
===================================================================
--- projects/demos/microcontainer/trunk/jmx/src/main/java/org/jboss/demos/deployers/legacy/DirectoryStructure.java	2008-09-19 10:19:14 UTC (rev 78702)
+++ projects/demos/microcontainer/trunk/jmx/src/main/java/org/jboss/demos/deployers/legacy/DirectoryStructure.java	2008-09-19 10:30:09 UTC (rev 78703)
@@ -21,10 +21,9 @@
 */
 package org.jboss.demos.deployers.legacy;
 
+import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer;
 import org.jboss.deployers.vfs.spi.structure.StructureContext;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.virtual.VirtualFile;
 
 /**
  * Legacy directory structure.
@@ -45,15 +44,9 @@
       try
       {
          // jar structure should already handle top level dirs
-         if (context.isTopLevel() == false)
+         if (context.isTopLevel() == false && isLeaf(context.getFile()) == false)
          {
-            VirtualFile file = context.getFile();
-            // only simple directories, non-leaves with META-INF are handled by jar structure
-            if (isLeaf(file) == false)
-            {
-               addAllChildren(context);
-               return true;
-            }
+            addAllChildren(context);
          }
          return false;
       }