remm 2003/09/01 05:43:13
Modified: catalina/src/share/org/apache/catalina/startup
SetDocBaseRule.java
Log:
- Unpack WARs if the host is not a standard host.
- Allow unpackWAR to override the unpackWARs value (ie, if unpackWARs
is false, it can be used to force unpacking of a particular webapp which
would need filesystem access, unlike others within the host).
Revision Changes Path
1.6 +9 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetDocBaseRule.java
Index: SetDocBaseRule.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetDocBaseRule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SetDocBaseRule.java 31 Aug 2003 15:50:18 -0000 1.5
+++ SetDocBaseRule.java 1 Sep 2003 12:43:13 -0000 1.6
@@ -75,6 +75,7 @@
import org.apache.catalina.Deployer;
import org.apache.catalina.Host;
+import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardHost;
/**
@@ -127,10 +128,12 @@
}
String appBase = host.getAppBase();
- if (!(host instanceof StandardHost)) {
- return;
+ boolean unpackWARs = true;
+ if (host instanceof StandardHost) {
+ unpackWARs = ((StandardHost) host).isUnpackWARs();
}
- if (!((StandardHost) host).isUnpackWARs()) {
+ if (!unpackWARs
+ && !("true".equals(attributes.getValue("unpackWAR")))) {
return;
}
if ("false".equals(attributes.getValue("unpackWAR"))) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
