remm 2003/06/22 09:41:36
Modified: webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java ManagerServlet.java
Log:
- Fix URL when doing a remote deploy (despite the error message, the app
would be correctly deployed a little bit later by the auto deployer).
- Undeploy now also removes the WAR.
Revision Changes Path
1.4 +5 -8
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
Index: HTMLManagerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HTMLManagerServlet.java 15 Jun 2003 18:31:45 -0000 1.3
+++ HTMLManagerServlet.java 22 Jun 2003 16:41:36 -0000 1.4
@@ -253,15 +253,13 @@
appBaseDir = new File(System.getProperty("catalina.base"),
appBase);
}
- File file = new File(appBaseDir,war);
+ File file = new File(appBaseDir, war);
if (file.exists()) {
message = sm.getString
("htmlManagerServlet.deployUploadWarExists",war);
break;
}
warUpload.write(file);
- war = file.getAbsolutePath();
- /*
try {
URL url = file.toURL();
war = url.toString();
@@ -270,7 +268,6 @@
file.delete();
throw e;
}
- */
break;
}
} catch(Exception e) {
1.3 +9 -31
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
Index: ManagerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ManagerServlet.java 15 Jun 2003 18:31:45 -0000 1.2
+++ ManagerServlet.java 22 Jun 2003 16:41:36 -0000 1.3
@@ -454,19 +454,6 @@
command));
}
- // Saving configuration
- /*
- Server server = ServerFactory.getServer();
- if ((server != null) && (server instanceof StandardServer)) {
- try {
- ((StandardServer) server).storeConfig();
- } catch (Exception e) {
- writer.println(sm.getString("managerServlet.saveFail",
- e.getMessage()));
- }
- }
- */
-
// Finish up the response
writer.flush();
writer.close();
@@ -1391,8 +1378,12 @@
deployer.remove(path);
if (docBaseDir.isDirectory()) {
undeployDir(docBaseDir);
+ // Delete the WAR file
+ File docBaseWar = new File(docBasePath + ".war");
+ docBaseWar.delete();
} else {
- docBaseDir.delete(); // Delete the WAR file
+ // Delete the WAR file
+ docBaseDir.delete();
}
File docBaseXml = new File(configBase, context.getPath() + ".xml");
docBaseXml.delete();
@@ -1404,19 +1395,6 @@
writer.println(sm.getString("managerServlet.exception",
t.toString()));
}
-
- // Saving configuration
- /*
- Server server = ServerFactory.getServer();
- if ((server != null) && (server instanceof StandardServer)) {
- try {
- ((StandardServer) server).storeConfig();
- } catch (Exception e) {
- writer.println(sm.getString("managerServlet.saveFail",
- e.getMessage()));
- }
- }
- */
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
