[jboss-cvs] JBossAS SVN: r57740 - in trunk: aspects/src/jdk15/org/jboss/aop/deployers ejb3/src/main/org/jboss/ejb3 ejb3/src/main/org/jboss/ejb3/deployers ejb3/src/main/org/jboss/ejb3/embedded

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

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

Modified:
   trunk/aspects/src/jdk15/org/jboss/aop/deployers/AspectDeployer.java
   trunk/aspects/src/jdk15/org/jboss/aop/deployers/ClassFileFilter.java
   trunk/ejb3/src/main/org/jboss/ejb3/ClassFileFilter.java
   trunk/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
   trunk/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java
Log:
Update for VFS visitor recursion and isAttribute changes

Modified: trunk/aspects/src/jdk15/org/jboss/aop/deployers/AspectDeployer.java
===================================================================
--- trunk/aspects/src/jdk15/org/jboss/aop/deployers/AspectDeployer.java	2006-10-19 19:13:47 UTC (rev 57739)
+++ trunk/aspects/src/jdk15/org/jboss/aop/deployers/AspectDeployer.java	2006-10-19 19:31:55 UTC (rev 57740)
@@ -33,6 +33,7 @@
 import org.jboss.virtual.VisitorAttributes;
 import org.jboss.virtual.plugins.context.jar.JarUtils;
 import org.jboss.virtual.plugins.vfs.helpers.FilterVirtualFileVisitor;
+import org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter;
 import org.jboss.logging.Logger;
 import org.w3c.dom.Document;
 
@@ -40,6 +41,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.Collections;
 import java.util.List;
 
 import javassist.bytecode.ClassFile;
@@ -237,9 +239,10 @@
    private List<VirtualFile> getClasses(DeploymentUnit unit)
    {
       VisitorAttributes va = new VisitorAttributes();
-      va.setRecurse(true);
       va.setLeavesOnly(true);
-      va.setRecurseArchives(false);
+      SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(JarUtils.getSuffixes());
+      va.setRecurseFilter(noJars);
+      
       ClassFileFilter filter = new ClassFileFilter();
       FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(filter, va);
 

Modified: trunk/aspects/src/jdk15/org/jboss/aop/deployers/ClassFileFilter.java
===================================================================
--- trunk/aspects/src/jdk15/org/jboss/aop/deployers/ClassFileFilter.java	2006-10-19 19:13:47 UTC (rev 57739)
+++ trunk/aspects/src/jdk15/org/jboss/aop/deployers/ClassFileFilter.java	2006-10-19 19:31:55 UTC (rev 57740)
@@ -38,7 +38,7 @@
    {
       try
       {
-         return !file.isArchive() && file.isLeaf() && file.getName().endsWith(".class");
+         return file.isLeaf() && file.getName().endsWith(".class");
       }
       catch (IOException e)
       {

Modified: trunk/ejb3/src/main/org/jboss/ejb3/ClassFileFilter.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/ClassFileFilter.java	2006-10-19 19:13:47 UTC (rev 57739)
+++ trunk/ejb3/src/main/org/jboss/ejb3/ClassFileFilter.java	2006-10-19 19:31:55 UTC (rev 57740)
@@ -38,7 +38,7 @@
    {
       try
       {
-         return !file.isArchive() && file.isLeaf() && file.getName().endsWith(".class");
+         return file.isLeaf() && file.getName().endsWith(".class");
       }
       catch (IOException e)
       {

Modified: trunk/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java	2006-10-19 19:13:47 UTC (rev 57739)
+++ trunk/ejb3/src/main/org/jboss/ejb3/JmxDeploymentUnit.java	2006-10-19 19:31:55 UTC (rev 57740)
@@ -34,7 +34,9 @@
 import org.jboss.virtual.VFS;
 import org.jboss.virtual.VirtualFileFilter;
 import org.jboss.virtual.VisitorAttributes;
+import org.jboss.virtual.plugins.context.jar.JarUtils;
 import org.jboss.virtual.plugins.vfs.helpers.FilterVirtualFileVisitor;
+import org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter;
 
 /**
  * Comment
@@ -171,9 +173,9 @@
    public List<VirtualFile> getResources(VirtualFileFilter filter)
    {
       VisitorAttributes va = new VisitorAttributes();
-      va.setRecurse(true);
       va.setLeavesOnly(true);
-      va.setRecurseArchives(false);
+      SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(JarUtils.getSuffixes());
+      va.setRecurseFilter(noJars);
       FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(filter, va);
       try
       {

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2006-10-19 19:13:47 UTC (rev 57739)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2006-10-19 19:31:55 UTC (rev 57740)
@@ -108,7 +108,7 @@
       {
          if (unit.getDeploymentContext().isComponent()) return;
          VirtualFile jar = unit.getDeploymentContext().getRoot();
-         if (!jar.isArchive() || ignoredJarsSet.contains(jar.getName())                 )
+         if (jar.isLeaf() || ignoredJarsSet.contains(jar.getName())                 )
          {
             log.trace("EJBRegistrationDeployer ignoring: " + jar.getName());
             return;

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java	2006-10-19 19:13:47 UTC (rev 57739)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java	2006-10-19 19:31:55 UTC (rev 57740)
@@ -26,7 +26,9 @@
 import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.VirtualFileFilter;
 import org.jboss.virtual.VisitorAttributes;
+import org.jboss.virtual.plugins.context.jar.JarUtils;
 import org.jboss.virtual.plugins.vfs.helpers.FilterVirtualFileVisitor;
+import org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter;
 
 import java.net.URL;
 import java.util.Hashtable;
@@ -142,9 +144,9 @@
    public List<VirtualFile> getResources(VirtualFileFilter filter)
    {
       VisitorAttributes va = new VisitorAttributes();
-      va.setRecurse(true);
       va.setLeavesOnly(true);
-      va.setRecurseArchives(false);
+      SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(JarUtils.getSuffixes());
+      va.setRecurseFilter(noJars);
       FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(filter, va);
 
       for (VirtualFile vf : deploymentInfo.getDeploymentContext().getClassPath())

Modified: trunk/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java	2006-10-19 19:13:47 UTC (rev 57739)
+++ trunk/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployer.java	2006-10-19 19:31:55 UTC (rev 57740)
@@ -51,7 +51,9 @@
 import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.VirtualFileFilter;
 import org.jboss.virtual.VisitorAttributes;
+import org.jboss.virtual.plugins.context.jar.JarUtils;
 import org.jboss.virtual.plugins.vfs.helpers.FilterVirtualFileVisitor;
+import org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter;
 
 /**
  * When initialized properly, this class will search for annotated classes and archives in your
@@ -105,9 +107,9 @@
       public List<VirtualFile> getResources(VirtualFileFilter filter)
       {
          VisitorAttributes va = new VisitorAttributes();
-         va.setRecurse(true);
          va.setLeavesOnly(true);
-         va.setRecurseArchives(false);
+         SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(JarUtils.getSuffixes());
+         va.setRecurseFilter(noJars);
          FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(filter, va);
          try
          {