[jboss-cvs] JBossAS SVN: r59480 - in trunk: server/src/main/org/jboss/deployment and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 10 07:33:05 EST 2007
Author: alesj
Date: 2007-01-10 07:32:49 -0500 (Wed, 10 Jan 2007)
New Revision: 59480
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
trunk/server/src/main/org/jboss/deployment/EARDeployer.java
trunk/server/src/main/org/jboss/deployment/EARStructure.java
trunk/system-jmx/src/main/org/jboss/deployment/DeploymentInfo.java
Log:
finally stream close, introduction of VFSUtils readManifest
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java 2007-01-10 11:41:49 UTC (rev 59479)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/AppClientScanningDeployer.java 2007-01-10 12:32:49 UTC (rev 59480)
@@ -21,18 +21,18 @@
*/
package org.jboss.ejb3.deployers;
+import org.jboss.deployers.plugins.deployers.helpers.AbstractTypedDeployer;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.ejb3.metamodel.ApplicationClientDD;
+import org.jboss.virtual.VirtualFile;
+
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
-import org.jboss.deployers.plugins.deployers.helpers.AbstractTypedDeployer;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
-import org.jboss.virtual.VirtualFile;
-
/**
* Scan the main & super classes for annotations.
*
@@ -103,6 +103,7 @@
try
{
+ // TODO - use VFSUtils.readManifest
InputStream is = file.openStream();
Manifest mf;
try
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2007-01-10 11:41:49 UTC (rev 59479)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2007-01-10 12:32:49 UTC (rev 59480)
@@ -141,7 +141,7 @@
{
try
{
- // use VFSUtils.readManifest(VirtualFile) .. once VFS lib is updated
+ // TODO - use VFSUtils.readManifest .. once VFS lib is updated
InputStream is = file.openStream();
Manifest mf;
try
Modified: trunk/server/src/main/org/jboss/deployment/EARDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARDeployer.java 2007-01-10 11:41:49 UTC (rev 59479)
+++ trunk/server/src/main/org/jboss/deployment/EARDeployer.java 2007-01-10 12:32:49 UTC (rev 59480)
@@ -21,36 +21,30 @@
*/
package org.jboss.deployment;
+import org.jboss.metadata.MetaData;
+import org.jboss.metadata.XmlFileLoader;
+import org.jboss.mx.loading.LoaderRepositoryFactory;
+import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.system.ServiceControllerMBean;
+import org.jboss.util.file.JarUtils;
+import org.w3c.dom.Element;
+
+import javax.management.ObjectName;
+import javax.security.jacc.PolicyConfiguration;
+import javax.security.jacc.PolicyConfigurationFactory;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.FileInputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.Policy;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-import java.util.jar.Attributes;
-import java.util.jar.JarInputStream;
+import java.util.jar.*;
-import javax.management.ObjectName;
-import javax.security.jacc.PolicyConfiguration;
-import javax.security.jacc.PolicyConfigurationFactory;
-
-import org.jboss.metadata.MetaData;
-import org.jboss.metadata.XmlFileLoader;
-import org.jboss.mx.loading.LoaderRepositoryFactory;
-import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.system.ServiceControllerMBean;
-import org.jboss.util.file.JarUtils;
-import org.w3c.dom.Element;
-
/**
* Enterprise Archive Deployer.
*
@@ -424,7 +418,7 @@
of the application package, with the .war extension removed.
b. All ear modules with extension of .rar are considered resource adapters.
c. A directory named lib is considered to be the library directory, as
- described in Section EE.8.2.1, “Bundled Libraries.”
+ described in Section�EE.8.2.1, �Bundled Libraries.�
d. For all ear modules with a filename extension of .jar, but not in the lib
directory, do the following:
i. If the JAR file contains a META-INF/MANIFEST.MF file with a Main-Class
@@ -474,8 +468,15 @@
else if( mfFile.exists() )
{
FileInputStream fis = new FileInputStream(mfFile);
- Manifest mf = new Manifest(fis);
- fis.close();
+ Manifest mf;
+ try
+ {
+ mf = new Manifest(fis);
+ }
+ finally
+ {
+ fis.close();
+ }
Attributes attrs = mf.getMainAttributes();
if( attrs.containsKey(Attributes.Name.MAIN_CLASS) )
{
Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java 2007-01-10 11:41:49 UTC (rev 59479)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java 2007-01-10 12:32:49 UTC (rev 59480)
@@ -21,13 +21,6 @@
*/
package org.jboss.deployment;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
import org.jboss.deployers.plugins.structure.ContextInfoImpl;
import org.jboss.deployers.plugins.structure.vfs.AbstractStructureDeployer;
import org.jboss.deployers.spi.structure.vfs.StructureMetaData;
@@ -38,6 +31,13 @@
import org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter;
import org.w3c.dom.Element;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.List;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
/**
* Structure deployer for EARs.
*
@@ -98,7 +98,7 @@
public boolean determineStructure(VirtualFile root,
StructureMetaData metaData, StructuredDeployers deployers)
{
- boolean valid = false;
+ boolean valid;
try
{
if( root.isLeaf() == true || root.getName().endsWith(".ear") == false)
@@ -109,26 +109,38 @@
VirtualFile applicationXml = getMetaDataFile(root, "META-INF/application.xml");
VirtualFile jbossAppXml = getMetaDataFile(root, "META-INF/jboss-app.xml");
- VirtualFile lib = null;
+ VirtualFile lib;
J2eeApplicationMetaData j2eeMetaData = new J2eeApplicationMetaData();
boolean scan = true;
if (applicationXml != null)
{
InputStream in = applicationXml.openStream();
- XmlFileLoader xfl = new XmlFileLoader(false);
- Element application = xfl.getDocument(in, "META-INF/application.xml").getDocumentElement();
- j2eeMetaData.importXml(application);
- in.close();
+ try
+ {
+ XmlFileLoader xfl = new XmlFileLoader(false);
+ Element application = xfl.getDocument(in, "META-INF/application.xml").getDocumentElement();
+ j2eeMetaData.importXml(application);
+ }
+ finally
+ {
+ in.close();
+ }
scan = false;
}
if (jbossAppXml != null)
{
InputStream in = jbossAppXml.openStream();
- XmlFileLoader xfl = new XmlFileLoader(false);
- Element jbossApp = xfl.getDocument(in, "META-INF/jboss-app.xml").getDocumentElement();
- j2eeMetaData.importXml(jbossApp);
- in.close();
+ try
+ {
+ XmlFileLoader xfl = new XmlFileLoader(false);
+ Element jbossApp = xfl.getDocument(in, "META-INF/jboss-app.xml").getDocumentElement();
+ j2eeMetaData.importXml(jbossApp);
+ }
+ finally
+ {
+ in.close();
+ }
}
// the adding of the context should happen before the lib directory is processed
@@ -283,9 +295,17 @@
}
else if( mfFile != null )
{
+ // TODO - use VFSUtils.readManifest
InputStream is = mfFile.openStream();
- Manifest mf = new Manifest(is);
- is.close();
+ Manifest mf;
+ try
+ {
+ mf = new Manifest(is);
+ }
+ finally
+ {
+ is.close();
+ }
Attributes attrs = mf.getMainAttributes();
if( attrs.containsKey(Attributes.Name.MAIN_CLASS) )
{
Modified: trunk/system-jmx/src/main/org/jboss/deployment/DeploymentInfo.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/DeploymentInfo.java 2007-01-10 11:41:49 UTC (rev 59479)
+++ trunk/system-jmx/src/main/org/jboss/deployment/DeploymentInfo.java 2007-01-10 12:32:49 UTC (rev 59480)
@@ -21,32 +21,25 @@
*/
package org.jboss.deployment;
+import org.jboss.logging.Logger;
+import org.jboss.mx.loading.LoaderRepositoryFactory;
+import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
+import org.jboss.mx.loading.RepositoryClassLoader;
+import org.jboss.util.collection.ListSet;
+import org.jboss.util.file.Files;
+import org.w3c.dom.Document;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
import java.io.File;
import java.io.FileInputStream;
import java.io.Serializable;
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-import org.jboss.logging.Logger;
-import org.jboss.mx.loading.LoaderRepositoryFactory;
-import org.jboss.mx.loading.RepositoryClassLoader;
-import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
-import org.jboss.util.collection.ListSet;
-import org.jboss.util.file.Files;
-import org.w3c.dom.Document;
-
/**
* Service Deployment Info .
*
@@ -381,8 +374,14 @@
if (file.isDirectory())
{
FileInputStream fis = new FileInputStream(new File(file, "META-INF/MANIFEST.MF"));
- manifest = new Manifest(fis);
- fis.close();
+ try
+ {
+ manifest = new Manifest(fis);
+ }
+ finally
+ {
+ fis.close();
+ }
}
else if(isXML == false)// a jar
manifest = new JarFile(file).getManifest();
More information about the jboss-cvs-commits
mailing list