--- apache-tomcat-5.5.15-src/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HostManagerServlet.java 2006-01-03 08:15:14.000000000 -0700
+++ apache-tomcat-5.5.15-src/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HostManagerServlet.java 2006-02-03 12:47:55.000000000 -0700
@@ -62,11 +62,11 @@
* Create and add a new virtual host. The host-name attribute
* indicates the name of the new host. The host-aliases
* attribute is a comma separated list of the host alias names.
* The manager attribute is a boolean value indicating if the
* webapp manager will be installed in the newly created host (optional,
- * true by default).
+ * false by default).
*
/remove?name={host-name} - Remove a virtual host.
* The host-name attribute indicates the name of the host.
*
*
/list - List the virtual hosts installed on the server.
* Each host will be listed with the following format
@@ -261,11 +261,11 @@
* @param name
*/
protected void add(HttpServletRequest request, PrintWriter writer, String name, boolean htmlMode ) {
String aliases = request.getParameter("aliases");
String appBase = request.getParameter("appBase");
- boolean manager = booleanParameter(request, "manager", true, htmlMode);
+ boolean manager = booleanParameter(request, "manager", false, htmlMode);
boolean autoDeploy = booleanParameter(request, "autoDeploy", true, htmlMode);
boolean deployOnStartup = booleanParameter(request, "deployOnStartup", true, htmlMode);
boolean deployXML = booleanParameter(request, "deployXML", true, htmlMode);
boolean unpackWARs = booleanParameter(request, "unpackWARs", true, htmlMode);
boolean xmlNamespaceAware = booleanParameter(request, "xmlNamespaceAware", false, htmlMode);
--- apache-tomcat-5.5.15-src/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java 2006-01-03 08:15:14.000000000 -0700
+++ apache-tomcat-5.5.15-src/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java 2006-02-04 08:29:56.000000000 -0700
@@ -1,7 +1,7 @@
/*
- * Copyright 1999,2004-2005 The Apache Software Foundation.
+ * Copyright 1999,2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
@@ -254,15 +254,18 @@
buf.append(aliases[0]);
for (int j = 1; j < aliases.length; j++) {
buf.append(", ").append(aliases[j]);
}
}
+ if (buf.length()==0) {
+ buf.append(" ");
+ }
args[1] = buf.toString();
writer.print
(MessageFormat.format(HOSTS_ROW_DETAILS_SECTION, args));
- args = new Object[6];
+ args = new Object[7];
args[0] = response.encodeURL
(request.getContextPath() +
"/html/start?name=" + hostName);
args[1] = hostsStart;
args[2] = response.encodeURL
@@ -271,10 +274,11 @@
args[3] = hostsStop;
args[4] = response.encodeURL
(request.getContextPath() +
"/html/remove?name=" + hostName);
args[5] = hostsRemove;
+ args[6] = hostName;
if (host == this.host) {
writer.print(MessageFormat.format(
MANAGER_HOST_ROW_BUTTON_SECTION, args));
} else {
writer.print(MessageFormat.format(
@@ -317,11 +321,14 @@
writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
args[0] = sm.getString("htmlHostManagerServlet.addXmlValidation");
args[1] = "xmlValidation";
args[2] = "";
writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
-
+ args[0] = sm.getString("htmlHostManagerServlet.addManager");
+ args[1] = "manager";
+ args[2] = "checked";
+ writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
args = new Object[1];
args[0] = sm.getString("htmlHostManagerServlet.addButton");
writer.print(MessageFormat.format(ADD_SECTION_END, args));
@@ -373,11 +380,11 @@
"
{2}
\n" +
"\n";
private static final String HOSTS_ROW_DETAILS_SECTION =
"