[jboss-cvs] JBossAS SVN: r99256 - in branches/vfs3-int/ejb3: src/main/java/org/jboss/ejb3/clientmodule and 1 other directories.

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

Author: johnbailey
Date: 2010-01-11 19:50:29 -0500 (Mon, 11 Jan 2010)
New Revision: 99256

Modified:
   branches/vfs3-int/ejb3/pom.xml
   branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
   branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/AppClientScanningDeployer.java
   branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
   branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
   branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3Deployer.java
   branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
Log:
[JBAS-7346] - Integrate VFS3 into jboss-as-ejb3

Modified: branches/vfs3-int/ejb3/pom.xml
===================================================================
--- branches/vfs3-int/ejb3/pom.xml	2010-01-12 00:35:09 UTC (rev 99255)
+++ branches/vfs3-int/ejb3/pom.xml	2010-01-12 00:50:29 UTC (rev 99256)
@@ -207,6 +207,10 @@
           <groupId>org.jboss.cache</groupId>
           <artifactId>jbosscache-core</artifactId>
         </exclusion>
+        <exclusion>
+        	<groupId>org.jboss.metadata</groupId>
+        	<artifactId>jboss-metadata</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     

Modified: branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
===================================================================
--- branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2010-01-12 00:35:09 UTC (rev 99255)
+++ branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2010-01-12 00:50:29 UTC (rev 99256)
@@ -67,7 +67,7 @@
 import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
 import org.jboss.metadata.serviceref.ServiceReferenceHandler;
 import org.jboss.metadata.serviceref.VirtualFileAdaptor;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
 import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
 
 /**

Modified: branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/AppClientScanningDeployer.java
===================================================================
--- branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/AppClientScanningDeployer.java	2010-01-12 00:35:09 UTC (rev 99255)
+++ branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/AppClientScanningDeployer.java	2010-01-12 00:50:29 UTC (rev 99256)
@@ -29,8 +29,8 @@
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.metadata.client.jboss.JBossClientMetaData;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
 
 /**
  * Scan the main & super classes for annotations.
@@ -99,17 +99,10 @@
          return null;
       }
 
-      try
-      {
-         Manifest mf = VFSUtils.readManifest(file);
-         Attributes attrs = mf.getMainAttributes();
-         String className = attrs.getValue(Attributes.Name.MAIN_CLASS);
-         return className;
-      }
-      finally
-      {
-         file.close();
-      }
+      Manifest mf = VFSUtils.readManifest(file);
+      Attributes attrs = mf.getMainAttributes();
+      String className = attrs.getValue(Attributes.Name.MAIN_CLASS);
+      return className;
    }
    
    // TODO: should we check for type of annotations?

Modified: branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
===================================================================
--- branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2010-01-12 00:35:09 UTC (rev 99255)
+++ branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2010-01-12 00:50:29 UTC (rev 99256)
@@ -40,7 +40,7 @@
 import org.jboss.kernel.Kernel;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
 
 /**
  * Creates initial EJB deployments and initializes only basic metadata.

Modified: branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2010-01-12 00:35:09 UTC (rev 99255)
+++ branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2010-01-12 00:50:29 UTC (rev 99256)
@@ -48,8 +48,8 @@
 import org.jboss.metadata.client.jboss.JBossClientMetaData;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
 import org.jboss.naming.Util;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
 
 /**
  * Deploys a client application jar.
@@ -236,20 +236,13 @@
 
       if (file != null)
       {
-         try
+         Manifest mf = VFSUtils.readManifest(file);
+         Attributes attrs = mf.getMainAttributes();
+         String className = attrs.getValue(Attributes.Name.MAIN_CLASS);
+         if (className != null)
          {
-            Manifest mf = VFSUtils.readManifest(file);
-            Attributes attrs = mf.getMainAttributes();
-            String className = attrs.getValue(Attributes.Name.MAIN_CLASS);
-            if (className != null)
-            {
-               mainClassName = className;
-            }
+            mainClassName = className;
          }
-         finally
-         {
-            file.close();
-         }
       }
       return mainClassName;
    }

Modified: branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3Deployer.java	2010-01-12 00:35:09 UTC (rev 99255)
+++ branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3Deployer.java	2010-01-12 00:50:29 UTC (rev 99256)
@@ -48,7 +48,7 @@
 import org.jboss.kernel.spi.deployment.KernelDeployment;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
 
 /**
  * Deployes EJB 3 components based on meta data coming from JBossEjbParsingDeployer.

Modified: branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
===================================================================
--- branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java	2010-01-12 00:35:09 UTC (rev 99255)
+++ branches/vfs3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java	2010-01-12 00:50:29 UTC (rev 99256)
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Hashtable;
 import java.util.List;
@@ -210,7 +211,7 @@
 
       VisitorAttributes va = new VisitorAttributes();
       va.setLeavesOnly(true);
-      SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(JarUtils.getSuffixes());
+      SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(Arrays.asList(".zip", ".ear", ".jar", ".rar", ".war", ".sar",".har", ".aop")); // TODO:  Where should these come from?
       va.setRecurseFilter(noJars);
       FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(filter, va);