[jboss-cvs] JBossAS SVN: r57785 - projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/jar

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

Author: scott.stark at jboss.org
Date: 2006-10-23 19:25:56 -0400 (Mon, 23 Oct 2006)
New Revision: 57785

Modified:
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/jar/JARStructure.java
Log:
Use the JarUtils.isArchive in place of the vfs.isArchive to restore the previous behavior

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/jar/JARStructure.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/jar/JARStructure.java	2006-10-23 23:17:41 UTC (rev 57784)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/jar/JARStructure.java	2006-10-23 23:25:56 UTC (rev 57785)
@@ -76,23 +76,26 @@
          {
             // For non top level directories that don't look like jars
             // we require a META-INF otherwise each subdirectory would be a subdeployment
-            if  (context.isTopLevel() == false)
+            if (JarUtils.isArchive(root.getName()) == false)
             {
-               try
+               if  (context.isTopLevel() == false)
                {
-                  root.findChild("META-INF");
-                  log.trace("... ok - non top level directory has a META-INF subdirectory");
+                  try
+                  {
+                     root.findChild("META-INF");
+                     log.trace("... ok - non top level directory has a META-INF subdirectory");
+                  }
+                  catch (IOException e)
+                  {
+                     log.trace("... no - doesn't look like a jar and no META-INF subdirectory.");
+                     return false;
+                  }
                }
-               catch (IOException e)
+               else
                {
-                  log.trace("... no - doesn't look like a jar and no META-INF subdirectory.");
-                  return false;
+                  log.trace("... ok - doesn't look like a jar but it is a top level directory.");
                }
             }
-            else
-            {
-               log.trace("... ok - doesn't look like a jar but it is a top level directory.");
-            }
 
             // The metadata path is META-INF
             context.setMetaDataPath("META-INF");