[jboss-cvs] JBossAS SVN: r99562 - in branches/vfs3-int/tomcat/src: resources and 1 other directory.

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

Author: johnbailey
Date: 2010-01-18 19:15:45 -0500 (Mon, 18 Jan 2010)
New Revision: 99562

Modified:
   branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
   branches/vfs3-int/tomcat/src/resources/war-deployers-jboss-beans.xml
Log:
[JBAS-7354] - Additional integration for jboss-as-tomcat

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-19 00:13:49 UTC (rev 99561)
+++ branches/vfs3-int/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2010-01-19 00:15:45 UTC (rev 99562)
@@ -59,6 +59,7 @@
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.naming.NonSerializableFactory;
 import org.jboss.security.SecurityUtil;
+import org.jboss.vfs.VFS;
 import org.jboss.vfs.VirtualFile;
 import org.jboss.web.WebApplication;
 import org.jboss.web.deployers.AbstractWarDeployment;
@@ -224,7 +225,7 @@
 
       String docBase = depUnit.getAttachment("org.jboss.web.explicitDocBase", String.class);
       if (docBase == null)
-         docBase = warUrl.getFile();
+         docBase = VFS.getChild(warUrl).getPhysicalFile().getAbsolutePath();
 
       context.setDocBase(docBase);
 

Modified: branches/vfs3-int/tomcat/src/resources/war-deployers-jboss-beans.xml
===================================================================
--- branches/vfs3-int/tomcat/src/resources/war-deployers-jboss-beans.xml	2010-01-19 00:13:49 UTC (rev 99561)
+++ branches/vfs3-int/tomcat/src/resources/war-deployers-jboss-beans.xml	2010-01-19 00:15:45 UTC (rev 99562)
@@ -10,7 +10,7 @@
    <bean name="WARStructure" class="org.jboss.web.deployers.WARStructure">
        <property name="webInfLibFilter">
           <!-- We accept all .jar files in WEB-INF/lib -->
-          <bean name="WebInfLibFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter">
+          <bean name="WebInfLibFilter" class="org.jboss.vfs.util.SuffixMatchFilter">
              <constructor><parameter class="java.lang.String">.jar</parameter></constructor>
           </bean>
        </property>