[jboss-cvs] JBossAS SVN: r67609 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2007-11-29 10:56:39 -0500 (Thu, 29 Nov 2007)
New Revision: 67609

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
Log:
- In most cases, the VFS seems to be passing a perfectly usable
  uncompressed WAR, so use it directly by default as it is more
  compatible (maybe a flag could be added to configure this).

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-11-29 15:20:28 UTC (rev 67608)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-11-29 15:56:39 UTC (rev 67609)
@@ -198,9 +198,12 @@
          log.debug("No " + CONTEXT_CONFIG_FILE + " in " + url, e);
       }
 
-      VFSDirContext resources = new VFSDirContext();
-      resources.setVirtualFile(webApp.getDeploymentUnit().getFile(""));
-      context.setResources(resources);
+      if ((new File(url.getFile())).isDirectory() == false)
+      {
+         VFSDirContext resources = new VFSDirContext();
+         resources.setVirtualFile(webApp.getDeploymentUnit().getFile(""));
+         context.setResources(resources);
+      }
 
       context.setInstanceManager(injectionContainer);
       context.setDocBase(url.getFile());