remm 2003/08/31 08:50:18
Modified: catalina/src/share/org/apache/catalina/startup
SetDocBaseRule.java
Log:
- Don't unpack if there's an overriding unpackWAR attribute on the context
itself. I plan to use this to run the tomcat-docs webapp from the WAR (it
simply uses too much HD space, and takes a while to unpack when
installing Tomcat, so I'll experiment with bundling it as a WAR).
Revision Changes Path
1.5 +6 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SetDocBaseRule.java 25 Jul 2003 16:43:53 -0000 1.4
+++ SetDocBaseRule.java 31 Aug 2003 15:50:18 -0000 1.5
@@ -133,6 +133,9 @@
if (!((StandardHost) host).isUnpackWARs()) {
return;
}
+ if ("false".equals(attributes.getValue("unpackWAR"))) {
+ return;
+ }
File canonicalAppBase =
new File(System.getProperty("catalina.base"), appBase)