remm 2003/07/25 06:54:57
Modified: catalina/src/share/org/apache/catalina/core
StandardHostDeployer.java
Log:
- Remove use of the auto deploy flag.
Revision Changes Path
1.14 +7 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java
Index: StandardHostDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/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 24 Jun 2003 22:37:33 -0000 1.13
+++ StandardHostDeployer.java 25 Jul 2003 13:54:57 -0000 1.14
@@ -282,7 +282,7 @@
// Make sure contextPath and directory/war names match when
// installing from the host appBase
- if (isAppBase && (host.getAutoDeploy() || host.getLiveDeploy())) {
+ if (isAppBase && host.getAutoDeploy()) {
String filename = contextFile.getName();
if (isWAR) {
filename = filename.substring(0,filename.length()-4);
@@ -666,8 +666,9 @@
host.getAppBase());
File contextFile = new File(context.getDocBase());
File baseDir = contextFile.getParentFile();
- if (appBase.getCanonicalPath().equals
- (baseDir.getCanonicalPath())) {
+ if ((baseDir == null)
+ || (appBase.getCanonicalPath().equals
+ (baseDir.getCanonicalPath()))) {
isAppBase = true;
}
@@ -676,9 +677,8 @@
isWAR = true;
}
// Only remove directory and/or war if they are located in the
- // Host's appBase and autoDeploy or liveDeploy are true
- if (isAppBase &&
- (host.getAutoDeploy() || host.getLiveDeploy())) {
+ // Host's appBase autoDeploy is true
+ if (isAppBase && host.getAutoDeploy()) {
String filename = contextFile.getName();
if (isWAR) {
filename = filename.substring(0,filename.length()-4);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
