glenn 01/03/25 19:23:52
Modified: catalina/src/share/org/apache/catalina/startup
HostConfig.java
Log:
Improve webapp unpack WAR file behaviour and enhance manager servlet
Revision Changes Path
1.5 +10 -10
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HostConfig.java 2000/12/22 00:37:52 1.4
+++ HostConfig.java 2001/03/26 03:23:52 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
1.4 2000/12/22 00:37:52 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2000/12/22 00:37:52 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
1.5 2001/03/26 03:23:52 glenn Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/03/26 03:23:52 $
*
* ====================================================================
*
@@ -93,7 +93,7 @@
* of that Host, and the associated defined contexts.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2000/12/22 00:37:52 $
+ * @version $Revision: 1.5 $ $Date: 2001/03/26 03:23:52 $
*/
public final class HostConfig
@@ -291,7 +291,7 @@
log(sm.getString("hostConfig.deployDir", files[i]));
try {
URL url = new URL("file", null, dir.getCanonicalPath());
- ((Deployer) host).deploy(contextPath, url);
+ ((Deployer) host).install(contextPath, url);
} catch (Throwable t) {
log(sm.getString("hostConfig.deployDir.error", files[i]),
t);
@@ -315,7 +315,7 @@
try {
URL url = new URL("file", null, dir.getCanonicalPath());
url = new URL("jar:" + url.toString() + "!/");
- ((Deployer) host).deploy(contextPath, url);
+ ((Deployer) host).install(contextPath, url);
} catch (Throwable t) {
log(sm.getString("hostConfig.deployJar.error", files[i]),
t);
@@ -406,16 +406,16 @@
if (!(host instanceof Deployer))
return;
if (debug >= 1)
- log(sm.getString("hostConfig.undeploying"));
+ log(sm.getString("hostConfig.stopping"));
String contextPaths[] = ((Deployer) host).findDeployedApps();
for (int i = 0; i < contextPaths.length; i++) {
if (debug >= 1)
- log(sm.getString("hostConfig.undeploy", contextPaths[i]));
+ log(sm.getString("hostConfig.stop", contextPaths[i]));
try {
- ((Deployer) host).undeploy(contextPaths[i]);
+ ((Deployer) host).stop(contextPaths[i]);
} catch (Throwable t) {
- log(sm.getString("hostConfig.undeploy.error",
+ log(sm.getString("hostConfig.stop.error",
contextPaths[i]), t);
}
}
