cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2004/12/16 07:39:28 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - 32729: stop is optional and may fail, so it needs to be in a separate try/catch. Revision ChangesPath 1.24 +6 -2 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.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ManagerServlet.java 3 Dec 2004 15:35:25 - 1.23 +++ ManagerServlet.java 16 Dec 2004 15:39:28 - 1.24 @@ -1317,11 +1317,15 @@ } } -// Stop the context first to be nicer if (!isServiced(path)) { addServiced(path); try { +// Try to stop the context first to be nicer ((Lifecycle) context).stop(); +} catch (Throwable t) { +// Ignore +} +try { File war = new File(getAppBase(), getDocBase(path) + ".war"); File dir = new File(getAppBase(), getDocBase(path)); File xml = new File(configBase, getConfigFile(path) + ".xml"); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2004/12/16 07:49:36 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - Remove the remove method, and use the undeploy methos instead. Revision ChangesPath 1.25 +2 -56 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.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ManagerServlet.java 16 Dec 2004 15:39:28 - 1.24 +++ ManagerServlet.java 16 Dec 2004 15:49:36 - 1.25 @@ -32,7 +32,6 @@ import javax.naming.InitialContext; import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import javax.naming.directory.DirContext; import javax.servlet.ServletException; import javax.servlet.ServletInputStream; import javax.servlet.UnavailableException; @@ -56,8 +55,6 @@ import org.apache.catalina.util.ServerInfo; import org.apache.catalina.util.StringManager; import org.apache.commons.modeler.Registry; -import org.apache.naming.resources.ProxyDirContext; -import org.apache.naming.resources.WARDirContext; /** @@ -355,7 +352,7 @@ reload(writer, path); } else if (command.equals("/remove")) { // Deprecated -remove(writer, path); +undeploy(writer, path); } else if (command.equals("/resources")) { resources(writer, type); } else if (command.equals("/roles")) { @@ -893,15 +890,6 @@ ("managerServlet.noContext", displayPath)); return; } -DirContext resources = context.getResources(); -if (resources instanceof ProxyDirContext) { -resources = ((ProxyDirContext) resources).getDirContext(); -} -if (resources instanceof WARDirContext) { -writer.println(sm.getString - ("managerServlet.noReload", displayPath)); -return; -} // It isn't possible for the manager to reload itself if (context.getPath().equals(this.context.getPath())) { writer.println(sm.getString("managerServlet.noSelf")); @@ -912,48 +900,6 @@ (sm.getString("managerServlet.reloaded", displayPath)); } catch (Throwable t) { log("ManagerServlet.reload[" + displayPath + "]", t); -writer.println(sm.getString("managerServlet.exception", -t.toString())); -} - -} - - -/** - * Remove the web application at the specified context path. - * - * @param writer Writer to render to - * @param path Context path of the application to be removed - * @deprecated Replaced by undeploy - */ -protected void remove(PrintWriter writer, String path) { - -if (debug >= 1) -log("remove: Removing web application at '" + path + "'"); - -if ((path == null) || (!path.startsWith("/") && path.equals(""))) { -writer.println(sm.getString("managerServlet.invalidPath", path)); -return; -} -String displayPath = path; -if( path.equals("/") ) -path = ""; - -try { -Context context = (Context) host.findChild(path); -if (context == null) { -writer.println(sm.getString("managerServlet.noContext", displayPath)); -return; -} -// It isn't possible for the manager to remove itself -if (context.getPath().equals(this.context.getPath())) { -writer.println(sm.getString("managerServlet.noSelf")); -return; -} -host.removeChild(context); -writer.println(sm.getString("managerServlet.undeployed", displayPath)); -} catch (Throwable t) { -log("ManagerServlet.remove[" + displayPath + "]", t); writer.println(sm.getString("managerServlet.exception", t.toString())); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2004/12/03 07:35:25 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - Quick fix for bug 32505 (only occurs with the HTML manager). - Since I don't have anything urgent to do, I'll try to improve the capabilities of the deployInternal method (allow not specifying the path, for example). Revision ChangesPath 1.23 +4 -1 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.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ManagerServlet.java 23 Sep 2004 07:03:27 - 1.22 +++ ManagerServlet.java 3 Dec 2004 15:35:25 - 1.23 @@ -737,6 +737,9 @@ protected void deploy(PrintWriter writer, String config, String path, String war, boolean update) { +if (config != null && config.length() == 0) { +config = null; +} if (war != null && war.length() == 0) { war = null; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2004/09/02 14:50:49 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - It should be ok to call deploy with just config. Revision ChangesPath 1.21 +2 -2 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.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ManagerServlet.java 27 Jul 2004 17:53:15 - 1.20 +++ ManagerServlet.java 2 Sep 2004 21:50:49 - 1.21 @@ -341,7 +341,7 @@ if (command == null) { writer.println(sm.getString("managerServlet.noCommand")); } else if (command.equals("/deploy")) { -if (war != null) { +if (war != null || config != null) { deploy(writer, config, path, war, update); } else { deploy(writer, path, tag); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
yoavs 2004/08/30 13:18:54 Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml webapps/manager/WEB-INF/classes/org/apache/catalina/manager Tag: TOMCAT_5_0 ManagerServlet.java Log: Fix to ManagerServlet to not cache context.xml stream: Bugzilla 29526. Revision ChangesPath No revision No revision 1.70.2.18 +7 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70.2.17 retrieving revision 1.70.2.18 diff -u -r1.70.2.17 -r1.70.2.18 --- changelog.xml 30 Aug 2004 19:43:26 - 1.70.2.17 +++ changelog.xml 30 Aug 2004 20:18:53 - 1.70.2.18 @@ -35,6 +35,13 @@ + + + +29526: Manager redeployment locked JAR because of context.xml stream. (yoavs) + + + No revision No revision 1.18.2.1 +6 -2 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.18 retrieving revision 1.18.2.1 diff -u -r1.18 -r1.18.2.1 --- ManagerServlet.java 27 Apr 2004 23:02:24 - 1.18 +++ ManagerServlet.java 30 Aug 2004 20:18:54 - 1.18.2.1 @@ -27,6 +27,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.net.URL; +import java.net.URLConnection; import java.net.MalformedURLException; import java.util.Iterator; import java.util.jar.JarEntry; @@ -845,7 +846,10 @@ } contextXml = new URL(contextWar + "META-INF/context.xml"); -stream = contextXml.openStream(); +URLConnection jarUrlConnection=contextXml.openConnection(); +jarUrlConnection.setUseCaches(false); +stream = jarUrlConnection.getInputStream();; + // WAR contains META-INF/context.xml resource - install deployer.install(new URL(contextWar)); return; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2004/07/27 10:53:15 Modified:catalina/src/share/org/apache/catalina/startup ExpandWar.java HostConfig.java webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - Fixes to manager deploy. - Other small fixes. Revision ChangesPath 1.9 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ExpandWar.java Index: ExpandWar.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ExpandWar.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ExpandWar.java26 Jul 2004 10:56:54 - 1.8 +++ ExpandWar.java27 Jul 2004 17:53:14 - 1.9 @@ -209,7 +209,7 @@ result = dest.mkdir(); } else { files = new String[1]; -files[0] = src.getName(); +files[0] = ""; } if (files == null) { files = new String[0]; @@ -255,7 +255,7 @@ } - + /** * Delete the specified directory, including all of its contents and * subdirectories recursively. 1.41 +13 -6 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java Index: HostConfig.java === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- HostConfig.java 27 Jul 2004 11:22:53 - 1.40 +++ HostConfig.java 27 Jul 2004 17:53:15 - 1.41 @@ -921,8 +921,6 @@ File resource = new File(resources[i]); if (log.isDebugEnabled()) log.debug("Checking context[" + app.name + "] redeploy resource " + resource); -// FIXME: Limit, as before, resource removal to resources which are inside the -//Host appBase if (resource.exists()) { long lastModified = ((Long) app.redeployResources.get(resources[i])).longValue(); if ((!resource.isDirectory()) && resource.lastModified() > lastModified) { @@ -942,8 +940,11 @@ File current = new File(resources[j]); current = current.getCanonicalFile(); if ((current.getAbsolutePath().startsWith(appBase().getAbsolutePath())) -|| (current.getAbsolutePath().startsWith(configBase().getAbsolutePath( +|| (current.getAbsolutePath().startsWith(configBase().getAbsolutePath( { +if (log.isDebugEnabled()) +log.debug("Delete " + current); ExpandWar.delete(current); +} } catch (IOException e) { log.warn(sm.getString ("hostConfig.canonicalizing", app.name), e); @@ -969,8 +970,11 @@ File current = new File(resources[j]); current = current.getCanonicalFile(); if ((current.getAbsolutePath().startsWith(appBase().getAbsolutePath())) -|| (current.getAbsolutePath().startsWith(configBase().getAbsolutePath( +|| (current.getAbsolutePath().startsWith(configBase().getAbsolutePath( { +if (log.isDebugEnabled()) +log.debug("Delete " + current); ExpandWar.delete(current); +} } catch (IOException e) { log.warn(sm.getString ("hostConfig.canonicalizing", app.name), e); @@ -983,8 +987,11 @@ File current = new File(resources2[j]); current = current.getCanonicalFile(); if ((current.getAbsolutePath().startsWith(appBase().getAbsolutePath())) -|| (current.getAbsolutePath().startsWith(configBase().getAbsolutePath( +|| (current.getAbsolutePath().startsWith(configBase().getAbsolutePath( { +if (log.isDebugEnabled()) +log.debug("Delete " + current); ExpandWar.delete(current); +} } catch (IOException e)
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
markt 2004/04/27 16:02:24 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - Fix bug 20786. Manger webapp session output not formatted correctly for session inactive for <10 minutes. - Remove unused imports identified by Ecipse. - Ported from TC4. Revision ChangesPath 1.18 +2 -3 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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ManagerServlet.java 12 Apr 2004 22:05:49 - 1.17 +++ ManagerServlet.java 27 Apr 2004 23:02:24 - 1.18 @@ -28,7 +28,6 @@ import java.io.PrintWriter; import java.net.URL; import java.net.MalformedURLException; -import java.util.Enumeration; import java.util.Iterator; import java.util.jar.JarEntry; import java.util.jar.JarFile; @@ -1271,7 +1270,7 @@ } if (timeout[0] > 0) writer.println(sm.getString("managerServlet.sessiontimeout", -"<10" + timeout[0])); +"<10", "" + timeout[0])); for (int i = 1; i < timeout.length-1; i++) { if (timeout[i] > 0) writer.println(sm.getString("managerServlet.sessiontimeout", - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
luehe 2004/04/12 15:05:49 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: Fixed Bugzilla 28272 ("Deploy manager command should use context.xml from war file"): Added support for embedded META-INF/context.xml, as mentioned in manager-howto.html. If present, META-INF/context.xml is used only if neither "path" nor "config" params have been specified for the "deploy" action. Revision ChangesPath 1.17 +46 -4 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.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ManagerServlet.java 27 Feb 2004 14:59:07 - 1.16 +++ ManagerServlet.java 12 Apr 2004 22:05:49 - 1.17 @@ -22,6 +22,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.FileNotFoundException; import java.io.InputStream; import java.io.IOException; import java.io.PrintWriter; @@ -764,8 +765,12 @@ config + "'"); } } else { -log("install: Installing web application at '" + path + -"' from '" + war + "'"); +if (path != null && path.length() > 0) { +log("install: Installing web application at '" + path + +"' from '" + war + "'"); +} else { +log("install: Installing web application from '" + war + "'"); +} } } @@ -826,6 +831,44 @@ } if (path == null || path.length() == 0) { +if (deployer.isDeployXML()) { +// Use embedded META-INF/context.xml if present +URL contextXml = null; +InputStream stream = null; +try { +String contextWar = war; +if (war.startsWith("file:")) { +if (war.endsWith(".war")) { +contextWar = "jar:" + war + "!/"; +} else { +contextWar = war + '/'; +} +} +contextXml = new URL(contextWar + + "META-INF/context.xml"); +stream = contextXml.openStream(); +// WAR contains META-INF/context.xml resource - install +deployer.install(new URL(contextWar)); +return; +} catch (FileNotFoundException fnfe) { + // No META-INF/context.xml resource - keep going +} catch (Throwable t) { +log("ManagerServlet.configure[" + contextXml + "]", t); +writer.println(sm.getString("managerServlet.exception", +t.toString())); +return; +} finally { +if (stream != null) { +try { +stream.close(); +} catch (Throwable t) { +// do nothing +} +} + +} +} + int end = war.length(); String filename = war.toLowerCase(); if (filename.endsWith("!/")) { @@ -1642,6 +1685,5 @@ } return true; } - } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2004/01/23 14:39:01 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - Bug 26010: '_' was an inappropriate character to replace the path separator, since it's a common character in HTTP. Experiment with using '#' instead, which is client side only. Revision ChangesPath 1.15 +5 -5 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.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ManagerServlet.java 8 Jan 2004 11:09:03 - 1.14 +++ ManagerServlet.java 23 Jan 2004 22:39:01 - 1.15 @@ -1486,7 +1486,7 @@ if (path.equals("")) { basename = "ROOT"; } else { -basename = path.substring(1).replace('/', '_'); +basename = path.substring(1).replace('/', '#'); } return (basename); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2004/01/08 03:09:03 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - Undeploy should be called with the displayed path to be able to work on the root context. - Bug 25948. - Submitted by Peter Rossbach. Revision ChangesPath 1.14 +8 -8 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ManagerServlet.java 29 Nov 2003 08:33:48 - 1.13 +++ ManagerServlet.java 8 Jan 2004 11:09:03 - 1.14 @@ -617,7 +617,7 @@ Context context = deployer.findDeployedApp(path); if (update) { if (context != null) { -undeploy(writer, path); +undeploy(writer, displayPath); } context = deployer.findDeployedApp(path); } @@ -735,7 +735,7 @@ // Check if app already exists, or undeploy it if updating Context context = deployer.findDeployedApp(path); if (context != null) { -undeploy(writer, path); +undeploy(writer, displayPath); } // Copy WAR and XML to the host base @@ -912,7 +912,7 @@ Context context = deployer.findDeployedApp(path); if (update) { if (context != null) { -undeploy(writer, path); +undeploy(writer, displayPath); } context = deployer.findDeployedApp(path); } @@ -1599,7 +1599,7 @@ * specified file location. * * @param request The servlet request we are processing - * @param file The file into which we should store the uploaded WAR + * @param war The file into which we should store the uploaded WAR * * @exception IOException if an I/O error occurs during processing */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2003/11/29 00:33:48 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - 25078: "Fix" serverinfo. Revision ChangesPath 1.13 +6 -5 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.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ManagerServlet.java 22 Sep 2003 19:30:17 - 1.12 +++ ManagerServlet.java 29 Nov 2003 08:33:48 - 1.13 @@ -1211,7 +1211,8 @@ log("serverinfo"); try { StringBuffer props = new StringBuffer(); -props.append("Tomcat Version: "); +props.append("OK - Server info"); +props.append("\nTomcat Version: "); props.append(ServerInfo.getServerInfo()); props.append("\nOS Name: "); props.append(System.getProperty("os.name")); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2003/09/22 12:30:17 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - Code cleanup. - Fix for root context handling. Revision ChangesPath 1.12 +21 -17 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.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ManagerServlet.java 22 Sep 2003 12:34:45 - 1.11 +++ ManagerServlet.java 22 Sep 2003 19:30:17 - 1.12 @@ -611,12 +611,7 @@ String displayPath = path; if( path.equals("/") ) path = ""; -String basename = null; -if (path.equals("")) { -basename = "_"; -} else { -basename = path.substring(1).replace('/', '_'); -} +String basename = getConfigFile(path); // Check if app already exists, or undeploy it if updating Context context = deployer.findDeployedApp(path); @@ -724,12 +719,7 @@ String displayPath = path; if( path.equals("/") ) path = ""; -String basename = null; -if (path.equals("")) { -basename = "_"; -} else { -basename = path.substring(1).replace('/', '_'); -} +String basename = getConfigFile(path); // Calculate the base path File deployedPath = versioned; @@ -902,7 +892,7 @@ writer.println(sm.getString("managerServlet.invalidWar", war)); return; } -path = "/" + war.substring(beg,end); +path = "/" + war.substring(beg, end); if (path.equals("/ROOT")) { path = "/"; } @@ -1485,6 +1475,20 @@ // Support Methods + + +/** + * Given a context path, get the config file name. + */ +protected String getConfigFile(String path) { +String basename = null; +if (path.equals("")) { +basename = "ROOT"; +} else { +basename = path.substring(1).replace('/', '_'); +} +return (basename); +} /** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2003/09/19 07:17:24 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - Allow undeploying webapps when docBase isn't in the host appBase: their context file will be removed, but the docBase will not be removed. Revision ChangesPath 1.10 +16 -15 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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ManagerServlet.java 7 Sep 2003 18:47:14 - 1.9 +++ ManagerServlet.java 19 Sep 2003 14:17:24 - 1.10 @@ -1389,10 +1389,9 @@ docBaseDir = new File(appBaseDir, docBase); } String docBasePath = docBaseDir.getCanonicalPath(); +boolean deleteDir = true; if (!docBasePath.startsWith(deployedPath)) { -writer.println(sm.getString("managerServlet.noDocBase", -displayPath)); -return; +deleteDir = false; } // Remove this web application and its associated docBase @@ -1406,14 +1405,16 @@ } boolean dir = docBaseDir.isDirectory(); deployer.remove(path, true); -if (dir) { -undeployDir(docBaseDir); -// Delete the WAR file -File docBaseWar = new File(docBasePath + ".war"); -docBaseWar.delete(); -} else { -// Delete the WAR file -docBaseDir.delete(); +if (deleteDir) { +if (dir) { +undeployDir(docBaseDir); +// Delete the WAR file +File docBaseWar = new File(docBasePath + ".war"); +docBaseWar.delete(); +} else { +// Delete the WAR file +docBaseDir.delete(); +} } File docBaseXml = new File(context.getConfigFile()); docBaseXml.delete(); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2003/08/06 11:21:32 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - Create the appropriate dirs so that tagging works. - Generate the appropriate URLs so that deployment from a tagged WAR works. Revision ChangesPath 1.8 +27 -12 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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ManagerServlet.java 6 Aug 2003 17:50:21 - 1.7 +++ ManagerServlet.java 6 Aug 2003 18:21:32 - 1.8 @@ -592,6 +592,7 @@ File deployedPath = deployed; if (tag != null) { deployedPath = new File(versioned, tag); +deployedPath.mkdirs(); } // Upload the web application archive to a local WAR file @@ -693,7 +694,6 @@ // Find the local WAR file File localWar = new File(deployedPath, basename + ".war"); - // Find the local context deployment file (if any) File localXml = new File(configBase, basename + ".xml"); @@ -705,8 +705,7 @@ // Copy WAR and XML to the host base if (tag != null) { -deployedPath = deployed; -File localWarCopy = new File(deployedPath, basename + ".war"); +File localWarCopy = new File(deployed, basename + ".war"); copy(localWar, localWarCopy); try { extractXml(localWar, localXml); @@ -719,13 +718,29 @@ localWar = localWarCopy; } +// Compute URLs String war = null; -String config = null; -if (localWar.exists()) { -war = localWar.getAbsolutePath(); +try { +URL url = localWar.toURL(); +war = url.toString(); +war = "jar:" + war + "!/"; +} catch(MalformedURLException e) { +log("managerServlet.badUrl[" + displayPath + "]", e); +writer.println(sm.getString("managerServlet.exception", +e.toString())); +return; } -if (localXml.exists()) { -config = localXml.getAbsolutePath(); +String config = null; +try { +if (localXml.exists()) { +URL url = localXml.toURL(); +config = url.toString(); +} +} catch (MalformedURLException e) { +log("managerServlet.badUrl[" + displayPath + "]", e); +writer.println(sm.getString("managerServlet.exception", +e.toString())); +return; } // Deploy webapp - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2003/08/06 10:50:22 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - Cleanup URL handling, to be consistent with the HTML manager. - Don't send extra "OK" messages. - Fix update flag (which was always false; I think this was pointed out by someone before). - Use refactored code from the HTML manager so that the config URL is null if there's no context file. Revision ChangesPath 1.7 +32 -12 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ManagerServlet.java 25 Jul 2003 16:40:55 - 1.6 +++ ManagerServlet.java 6 Aug 2003 17:50:21 - 1.7 @@ -353,7 +353,7 @@ boolean update = false; if ((request.getParameter("update") != null) && (request.getParameter("update").equals("true"))) { -update = false; +update = true; } // Prepare our output writer to generate the response message @@ -435,7 +435,7 @@ boolean update = false; if ((request.getParameter("update") != null) && (request.getParameter("update").equals("true"))) { -update = false; +update = true; } // Prepare our output writer to generate the response message @@ -616,6 +616,18 @@ localWar = localWarCopy; } +String war = null; +try { +URL url = localWar.toURL(); +war = url.toString(); +war = "jar:" + war + "!/"; +} catch(MalformedURLException e) { +log("managerServlet.badUrl[" + displayPath + "]", e); +writer.println(sm.getString("managerServlet.exception", +e.toString())); +return; +} + // Extract the nested context deployment file (if any) File localXml = new File(configBase, basename + ".xml"); if (debug >= 2) { @@ -629,14 +641,21 @@ e.toString())); return; } +String config = null; +try { +if (localXml.exists()) { +URL url = localXml.toURL(); +config = url.toString(); +} +} catch (MalformedURLException e) { +log("managerServlet.badUrl[" + displayPath + "]", e); +writer.println(sm.getString("managerServlet.exception", +e.toString())); +return; +} // Deploy this web application -deploy(writer, localXml.getAbsolutePath(), path, - localWar.getAbsolutePath(), update); - -// Acknowledge successful completion of this deploy command -writer.println(sm.getString("managerServlet.deployed", -displayPath)); +deploy(writer, config, path, war, update); } @@ -792,6 +811,7 @@ log("ManagerServlet.configure[" + config + "]", t); writer.println(sm.getString("managerServlet.exception", t.toString())); +return; } } else { - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2003/07/25 09:40:56 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - The work directory wasn't removed on undeploy. Revision ChangesPath 1.6 +7 -6 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ManagerServlet.java 24 Jun 2003 23:17:23 - 1.5 +++ ManagerServlet.java 25 Jul 2003 16:40:55 - 1.6 @@ -1375,8 +1375,9 @@ writer.println(sm.getString("managerServlet.noSelf")); return; } -deployer.remove(path); -if (docBaseDir.isDirectory()) { +boolean dir = docBaseDir.isDirectory(); +deployer.remove(path, true); +if (dir) { undeployDir(docBaseDir); // Delete the WAR file File docBaseWar = new File(docBasePath + ".war"); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2003/06/24 16:17:23 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - Use the configFile when undeploying, to properly remove the config file even if it does not match the context path. Revision ChangesPath 1.5 +5 -5 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ManagerServlet.java 24 Jun 2003 22:22:14 - 1.4 +++ ManagerServlet.java 24 Jun 2003 23:17:23 - 1.5 @@ -1385,7 +1385,7 @@ // Delete the WAR file docBaseDir.delete(); } -File docBaseXml = new File(configBase, context.getPath() + ".xml"); +File docBaseXml = new File(context.getConfigFile()); docBaseXml.delete(); writer.println(sm.getString("managerServlet.undeployed", displayPath)); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java
remm2003/06/24 15:22:15 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager ManagerServlet.java Log: - Update the message keys (bug 21045). Revision ChangesPath 1.4 +7 -7 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ManagerServlet.java 22 Jun 2003 16:41:36 - 1.3 +++ ManagerServlet.java 24 Jun 2003 22:22:14 - 1.4 @@ -635,7 +635,7 @@ localWar.getAbsolutePath(), update); // Acknowledge successful completion of this deploy command -writer.println(sm.getString("managerServlet.installed", +writer.println(sm.getString("managerServlet.deployed", displayPath)); } @@ -855,7 +855,7 @@ try { deployer.install(path, new URL(war)); -writer.println(sm.getString("managerServlet.installed", +writer.println(sm.getString("managerServlet.deployed", displayPath)); } catch (Throwable t) { log("ManagerServlet.install[" + displayPath + "]", t); @@ -987,7 +987,7 @@ return; } deployer.remove(path,true); -writer.println(sm.getString("managerServlet.removed", displayPath)); +writer.println(sm.getString("managerServlet.undeployed", displayPath)); } catch (Throwable t) { log("ManagerServlet.remove[" + displayPath + "]", t); writer.println(sm.getString("managerServlet.exception", - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]