markt 2004/01/06 14:32:07
Modified: catalina/src/share/org/apache/catalina/core
StandardHostDeployer.java
Log:
- Fix bug11682. Deploying a webapp to the root context via an Ant
task when unpackWARs is true now behaves correctly.
- Ported from TC5.
- Remove unused imports - thanks to Eclipse.
Revision Changes Path
1.14 +9 -9
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java
Index: StandardHostDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StandardHostDeployer.java 13 Jan 2003 23:23:28 -0000 1.13
+++ StandardHostDeployer.java 6 Jan 2004 22:32:07 -0000 1.14
@@ -65,13 +65,10 @@
package org.apache.catalina.core;
-import java.io.BufferedOutputStream;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.IOException;
import java.net.URL;
-import java.util.Enumeration;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Deployer;
@@ -85,7 +82,6 @@
import org.apache.catalina.startup.NamingRuleSet;
import org.apache.catalina.util.StringManager;
import org.apache.commons.digester.Digester;
-import org.xml.sax.SAXParseException;
/**
@@ -288,7 +284,11 @@
// Expand war file if host wants wars unpacked
if (isWAR && host.isUnpackWARs()) {
- docBase = ExpandWar.expand(host,war,contextPath);
+ if (contextPath.equals("")) {
+ docBase = ExpandWar.expand(host,war,"/ROOT");
+ } else {
+ docBase = ExpandWar.expand(host,war,contextPath);
+ }
}
// Install the new web application
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
