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

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

Author: scott.stark at jboss.org
Date: 2006-10-19 15:10:21 -0400 (Thu, 19 Oct 2006)
New Revision: 57738

Modified:
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/AbstractCandidateStructureVisitor.java
   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/war/WebInfLibFilter.java
Log:
Remove the isArchive check

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/AbstractCandidateStructureVisitor.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/AbstractCandidateStructureVisitor.java	2006-10-19 19:09:43 UTC (rev 57737)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/AbstractCandidateStructureVisitor.java	2006-10-19 19:10:21 UTC (rev 57738)
@@ -155,10 +155,10 @@
       if (metaDataPath != null && virtualFile.getPathName().startsWith(metaDataPath))
          return null;
 
-      // Ignore directories that are not archives when asked
+      // Ignore directories when asked
       try
       {
-         if (ignoreDirectories && virtualFile.isLeaf() == false && virtualFile.isArchive() == false)
+         if (ignoreDirectories && virtualFile.isLeaf() == false)
             return null;
       }
       catch (IOException e)

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-19 19:09:43 UTC (rev 57737)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/jar/JARStructure.java	2006-10-19 19:10:21 UTC (rev 57738)
@@ -74,31 +74,24 @@
          VirtualFile root = context.getRoot();
          if (root.isLeaf() == false)
          {
-            if (root.isArchive() == false)
+            // 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)
             {
-               // 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)
+               try
                {
-                  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;
-                  }
+                  root.findChild("META-INF");
+                  log.trace("... ok - non top level directory has a META-INF subdirectory");
                }
-               else
+               catch (IOException e)
                {
-                  log.trace("... ok - doesn't look like a jar but it is a top level directory.");
+                  log.trace("... no - doesn't look like a jar and no META-INF subdirectory.");
+                  return false;
                }
             }
             else
             {
-               log.trace("... ok - its an archive or at least pretending to be.");
+               log.trace("... ok - doesn't look like a jar but it is a top level directory.");
             }
 
             // The metadata path is META-INF

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/war/WebInfLibFilter.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/war/WebInfLibFilter.java	2006-10-19 19:09:43 UTC (rev 57737)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/structure/vfs/war/WebInfLibFilter.java	2006-10-19 19:10:21 UTC (rev 57738)
@@ -50,16 +50,9 @@
 
    public boolean accepts(VirtualFile file)
    {
-      try
-      {
-         // We want archives
-         if (file.isArchive())
-            return true;
-      }
-      catch (IOException e)
-      {
-         log.warn("Ignoring " + file + " reason=" + e);
-      }
+      // We want jars
+      if (file.getName().endsWith(".jar"))
+         return true;
       
       // We ignore everything else
       return false;