[jboss-cvs] JBossAS SVN: r87790 - in projects/jboss-deployers/branches/Branch_2_0: deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata and 8 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Apr 24 07:54:44 EDT 2009


Author: alesj
Date: 2009-04-24 07:54:44 -0400 (Fri, 24 Apr 2009)
New Revision: 87790

Added:
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/support/
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/support/ServicesFilter.java
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/jboss-service.xml
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services/
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services/wsdl.xml
Removed:
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/support/ServicesFilter.java
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/jboss-service.xml
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services/
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services/wsdl.xml
Modified:
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/VFSDeploymentContext.java
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/VFSDeploymentUnit.java
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentUnit.java
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/MetaDataMatchFilter.java
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/test/MetaDataUnitTestCase.java
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata.jar/META-INF/jboss-service.xml
Log:
Port JBDEPLOY-183

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java	2009-04-24 11:47:33 UTC (rev 87789)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java	2009-04-24 11:54:44 UTC (rev 87790)
@@ -36,6 +36,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.virtual.VFSUtils;
 import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VirtualFileFilter;
 
 /**
  * AbstractVFSDeploymentContext.
@@ -245,6 +246,20 @@
    {
       if (name == null && suffix == null)
          throw new IllegalArgumentException("Null name and suffix");
+
+      VirtualFileFilter filter = new MetaDataMatchFilter(name, suffix);
+      return getMetaDataFiles(filter);
+   }
+
+   public List<VirtualFile> getMetaDataFiles(VirtualFileFilter filter)
+   {
+      if (filter == null)
+      {
+         // we don't wanna guess what needs to be filtered
+         // if all is what you want, use your own ALL filter
+         throw new IllegalArgumentException("Null filter");
+      }
+
       try
       {
          // There isn't a metadata location so let's see whether the root matches.
@@ -252,27 +267,25 @@
          if (metaDataLocations == null || metaDataLocations.isEmpty())
          {
             // It has to be a plain file
-            if (root != null && SecurityActions.isLeaf(root))
+            if (root != null && SecurityActions.isLeaf(root) && filter.accepts(root))
             {
-               String fileName = root.getName();
-               if (name != null && fileName.equals(name))
-                  return Collections.singletonList(root);
-               if (suffix != null && fileName.endsWith(suffix))
-                  return Collections.singletonList(root);
+               return Collections.singletonList(root);
             }
-
-            // No match
-            return Collections.emptyList();
+            else
+            {
+               // No match
+               return Collections.emptyList();
+            }
          }
          // Look in the meta data location
          List<VirtualFile> results = new ArrayList<VirtualFile>();
          for (VirtualFile location : metaDataLocations)
          {
-            List<VirtualFile> result = location.getChildren(new MetaDataMatchFilter(name, suffix));
+            List<VirtualFile> result = location.getChildren(filter);
             if (result != null && result.isEmpty() == false)
             {
                if (log.isTraceEnabled())
-                  log.trace("Found name=" + name + ", suffix=" + suffix + " in " + location.getName());
+                  log.trace("Found results with " + filter + " in " + location.getName());
                results.addAll(result);
                deployed();
             }
@@ -281,7 +294,7 @@
       }
       catch (Exception e)
       {
-         log.debug("Error retrieving meta data: name=" + name + " suffix=" + suffix, e);
+         log.debug("Error retrieving meta data: filter=" + filter, e);
          return Collections.emptyList();
       }
    }

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentUnit.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentUnit.java	2009-04-24 11:47:33 UTC (rev 87789)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentUnit.java	2009-04-24 11:54:44 UTC (rev 87790)
@@ -28,6 +28,7 @@
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentResourceLoader;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VirtualFileFilter;
 
 /**
  * AbstractVFSDeploymentUnit.
@@ -69,6 +70,11 @@
       return getDeploymentContext().getMetaDataFiles(name, suffix);
    }
 
+   public List<VirtualFile> getMetaDataFiles(VirtualFileFilter filter)
+   {
+      return getDeploymentContext().getMetaDataFiles(filter);
+   }
+
    public void prependMetaDataLocation(VirtualFile... locations)
    {
       getDeploymentContext().prependMetaDataLocation(locations);

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/MetaDataMatchFilter.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/MetaDataMatchFilter.java	2009-04-24 11:47:33 UTC (rev 87789)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/MetaDataMatchFilter.java	2009-04-24 11:54:44 UTC (rev 87790)
@@ -88,4 +88,10 @@
          return fileName.endsWith(suffix);
       return false;
    }
+
+   @Override
+   public String toString()
+   {
+      return "name=" + name + ", suffix=" + suffix;
+   }
 }

Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/support (from rev 87789, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/support)

Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/support/ServicesFilter.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/support/ServicesFilter.java	2009-04-24 11:47:33 UTC (rev 87789)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/support/ServicesFilter.java	2009-04-24 11:54:44 UTC (rev 87790)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.deployers.vfs.metadata.support;
-
-import org.jboss.virtual.plugins.vfs.helpers.AbstractVirtualFileFilterWithAttributes;
-import org.jboss.virtual.VisitorAttributes;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class ServicesFilter extends AbstractVirtualFileFilterWithAttributes
-{
-   public ServicesFilter()
-   {
-      super(VisitorAttributes.RECURSE_LEAVES_ONLY);
-   }
-
-   public boolean accepts(VirtualFile file)
-   {
-      return true;
-   }
-}

Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/support/ServicesFilter.java (from rev 87789, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/support/ServicesFilter.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/support/ServicesFilter.java	                        (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/support/ServicesFilter.java	2009-04-24 11:54:44 UTC (rev 87790)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.deployers.vfs.metadata.support;
+
+import org.jboss.virtual.plugins.vfs.helpers.AbstractVirtualFileFilterWithAttributes;
+import org.jboss.virtual.VisitorAttributes;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class ServicesFilter extends AbstractVirtualFileFilterWithAttributes
+{
+   public ServicesFilter()
+   {
+      super(VisitorAttributes.RECURSE_LEAVES_ONLY);
+   }
+
+   public boolean accepts(VirtualFile file)
+   {
+      return true;
+   }
+}

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/test/MetaDataUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/test/MetaDataUnitTestCase.java	2009-04-24 11:47:33 UTC (rev 87789)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/test/MetaDataUnitTestCase.java	2009-04-24 11:54:44 UTC (rev 87790)
@@ -21,22 +21,24 @@
 */
 package org.jboss.test.deployers.vfs.metadata.test;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.Collections;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
 import org.jboss.test.deployers.BaseDeployersVFSTest;
+import org.jboss.test.deployers.vfs.metadata.support.ServicesFilter;
 import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VirtualFileFilter;
 
 /**
  * MetaDataUnitTestCase.
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  * @version $Revision: 1.1 $
  */
 public class MetaDataUnitTestCase extends BaseDeployersVFSTest
@@ -170,6 +172,17 @@
       assertNoMetaDataMatch(context, "jboss-service.xml", "-not.xml");
    }
    
+   public void testRecurseInMetaInf() throws Exception
+   {
+      VFSDeploymentContext context = createDeploymentContext("/metadata", "toplevel/metadata-recurseinmetainf.jar");
+      context.setMetaDataPath(Collections.singletonList("META-INF"));
+      VirtualFileFilter filter = new ServicesFilter();
+      Set<String> expected = new HashSet<String>();
+      expected.add(getVfsURL("/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/jboss-service.xml"));
+      expected.add(getVfsURL("/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services/wsdl.xml"));
+      assertMetaDataMatch(context, expected, filter);
+   }
+
    protected void assertMetaDataMatch(VFSDeploymentContext context, String expected, String name) throws Exception
    {
       VirtualFile file = context.getMetaDataFile(name);
@@ -186,15 +199,32 @@
    protected void assertMetaDataMatch(VFSDeploymentContext context, Set<String> expected, String name, String suffix) throws Exception
    {
       List<VirtualFile> files = context.getMetaDataFiles(name, suffix);
+      assertMetaDataMatch(expected, files);
+   }
+   
+   protected void assertMetaDataMatch(VFSDeploymentContext context, Set<String> expected, VirtualFileFilter filter) throws Exception
+   {
+      List<VirtualFile> files = context.getMetaDataFiles(filter);
+      assertMetaDataMatch(expected, files);
+   }
+
+   protected void assertMetaDataMatch(Set<String> expected, List<VirtualFile> files) throws Exception
+   {
       Set<String> actual = new HashSet<String>(files.size());
       for (VirtualFile file : files)
          actual.add(file.toURL().toString());
       assertEquals(expected, actual);
    }
-   
+
    protected void assertNoMetaDataMatch(VFSDeploymentContext context, String name, String suffix) throws Exception
    {
       List<VirtualFile> files = context.getMetaDataFiles(name, suffix);
       assertEmpty(files);
    }
+
+   protected void assertNoMetaDataMatch(VFSDeploymentContext context, VirtualFileFilter filter) throws Exception
+   {
+      List<VirtualFile> files = context.getMetaDataFiles(filter);
+      assertEmpty(files);
+   }
 }

Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar (from rev 87789, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar)

Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF (from rev 87789, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF)

Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/jboss-service.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/jboss-service.xml	2009-04-24 11:47:33 UTC (rev 87789)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/jboss-service.xml	2009-04-24 11:54:44 UTC (rev 87790)
@@ -1 +0,0 @@
-<empty/>

Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/jboss-service.xml (from rev 87789, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/jboss-service.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/jboss-service.xml	                        (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/jboss-service.xml	2009-04-24 11:54:44 UTC (rev 87790)
@@ -0,0 +1 @@
+<empty/>

Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services (from rev 87789, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services)

Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services/wsdl.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services/wsdl.xml	2009-04-24 11:47:33 UTC (rev 87789)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services/wsdl.xml	2009-04-24 11:54:44 UTC (rev 87790)
@@ -1 +0,0 @@
-<wsdl/>
\ No newline at end of file

Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services/wsdl.xml (from rev 87789, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services/wsdl.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services/wsdl.xml	                        (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata-recurseinmetainf.jar/META-INF/services/wsdl.xml	2009-04-24 11:54:44 UTC (rev 87790)
@@ -0,0 +1 @@
+<wsdl/>
\ No newline at end of file

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata.jar/META-INF/jboss-service.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata.jar/META-INF/jboss-service.xml	2009-04-24 11:47:33 UTC (rev 87789)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/metadata/toplevel/metadata.jar/META-INF/jboss-service.xml	2009-04-24 11:54:44 UTC (rev 87790)
@@ -1 +1 @@
-empty
\ No newline at end of file
+<empty/>
\ No newline at end of file

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/VFSDeploymentContext.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/VFSDeploymentContext.java	2009-04-24 11:47:33 UTC (rev 87789)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/VFSDeploymentContext.java	2009-04-24 11:54:44 UTC (rev 87790)
@@ -25,6 +25,7 @@
 
 import org.jboss.deployers.structure.spi.DeploymentContext;
 import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VirtualFileFilter;
 
 /**
  * VFSDeploymentContext.
@@ -83,6 +84,15 @@
    List<VirtualFile> getMetaDataFiles(String name, String suffix);
 
    /**
+    * Gets the metadata files for this deployment unit
+    *
+    * @param filter the file filter
+    * @return the virtual files that match
+    * @throws IllegalArgumentException if both the name and suffix are null
+    */
+   List<VirtualFile> getMetaDataFiles(VirtualFileFilter filter);
+
+   /**
     * Prepend metadata file locations.
     * 
     * @param locations the locations

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/VFSDeploymentUnit.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/VFSDeploymentUnit.java	2009-04-24 11:47:33 UTC (rev 87789)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/VFSDeploymentUnit.java	2009-04-24 11:54:44 UTC (rev 87790)
@@ -25,6 +25,7 @@
 
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VirtualFileFilter;
 
 /**
  * VFSDeploymentUnit.
@@ -56,6 +57,15 @@
    List<VirtualFile> getMetaDataFiles(String name, String suffix);
    
    /**
+    * Gets the metadata files for this deployment unit
+    *
+    * @param filter the file filter
+    * @return the virtual files that match
+    * @throws IllegalArgumentException if both the name and suffix are null
+    */
+   List<VirtualFile> getMetaDataFiles(VirtualFileFilter filter);
+   
+   /**
     * Prepend metadata file locations.
     *
     * @param locations the locations




More information about the jboss-cvs-commits mailing list