[jboss-cvs] JBossAS SVN: r66486 - trunk/ejb3/src/main/org/jboss/ejb3/deployers.

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

Author: alesj
Date: 2007-10-26 07:03:11 -0400 (Fri, 26 Oct 2007)
New Revision: 66486

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
Log:
Using VFSUtils.readManifest(VirtualFile).

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java	2007-10-26 10:57:39 UTC (rev 66485)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java	2007-10-26 11:03:11 UTC (rev 66486)
@@ -22,7 +22,6 @@
 package org.jboss.ejb3.deployers;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
@@ -30,6 +29,7 @@
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.ejb3.metamodel.ApplicationClientDD;
+import org.jboss.virtual.VFSUtils;
 import org.jboss.virtual.VirtualFile;
 
 /**
@@ -101,17 +101,7 @@
 
       try
       {
-         // TODO - use VFSUtils.readManifest
-         InputStream is = file.openStream();
-         Manifest mf;
-         try
-         {
-            mf = new Manifest(is);
-         }
-         finally
-         {
-            is.close();
-         }
+         Manifest mf = VFSUtils.readManifest(file);
          Attributes attrs = mf.getMainAttributes();
          String className = attrs.getValue(Attributes.Name.MAIN_CLASS);
          return className;

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2007-10-26 10:57:39 UTC (rev 66485)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2007-10-26 11:03:11 UTC (rev 66486)
@@ -21,11 +21,9 @@
  */
 package org.jboss.ejb3.deployers;
 
-import java.io.InputStream;
 import java.util.List;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
-
 import javax.management.MBeanServer;
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -42,10 +40,10 @@
 import org.jboss.ejb3.KernelAbstraction;
 import org.jboss.ejb3.MCKernelAbstraction;
 import org.jboss.ejb3.clientmodule.ClientENCInjectionContainer;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
 import org.jboss.kernel.Kernel;
 import org.jboss.metadata.client.jboss.JBossClientMetaData;
 import org.jboss.naming.Util;
+import org.jboss.virtual.VFSUtils;
 import org.jboss.virtual.VirtualFile;
 
 /**
@@ -165,17 +163,7 @@
       {
          try
          {
-            // TODO - use VFSUtils.readManifest .. once VFS lib is updated
-            InputStream is = file.openStream();
-            Manifest mf;
-            try
-            {
-               mf = new Manifest(is);
-            }
-            finally
-            {
-               is.close();
-            }
+            Manifest mf = VFSUtils.readManifest(file);
             Attributes attrs = mf.getMainAttributes();
             String className = attrs.getValue(Attributes.Name.MAIN_CLASS);
             if (className != null)