[jboss-cvs] JBossAS SVN: r95331 - trunk/server/src/main/java/org/jboss/web/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2009-10-21 15:18:25 -0400 (Wed, 21 Oct 2009)
New Revision: 95331

Modified:
   trunk/server/src/main/java/org/jboss/web/deployers/WARStructure.java
Log:
- Add some nested locations in META-INF.

Modified: trunk/server/src/main/java/org/jboss/web/deployers/WARStructure.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/WARStructure.java	2009-10-21 19:05:10 UTC (rev 95330)
+++ trunk/server/src/main/java/org/jboss/web/deployers/WARStructure.java	2009-10-21 19:18:25 UTC (rev 95331)
@@ -207,7 +207,23 @@
                   {
                      // either same as plain lib filter, null or accepts the jar
                      if (webInfLibMetaDataFilter == null || webInfLibMetaDataFilter == webInfLibFilter || webInfLibMetaDataFilter.accepts(jar))
-                        metaDataLocations.add("WEB-INF/lib/" + jar.getName() + "/META-INF");
+                     {
+                        VirtualFile metaInf = jar.getChild("META-INF");
+                        if (metaInf != null && !isLeaf(metaInf))
+                        {
+                           metaDataLocations.add("WEB-INF/lib/" + jar.getName() + "/META-INF");
+                           List<VirtualFile> children = metaInf.getChildren();
+                           for (VirtualFile child : children)
+                           {
+                              if (!isLeaf(child) && (!"resources".equals(child.getName())))
+                              {
+                                 metaDataLocations.add("WEB-INF/lib/" + jar.getName() + "/META-INF/" + child.getName());
+                                 addPathsRecursively(metaDataLocations, child, 
+                                       "WEB-INF/lib/" + jar.getName() + "/META-INF/" + child.getName());
+                              }
+                           }
+                        }
+                     }
                   }
                }
             }