[jboss-cvs] JBossAS SVN: r99255 - in branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service: deployers and 1 other directory.

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

Author: johnbailey
Date: 2010-01-11 19:35:09 -0500 (Mon, 11 Jan 2010)
New Revision: 99255

Modified:
   branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
   branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
   branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
   branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
   branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/VFSDirContext.java
   branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
Log:
[JBAS-7354] - Initial VFS3 integration

Modified: branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2010-01-11 23:50:30 UTC (rev 99254)
+++ branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2010-01-12 00:35:09 UTC (rev 99255)
@@ -68,7 +68,7 @@
 import org.jboss.metadata.javaee.spec.Environment;
 import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
 import org.jboss.web.WebApplication;
 import org.jboss.web.tomcat.service.injection.TomcatInjectionUtils;
 import org.jboss.web.tomcat.service.injection.WebEJBHandler;

Modified: branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2010-01-11 23:50:30 UTC (rev 99254)
+++ branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2010-01-12 00:35:09 UTC (rev 99255)
@@ -117,7 +117,7 @@
 import org.jboss.metadata.web.spec.WelcomeFileListMetaData;
 import org.jboss.util.StringPropertyReplacer;
 import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
 import org.jboss.web.deployers.MergedJBossWebMetaDataDeployer;
 import org.jboss.web.deployers.ServletContainerInitializerDeployer;
 import org.jboss.web.tomcat.metadata.ContextMetaData;

Modified: branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2010-01-11 23:50:30 UTC (rev 99254)
+++ branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2010-01-12 00:35:09 UTC (rev 99255)
@@ -37,11 +37,11 @@
 import org.jboss.metadata.web.spec.WebMetaData;
 import org.jboss.mx.util.ObjectNameFactory;
 import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VisitorAttributes;
-import org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
+import org.jboss.vfs.VisitorAttributes;
+import org.jboss.vfs.util.SuffixMatchFilter;
 import org.jboss.web.deployers.AbstractWarDeployer;
 import org.jboss.web.deployers.AbstractWarDeployment;
 import org.jboss.web.tomcat.service.session.SessionIDGenerator;
@@ -418,8 +418,8 @@
                VirtualFileFilter tldFilter = new SuffixMatchFilter(".tld", VisitorAttributes.DEFAULT);
                for (URL url : urls)
                {
-                  VFS vfs = VFS.getVFS(url);
-                  VirtualFile metaInf = vfs.getChild("META-INF");
+                  VirtualFile virtualFile = VFS.getChild(url);
+                  VirtualFile metaInf = virtualFile.getChild("META-INF");
                   if (metaInf != null)
                   {
                      List<VirtualFile> tlds = metaInf.getChildren(tldFilter);

Modified: branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2010-01-11 23:50:30 UTC (rev 99254)
+++ branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2010-01-12 00:35:09 UTC (rev 99255)
@@ -59,7 +59,7 @@
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.naming.NonSerializableFactory;
 import org.jboss.security.SecurityUtil;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
 import org.jboss.web.WebApplication;
 import org.jboss.web.deployers.AbstractWarDeployment;
 import org.jboss.web.tomcat.security.JaccContextValve;

Modified: branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/VFSDirContext.java
===================================================================
--- branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/VFSDirContext.java	2010-01-11 23:50:30 UTC (rev 99254)
+++ branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/VFSDirContext.java	2010-01-12 00:35:09 UTC (rev 99255)
@@ -49,7 +49,7 @@
 import org.apache.naming.resources.Resource;
 import org.apache.naming.resources.ResourceAttributes;
 import org.jboss.logging.Logger;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
 
 /**
  * VFS Directory Context implementation.
@@ -116,10 +116,6 @@
      * Release any resources allocated for this directory context.
      */
     public void release() {
-
-        if (base != null) {
-            base.close();
-        }
         base = null;
         super.release();
 

Modified: branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
===================================================================
--- branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java	2010-01-11 23:50:30 UTC (rev 99254)
+++ branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java	2010-01-12 00:35:09 UTC (rev 99255)
@@ -37,7 +37,7 @@
 import org.jboss.metadata.common.jboss.LoaderRepositoryConfigMetaData;
 import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
 
 /**
  * The war deployment class loader deployer.