[pkg-java] r7116 - in tags/tomcat5.5: . 5.5.26-3/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager 5.5.26-3/debian
marcusb-guest at alioth.debian.org
marcusb-guest at alioth.debian.org
Sun Oct 5 12:09:52 UTC 2008
Author: marcusb-guest
Date: 2008-10-05 12:09:51 +0000 (Sun, 05 Oct 2008)
New Revision: 7116
Added:
tags/tomcat5.5/5.5.26-3/
tags/tomcat5.5/5.5.26-3/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java
tags/tomcat5.5/5.5.26-3/debian/changelog
Removed:
tags/tomcat5.5/5.5.26-3/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java
tags/tomcat5.5/5.5.26-3/debian/changelog
Log:
Tag release.
Copied: tags/tomcat5.5/5.5.26-3 (from rev 7114, trunk/tomcat5.5)
Deleted: tags/tomcat5.5/5.5.26-3/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java
===================================================================
--- trunk/tomcat5.5/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java 2008-10-05 11:53:44 UTC (rev 7114)
+++ tags/tomcat5.5/5.5.26-3/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java 2008-10-05 12:09:51 UTC (rev 7116)
@@ -1,486 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.catalina.hostmanager;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.MessageFormat;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.catalina.Container;
-import org.apache.catalina.Host;
-import org.apache.catalina.util.RequestUtil;
-import org.apache.catalina.util.ServerInfo;
-
-/**
-* Servlet that enables remote management of the virtual hosts deployed
-* on the server. Normally, this functionality will be protected by a security
-* constraint in the web application deployment descriptor. However,
-* this requirement can be relaxed during testing.
-* <p>
-* The difference between the <code>HostManagerServlet</code> and this
-* Servlet is that this Servlet prints out a HTML interface which
-* makes it easier to administrate.
-* <p>
-* However if you use a software that parses the output of
-* <code>HostManagerServlet</code> you won't be able to upgrade
-* to this Servlet since the output are not in the
-* same format as from <code>HostManagerServlet</code>
-*
-* @author Bip Thelin
-* @author Malcolm Edgar
-* @author Glenn L. Nielsen
-* @author Peter Rossbach
-* @version $Revision: 557458 $, $Date: 2007-07-18 20:21:58 -0600 (Wed, 18 Jul 2007) $
-* @see ManagerServlet
-*/
-
-public final class HTMLHostManagerServlet extends HostManagerServlet {
-
- // --------------------------------------------------------- Public Methods
-
- /**
- * Process a GET request for the specified resource.
- *
- * @param request The servlet request we are processing
- * @param response The servlet response we are creating
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet-specified error occurs
- */
- public void doGet(HttpServletRequest request,
- HttpServletResponse response)
- throws IOException, ServletException {
-
- // Identify the request parameters that we need
- String command = request.getPathInfo();
-
- String name = request.getParameter("name");
-
- // Prepare our output writer to generate the response message
- response.setContentType("text/html; charset=" + Constants.CHARSET);
-
- String message = "";
- // Process the requested command
- if (command == null) {
- } else if (command.equals("/add")) {
- message = add(request, name);
- } else if (command.equals("/remove")) {
- message = remove(name);
- } else if (command.equals("/list")) {
- } else if (command.equals("/start")) {
- message = start(name);
- } else if (command.equals("/stop")) {
- message = stop(name);
- } else {
- message =
- sm.getString("hostManagerServlet.unknownCommand", command);
- }
-
- list(request, response, message);
- }
-
-
- /**
- * Add a host using the specified parameters.
- *
- * @param name host name
- */
- protected String add(HttpServletRequest request,String name) {
-
- StringWriter stringWriter = new StringWriter();
- PrintWriter printWriter = new PrintWriter(stringWriter);
-
- super.add(request,printWriter,name,true);
-
- return stringWriter.toString();
- }
-
-
- /**
- * Remove the specified host.
- *
- * @param writer Writer to render results to
- * @param name host name
- */
- protected String remove(String name) {
-
- StringWriter stringWriter = new StringWriter();
- PrintWriter printWriter = new PrintWriter(stringWriter);
-
- super.remove(printWriter, name);
-
- return stringWriter.toString();
- }
-
-
- /**
- * Start the host with the specified name.
- *
- * @param name Host name
- */
- protected String start(String name) {
-
- StringWriter stringWriter = new StringWriter();
- PrintWriter printWriter = new PrintWriter(stringWriter);
-
- super.start(printWriter, name);
-
- return stringWriter.toString();
- }
-
-
- /**
- * Stop the host with the specified name.
- *
- * @param name Host name
- */
- protected String stop(String name) {
-
- StringWriter stringWriter = new StringWriter();
- PrintWriter printWriter = new PrintWriter(stringWriter);
-
- super.stop(printWriter, name);
-
- return stringWriter.toString();
- }
-
-
- /**
- * Render a HTML list of the currently active Contexts in our virtual host,
- * and memory and server status information.
- *
- * @param request The request
- * @param response The response
- * @param message a message to display
- */
- public void list(HttpServletRequest request,
- HttpServletResponse response,
- String message) throws IOException {
-
- PrintWriter writer = response.getWriter();
-
- // HTML Header Section
- writer.print(Constants.HTML_HEADER_SECTION);
-
- // Body Header Section
- Object[] args = new Object[2];
- args[0] = request.getContextPath();
- args[1] = sm.getString("htmlHostManagerServlet.title");
- writer.print(MessageFormat.format
- (Constants.BODY_HEADER_SECTION, args));
-
- // Message Section
- args = new Object[3];
- args[0] = sm.getString("htmlHostManagerServlet.messageLabel");
- if (message == null || message.length() == 0) {
- args[1] = "OK";
- } else {
- args[1] = RequestUtil.filter(message);
- }
- writer.print(MessageFormat.format(Constants.MESSAGE_SECTION, args));
-
- // Manager Section
- args = new Object[9];
- args[0] = sm.getString("htmlHostManagerServlet.manager");
- args[1] = response.encodeURL(request.getContextPath() + "/html/list");
- args[2] = sm.getString("htmlHostManagerServlet.list");
- args[3] = response.encodeURL
- (request.getContextPath() + "/" +
- sm.getString("htmlHostManagerServlet.helpHtmlManagerFile"));
- args[4] = sm.getString("htmlHostManagerServlet.helpHtmlManager");
- args[5] = response.encodeURL
- (request.getContextPath() + "/" +
- sm.getString("htmlHostManagerServlet.helpManagerFile"));
- args[6] = sm.getString("htmlHostManagerServlet.helpManager");
- args[7] = response.encodeURL("/manager/status");
- args[8] = sm.getString("statusServlet.title");
- writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
-
- // Hosts Header Section
- args = new Object[3];
- args[0] = sm.getString("htmlHostManagerServlet.hostName");
- args[1] = sm.getString("htmlHostManagerServlet.hostAliases");
- args[2] = sm.getString("htmlHostManagerServlet.hostTasks");
- writer.print(MessageFormat.format(HOSTS_HEADER_SECTION, args));
-
- // Hosts Row Section
- // Create sorted map of host names.
- Container[] children = engine.findChildren();
- String hostNames[] = new String[children.length];
- for (int i = 0; i < children.length; i++)
- hostNames[i] = children[i].getName();
-
- TreeMap sortedHostNamesMap = new TreeMap();
-
- for (int i = 0; i < hostNames.length; i++) {
- String displayPath = hostNames[i];
- sortedHostNamesMap.put(displayPath, hostNames[i]);
- }
-
- String hostsStart = sm.getString("htmlHostManagerServlet.hostsStart");
- String hostsStop = sm.getString("htmlHostManagerServlet.hostsStop");
- String hostsRemove = sm.getString("htmlHostManagerServlet.hostsRemove");
-
- Iterator iterator = sortedHostNamesMap.entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry entry = (Map.Entry) iterator.next();
- String hostName = (String) entry.getKey();
- Host host = (Host) engine.findChild(hostName);
-
- if (host != null ) {
- args = new Object[2];
- args[0] = RequestUtil.filter(hostName);
- String[] aliases = host.findAliases();
- StringBuffer buf = new StringBuffer();
- if (aliases.length > 0) {
- 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();
- } else {
- args[1] = RequestUtil.filter(buf.toString());
- }
-
- writer.print
- (MessageFormat.format(HOSTS_ROW_DETAILS_SECTION, args));
-
- args = new Object[7];
- args[0] = response.encodeURL
- (request.getContextPath() +
- "/html/start?name=" + hostName);
- args[1] = hostsStart;
- args[2] = response.encodeURL
- (request.getContextPath() +
- "/html/stop?name=" + hostName);
- 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(
- HOSTS_ROW_BUTTON_SECTION, args));
- }
-
- }
- }
-
- // Add Section
- args = new Object[6];
- args[0] = sm.getString("htmlHostManagerServlet.addTitle");
- args[1] = sm.getString("htmlHostManagerServlet.addHost");
- args[2] = response.encodeURL(request.getContextPath() + "/html/add");
- args[3] = sm.getString("htmlHostManagerServlet.addName");
- args[4] = sm.getString("htmlHostManagerServlet.addAliases");
- args[5] = sm.getString("htmlHostManagerServlet.addAppBase");
- writer.print(MessageFormat.format(ADD_SECTION_START, args));
-
- args = new Object[3];
- args[0] = sm.getString("htmlHostManagerServlet.addAutoDeploy");
- args[1] = "autoDeploy";
- args[2] = "checked";
- writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
- args[0] = sm.getString("htmlHostManagerServlet.addDeployOnStartup");
- args[1] = "deployOnStartup";
- args[2] = "checked";
- writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
- args[0] = sm.getString("htmlHostManagerServlet.addDeployXML");
- args[1] = "deployXML";
- args[2] = "checked";
- writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
- args[0] = sm.getString("htmlHostManagerServlet.addUnpackWARs");
- args[1] = "unpackWARs";
- args[2] = "checked";
- writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
- args[0] = sm.getString("htmlHostManagerServlet.addXmlNamespaceAware");
- args[1] = "xmlNamespaceAware";
- args[2] = "";
- 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));
-
- // Server Header Section
- args = new Object[7];
- args[0] = sm.getString("htmlHostManagerServlet.serverTitle");
- args[1] = sm.getString("htmlHostManagerServlet.serverVersion");
- args[2] = sm.getString("htmlHostManagerServlet.serverJVMVersion");
- args[3] = sm.getString("htmlHostManagerServlet.serverJVMVendor");
- args[4] = sm.getString("htmlHostManagerServlet.serverOSName");
- args[5] = sm.getString("htmlHostManagerServlet.serverOSVersion");
- args[6] = sm.getString("htmlHostManagerServlet.serverOSArch");
- writer.print(MessageFormat.format
- (Constants.SERVER_HEADER_SECTION, args));
-
- // Server Row Section
- args = new Object[6];
- args[0] = ServerInfo.getServerInfo();
- args[1] = System.getProperty("java.runtime.version");
- args[2] = System.getProperty("java.vm.vendor");
- args[3] = System.getProperty("os.name");
- args[4] = System.getProperty("os.version");
- args[5] = System.getProperty("os.arch");
- writer.print(MessageFormat.format(Constants.SERVER_ROW_SECTION, args));
-
- // HTML Tail Section
- writer.print(Constants.HTML_TAIL_SECTION);
-
- // Finish up the response
- writer.flush();
- writer.close();
- }
-
-
- // ------------------------------------------------------ Private Constants
-
- // These HTML sections are broken in relatively small sections, because of
- // limited number of subsitutions MessageFormat can process
- // (maximium of 10).
-
- private static final String HOSTS_HEADER_SECTION =
- "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
- "<tr>\n" +
- " <td colspan=\"5\" class=\"title\">{0}</td>\n" +
- "</tr>\n" +
- "<tr>\n" +
- " <td class=\"header-left\"><small>{0}</small></td>\n" +
- " <td class=\"header-center\"><small>{1}</small></td>\n" +
- " <td class=\"header-center\"><small>{2}</small></td>\n" +
- "</tr>\n";
-
- private static final String HOSTS_ROW_DETAILS_SECTION =
- "<tr>\n" +
- " <td class=\"row-left\"><small><a href=\"http://{0}\">{0}</a>" +
- "</small></td>\n" +
- " <td class=\"row-center\"><small>{1}</small></td>\n";
-
- private static final String MANAGER_HOST_ROW_BUTTON_SECTION =
- " <td class=\"row-left\">\n" +
- " <small>\n" +
- " {1} \n" +
- " {3} \n" +
- " {5} \n" +
- " </small>\n" +
- " </td>\n" +
- "</tr>\n";
-
- private static final String HOSTS_ROW_BUTTON_SECTION =
- " <td class=\"row-left\" NOWRAP>\n" +
- " <small>\n" +
- " <a href=\"{0}\" onclick=\"return(confirm(''{1} {6}\\n\\nAre you sure?''))\">{1}</a> \n" +
- " <a href=\"{2}\" onclick=\"return(confirm(''{3} {6}\\n\\nAre you sure?''))\">{3}</a> \n" +
- " <a href=\"{4}\" onclick=\"return(confirm(''{5} {6}\\n\\nAre you sure?''))\">{5}</a> \n" +
- " </small>\n" +
- " </td>\n" +
- "</tr>\n";
-
- private static final String ADD_SECTION_START =
- "</table>\n" +
- "<br>\n" +
- "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
- "<tr>\n" +
- " <td colspan=\"2\" class=\"title\">{0}</td>\n" +
- "</tr>\n" +
- "<tr>\n" +
- " <td colspan=\"2\" class=\"header-left\"><small>{1}</small></td>\n" +
- "</tr>\n" +
- "<tr>\n" +
- " <td colspan=\"2\">\n" +
- "<form method=\"get\" action=\"{2}\">\n" +
- "<table cellspacing=\"0\" cellpadding=\"3\">\n" +
- "<tr>\n" +
- " <td class=\"row-right\">\n" +
- " <small>{3}</small>\n" +
- " </td>\n" +
- " <td class=\"row-left\">\n" +
- " <input type=\"text\" name=\"name\" size=\"20\">\n" +
- " </td>\n" +
- "</tr>\n" +
- "<tr>\n" +
- " <td class=\"row-right\">\n" +
- " <small>{4}</small>\n" +
- " </td>\n" +
- " <td class=\"row-left\">\n" +
- " <input type=\"text\" name=\"aliases\" size=\"64\">\n" +
- " </td>\n" +
- "</tr>\n" +
- "<tr>\n" +
- " <td class=\"row-right\">\n" +
- " <small>{5}</small>\n" +
- " </td>\n" +
- " <td class=\"row-left\">\n" +
- " <input type=\"text\" name=\"appBase\" size=\"64\">\n" +
- " </td>\n" +
- "</tr>\n" ;
-
- private static final String ADD_SECTION_BOOLEAN =
- "<tr>\n" +
- " <td class=\"row-right\">\n" +
- " <small>{0}</small>\n" +
- " </td>\n" +
- " <td class=\"row-left\">\n" +
- " <input type=\"checkbox\" name=\"{1}\" {2}>\n" +
- " </td>\n" +
- "</tr>\n" ;
-
- private static final String ADD_SECTION_END =
- "<tr>\n" +
- " <td class=\"row-right\">\n" +
- " \n" +
- " </td>\n" +
- " <td class=\"row-left\">\n" +
- " <input type=\"submit\" value=\"{0}\">\n" +
- " </td>\n" +
- "</tr>\n" +
- "</table>\n" +
- "</form>\n" +
- "</td>\n" +
- "</tr>\n" +
- "</table>\n" +
- "<br>\n" +
- "\n";
-
-}
Copied: tags/tomcat5.5/5.5.26-3/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java (from rev 7115, trunk/tomcat5.5/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java)
===================================================================
--- tags/tomcat5.5/5.5.26-3/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java (rev 0)
+++ tags/tomcat5.5/5.5.26-3/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java 2008-10-05 12:09:51 UTC (rev 7116)
@@ -0,0 +1,490 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.catalina.hostmanager;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.URLEncoder;
+import java.text.MessageFormat;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.Container;
+import org.apache.catalina.Host;
+import org.apache.catalina.util.RequestUtil;
+import org.apache.catalina.util.ServerInfo;
+
+/**
+* Servlet that enables remote management of the virtual hosts deployed
+* on the server. Normally, this functionality will be protected by a security
+* constraint in the web application deployment descriptor. However,
+* this requirement can be relaxed during testing.
+* <p>
+* The difference between the <code>HostManagerServlet</code> and this
+* Servlet is that this Servlet prints out a HTML interface which
+* makes it easier to administrate.
+* <p>
+* However if you use a software that parses the output of
+* <code>HostManagerServlet</code> you won't be able to upgrade
+* to this Servlet since the output are not in the
+* same format as from <code>HostManagerServlet</code>
+*
+* @author Bip Thelin
+* @author Malcolm Edgar
+* @author Glenn L. Nielsen
+* @author Peter Rossbach
+* @version $Revision: 557458 $, $Date: 2007-07-18 20:21:58 -0600 (Wed, 18 Jul 2007) $
+* @see ManagerServlet
+*/
+
+public final class HTMLHostManagerServlet extends HostManagerServlet {
+
+ // --------------------------------------------------------- Public Methods
+
+ /**
+ * Process a GET request for the specified resource.
+ *
+ * @param request The servlet request we are processing
+ * @param response The servlet response we are creating
+ *
+ * @exception IOException if an input/output error occurs
+ * @exception ServletException if a servlet-specified error occurs
+ */
+ public void doGet(HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException, ServletException {
+
+ // Identify the request parameters that we need
+ String command = request.getPathInfo();
+
+ String name = request.getParameter("name");
+
+ // Prepare our output writer to generate the response message
+ response.setContentType("text/html; charset=" + Constants.CHARSET);
+
+ String message = "";
+ // Process the requested command
+ if (command == null) {
+ } else if (command.equals("/add")) {
+ message = add(request, name);
+ } else if (command.equals("/remove")) {
+ message = remove(name);
+ } else if (command.equals("/list")) {
+ } else if (command.equals("/start")) {
+ message = start(name);
+ } else if (command.equals("/stop")) {
+ message = stop(name);
+ } else {
+ message =
+ sm.getString("hostManagerServlet.unknownCommand", command);
+ }
+
+ list(request, response, message);
+ }
+
+
+ /**
+ * Add a host using the specified parameters.
+ *
+ * @param name host name
+ */
+ protected String add(HttpServletRequest request,String name) {
+
+ StringWriter stringWriter = new StringWriter();
+ PrintWriter printWriter = new PrintWriter(stringWriter);
+
+ super.add(request,printWriter,name,true);
+
+ return stringWriter.toString();
+ }
+
+
+ /**
+ * Remove the specified host.
+ *
+ * @param writer Writer to render results to
+ * @param name host name
+ */
+ protected String remove(String name) {
+
+ StringWriter stringWriter = new StringWriter();
+ PrintWriter printWriter = new PrintWriter(stringWriter);
+
+ super.remove(printWriter, name);
+
+ return stringWriter.toString();
+ }
+
+
+ /**
+ * Start the host with the specified name.
+ *
+ * @param name Host name
+ */
+ protected String start(String name) {
+
+ StringWriter stringWriter = new StringWriter();
+ PrintWriter printWriter = new PrintWriter(stringWriter);
+
+ super.start(printWriter, name);
+
+ return stringWriter.toString();
+ }
+
+
+ /**
+ * Stop the host with the specified name.
+ *
+ * @param name Host name
+ */
+ protected String stop(String name) {
+
+ StringWriter stringWriter = new StringWriter();
+ PrintWriter printWriter = new PrintWriter(stringWriter);
+
+ super.stop(printWriter, name);
+
+ return stringWriter.toString();
+ }
+
+
+ /**
+ * Render a HTML list of the currently active Contexts in our virtual host,
+ * and memory and server status information.
+ *
+ * @param request The request
+ * @param response The response
+ * @param message a message to display
+ */
+ public void list(HttpServletRequest request,
+ HttpServletResponse response,
+ String message) throws IOException {
+
+ PrintWriter writer = response.getWriter();
+
+ // HTML Header Section
+ writer.print(Constants.HTML_HEADER_SECTION);
+
+ // Body Header Section
+ Object[] args = new Object[2];
+ args[0] = request.getContextPath();
+ args[1] = sm.getString("htmlHostManagerServlet.title");
+ writer.print(MessageFormat.format
+ (Constants.BODY_HEADER_SECTION, args));
+
+ // Message Section
+ args = new Object[3];
+ args[0] = sm.getString("htmlHostManagerServlet.messageLabel");
+ if (message == null || message.length() == 0) {
+ args[1] = "OK";
+ } else {
+ args[1] = RequestUtil.filter(message);
+ }
+ writer.print(MessageFormat.format(Constants.MESSAGE_SECTION, args));
+
+ // Manager Section
+ args = new Object[9];
+ args[0] = sm.getString("htmlHostManagerServlet.manager");
+ args[1] = response.encodeURL(request.getContextPath() + "/html/list");
+ args[2] = sm.getString("htmlHostManagerServlet.list");
+ args[3] = response.encodeURL
+ (request.getContextPath() + "/" +
+ sm.getString("htmlHostManagerServlet.helpHtmlManagerFile"));
+ args[4] = sm.getString("htmlHostManagerServlet.helpHtmlManager");
+ args[5] = response.encodeURL
+ (request.getContextPath() + "/" +
+ sm.getString("htmlHostManagerServlet.helpManagerFile"));
+ args[6] = sm.getString("htmlHostManagerServlet.helpManager");
+ args[7] = response.encodeURL("/manager/status");
+ args[8] = sm.getString("statusServlet.title");
+ writer.print(MessageFormat.format(Constants.MANAGER_SECTION, args));
+
+ // Hosts Header Section
+ args = new Object[3];
+ args[0] = sm.getString("htmlHostManagerServlet.hostName");
+ args[1] = sm.getString("htmlHostManagerServlet.hostAliases");
+ args[2] = sm.getString("htmlHostManagerServlet.hostTasks");
+ writer.print(MessageFormat.format(HOSTS_HEADER_SECTION, args));
+
+ // Hosts Row Section
+ // Create sorted map of host names.
+ Container[] children = engine.findChildren();
+ String hostNames[] = new String[children.length];
+ for (int i = 0; i < children.length; i++)
+ hostNames[i] = children[i].getName();
+
+ TreeMap sortedHostNamesMap = new TreeMap();
+
+ for (int i = 0; i < hostNames.length; i++) {
+ String displayPath = hostNames[i];
+ sortedHostNamesMap.put(displayPath, hostNames[i]);
+ }
+
+ String hostsStart = sm.getString("htmlHostManagerServlet.hostsStart");
+ String hostsStop = sm.getString("htmlHostManagerServlet.hostsStop");
+ String hostsRemove = sm.getString("htmlHostManagerServlet.hostsRemove");
+
+ Iterator iterator = sortedHostNamesMap.entrySet().iterator();
+ while (iterator.hasNext()) {
+ Map.Entry entry = (Map.Entry) iterator.next();
+ String hostName = (String) entry.getKey();
+ Host host = (Host) engine.findChild(hostName);
+
+ if (host != null ) {
+ args = new Object[2];
+ args[0] = RequestUtil.filter(hostName);
+ String[] aliases = host.findAliases();
+ StringBuffer buf = new StringBuffer();
+ if (aliases.length > 0) {
+ 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();
+ } else {
+ args[1] = RequestUtil.filter(buf.toString());
+ }
+
+ writer.print
+ (MessageFormat.format(HOSTS_ROW_DETAILS_SECTION, args));
+
+ args = new Object[7];
+ args[0] = response.encodeURL
+ (request.getContextPath() +
+ "/html/start?name=" +
+ URLEncoder.encode(hostName, "UTF-8"));
+ args[1] = hostsStart;
+ args[2] = response.encodeURL
+ (request.getContextPath() +
+ "/html/stop?name=" +
+ URLEncoder.encode(hostName, "UTF-8"));
+ args[3] = hostsStop;
+ args[4] = response.encodeURL
+ (request.getContextPath() +
+ "/html/remove?name=" +
+ URLEncoder.encode(hostName, "UTF-8"));
+ args[5] = hostsRemove;
+ args[6] = RequestUtil.filter(hostName);
+ if (host == this.host) {
+ writer.print(MessageFormat.format(
+ MANAGER_HOST_ROW_BUTTON_SECTION, args));
+ } else {
+ writer.print(MessageFormat.format(
+ HOSTS_ROW_BUTTON_SECTION, args));
+ }
+
+ }
+ }
+
+ // Add Section
+ args = new Object[6];
+ args[0] = sm.getString("htmlHostManagerServlet.addTitle");
+ args[1] = sm.getString("htmlHostManagerServlet.addHost");
+ args[2] = response.encodeURL(request.getContextPath() + "/html/add");
+ args[3] = sm.getString("htmlHostManagerServlet.addName");
+ args[4] = sm.getString("htmlHostManagerServlet.addAliases");
+ args[5] = sm.getString("htmlHostManagerServlet.addAppBase");
+ writer.print(MessageFormat.format(ADD_SECTION_START, args));
+
+ args = new Object[3];
+ args[0] = sm.getString("htmlHostManagerServlet.addAutoDeploy");
+ args[1] = "autoDeploy";
+ args[2] = "checked";
+ writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
+ args[0] = sm.getString("htmlHostManagerServlet.addDeployOnStartup");
+ args[1] = "deployOnStartup";
+ args[2] = "checked";
+ writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
+ args[0] = sm.getString("htmlHostManagerServlet.addDeployXML");
+ args[1] = "deployXML";
+ args[2] = "checked";
+ writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
+ args[0] = sm.getString("htmlHostManagerServlet.addUnpackWARs");
+ args[1] = "unpackWARs";
+ args[2] = "checked";
+ writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
+ args[0] = sm.getString("htmlHostManagerServlet.addXmlNamespaceAware");
+ args[1] = "xmlNamespaceAware";
+ args[2] = "";
+ 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));
+
+ // Server Header Section
+ args = new Object[7];
+ args[0] = sm.getString("htmlHostManagerServlet.serverTitle");
+ args[1] = sm.getString("htmlHostManagerServlet.serverVersion");
+ args[2] = sm.getString("htmlHostManagerServlet.serverJVMVersion");
+ args[3] = sm.getString("htmlHostManagerServlet.serverJVMVendor");
+ args[4] = sm.getString("htmlHostManagerServlet.serverOSName");
+ args[5] = sm.getString("htmlHostManagerServlet.serverOSVersion");
+ args[6] = sm.getString("htmlHostManagerServlet.serverOSArch");
+ writer.print(MessageFormat.format
+ (Constants.SERVER_HEADER_SECTION, args));
+
+ // Server Row Section
+ args = new Object[6];
+ args[0] = ServerInfo.getServerInfo();
+ args[1] = System.getProperty("java.runtime.version");
+ args[2] = System.getProperty("java.vm.vendor");
+ args[3] = System.getProperty("os.name");
+ args[4] = System.getProperty("os.version");
+ args[5] = System.getProperty("os.arch");
+ writer.print(MessageFormat.format(Constants.SERVER_ROW_SECTION, args));
+
+ // HTML Tail Section
+ writer.print(Constants.HTML_TAIL_SECTION);
+
+ // Finish up the response
+ writer.flush();
+ writer.close();
+ }
+
+
+ // ------------------------------------------------------ Private Constants
+
+ // These HTML sections are broken in relatively small sections, because of
+ // limited number of subsitutions MessageFormat can process
+ // (maximium of 10).
+
+ private static final String HOSTS_HEADER_SECTION =
+ "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
+ "<tr>\n" +
+ " <td colspan=\"5\" class=\"title\">{0}</td>\n" +
+ "</tr>\n" +
+ "<tr>\n" +
+ " <td class=\"header-left\"><small>{0}</small></td>\n" +
+ " <td class=\"header-center\"><small>{1}</small></td>\n" +
+ " <td class=\"header-center\"><small>{2}</small></td>\n" +
+ "</tr>\n";
+
+ private static final String HOSTS_ROW_DETAILS_SECTION =
+ "<tr>\n" +
+ " <td class=\"row-left\"><small><a href=\"http://{0}\">{0}</a>" +
+ "</small></td>\n" +
+ " <td class=\"row-center\"><small>{1}</small></td>\n";
+
+ private static final String MANAGER_HOST_ROW_BUTTON_SECTION =
+ " <td class=\"row-left\">\n" +
+ " <small>\n" +
+ " {1} \n" +
+ " {3} \n" +
+ " {5} \n" +
+ " </small>\n" +
+ " </td>\n" +
+ "</tr>\n";
+
+ private static final String HOSTS_ROW_BUTTON_SECTION =
+ " <td class=\"row-left\" NOWRAP>\n" +
+ " <small>\n" +
+ " <a href=\"{0}\" onclick=\"return(confirm(''{1} {6}\\n\\nAre you sure?''))\">{1}</a> \n" +
+ " <a href=\"{2}\" onclick=\"return(confirm(''{3} {6}\\n\\nAre you sure?''))\">{3}</a> \n" +
+ " <a href=\"{4}\" onclick=\"return(confirm(''{5} {6}\\n\\nAre you sure?''))\">{5}</a> \n" +
+ " </small>\n" +
+ " </td>\n" +
+ "</tr>\n";
+
+ private static final String ADD_SECTION_START =
+ "</table>\n" +
+ "<br>\n" +
+ "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
+ "<tr>\n" +
+ " <td colspan=\"2\" class=\"title\">{0}</td>\n" +
+ "</tr>\n" +
+ "<tr>\n" +
+ " <td colspan=\"2\" class=\"header-left\"><small>{1}</small></td>\n" +
+ "</tr>\n" +
+ "<tr>\n" +
+ " <td colspan=\"2\">\n" +
+ "<form method=\"get\" action=\"{2}\">\n" +
+ "<table cellspacing=\"0\" cellpadding=\"3\">\n" +
+ "<tr>\n" +
+ " <td class=\"row-right\">\n" +
+ " <small>{3}</small>\n" +
+ " </td>\n" +
+ " <td class=\"row-left\">\n" +
+ " <input type=\"text\" name=\"name\" size=\"20\">\n" +
+ " </td>\n" +
+ "</tr>\n" +
+ "<tr>\n" +
+ " <td class=\"row-right\">\n" +
+ " <small>{4}</small>\n" +
+ " </td>\n" +
+ " <td class=\"row-left\">\n" +
+ " <input type=\"text\" name=\"aliases\" size=\"64\">\n" +
+ " </td>\n" +
+ "</tr>\n" +
+ "<tr>\n" +
+ " <td class=\"row-right\">\n" +
+ " <small>{5}</small>\n" +
+ " </td>\n" +
+ " <td class=\"row-left\">\n" +
+ " <input type=\"text\" name=\"appBase\" size=\"64\">\n" +
+ " </td>\n" +
+ "</tr>\n" ;
+
+ private static final String ADD_SECTION_BOOLEAN =
+ "<tr>\n" +
+ " <td class=\"row-right\">\n" +
+ " <small>{0}</small>\n" +
+ " </td>\n" +
+ " <td class=\"row-left\">\n" +
+ " <input type=\"checkbox\" name=\"{1}\" {2}>\n" +
+ " </td>\n" +
+ "</tr>\n" ;
+
+ private static final String ADD_SECTION_END =
+ "<tr>\n" +
+ " <td class=\"row-right\">\n" +
+ " \n" +
+ " </td>\n" +
+ " <td class=\"row-left\">\n" +
+ " <input type=\"submit\" value=\"{0}\">\n" +
+ " </td>\n" +
+ "</tr>\n" +
+ "</table>\n" +
+ "</form>\n" +
+ "</td>\n" +
+ "</tr>\n" +
+ "</table>\n" +
+ "<br>\n" +
+ "\n";
+
+}
Deleted: tags/tomcat5.5/5.5.26-3/debian/changelog
===================================================================
--- trunk/tomcat5.5/debian/changelog 2008-10-05 11:53:44 UTC (rev 7114)
+++ tags/tomcat5.5/5.5.26-3/debian/changelog 2008-10-05 12:09:51 UTC (rev 7116)
@@ -1,398 +0,0 @@
-tomcat5.5 (5.5.26-2) unstable; urgency=low
-
- * Fixed bootstrap.MF to put commons-logging-api.jar onto classpath instead
- of commons-logging-api-1.1.1.jar. Closes: #477363
-
- -- Michael Koch <konqueror at gmx.de> Sun, 01 Jun 2008 11:34:40 +0200
-
-tomcat5.5 (5.5.26-1) unstable; urgency=low
-
- [ Michael Koch ]
- * New upstream release.
- - CVE-2007-5333: unauthorized disclosure of information. Closes: #465645
- - CVS-2007-6286: handling of empty requests.
- * debian/rules: Don't file when files to delete don't exist.
- Closes: #458977
- * debian/tomcat5.5.init: Change directory to $CATALINA_BASE/temp before
- starting the daemon. Patch by David Pashley. Closes: #418826
- * debian/tomcat5.5.init: Use 'printf' instead of 'echo -e'.
- Closes: #472899
-
- [ Marcus Better ]
- * debian/policy/04webapps.policy: Grant read permission to JULI for the
- (non-existing) logging.properties file in the example webapps. Closes:
- #460839.
-
- -- Michael Koch <konqueror at gmx.de> Sat, 19 Apr 2008 23:18:30 +0200
-
-tomcat5.5 (5.5.25-5) unstable; urgency=low
-
- * debian/tomcat5.5.init: Check if tomcat-users.xml exists.
- Thanks to Javier Serrano Polo for the patch. Closes: #445857.
- * debian/tomcat5.5-webapps.postrm: Purge links created in postinst script.
- Closes: #453879.
- * debian/tomcat5.5-admin.links: Fix symlink for commons-io.jar.
- Closes: #452366.
- * debian/tomcat5.5.init: Check user id of the user running the init script.
- Closes: #457956.
- * Renamed /etc/cron.daily/tomcat5.5 to /etc/cron.daily/tomcat55.
- Closes: #454296.
- * debian/tomcat5.5.init: source /etc/default/locale and export LANG so
- tomcat gets started with system locale. Originally reported to
- https://bugs.launchpad.net/ubuntu/+source/tomcat5.5/+bug/153672.
-
- -- Michael Koch <konqueror at gmx.de> Thu, 03 Jan 2008 13:23:44 +0100
-
-tomcat5.5 (5.5.25-4) unstable; urgency=high
-
- * CVE-2007-5342: Fix unauthorized modification of data because of
- too open permissions. Closes: #458237.
- * Always clean temporary directory on startup. Closes: #456608.
-
- -- Michael Koch <konqueror at gmx.de> Sat, 29 Dec 2007 20:15:40 +0100
-
-tomcat5.5 (5.5.25-3) unstable; urgency=low
-
- * debian/libtomcat5.5-java.links: Removed links for xml-apis.jar and
- xercesImpl.jar. Closes: #443382, #455495.
- * Added libgnumail-java to Build-Depends. Closes: #454312.
- * Updated Standards-Version to 3.7.3.
-
- -- Michael Koch <konqueror at gmx.de> Thu, 13 Dec 2007 22:15:18 +0100
-
-tomcat5.5 (5.5.25-2) unstable; urgency=high
-
- [ Michael Koch ]
- CVE-2007-5461:
- * Fix absolute path traversal vulnerability. Closes: #448664.
-
- [ Marcus Better ]
- * Add required commons-io symlink to the admin webapp, which fixes WAR
- file uploads. (Closes: #452366)
- * debian/control: Use the new Homepage and Vcs-* fields.
- * debian/NEWS: Remove outdated entry.
-
- -- Michael Koch <konqueror at gmx.de> Fri, 30 Nov 2007 10:46:33 +0100
-
-tomcat5.5 (5.5.25-1) unstable; urgency=high
-
- * New upstream release. Setting usrgency to high.
- - Fixes XSS issues. CVE-2007-1355, CVS-2007-2449 and CVE-2007-2450.
- * debian/policy/04webapps.policy: fix permissions on
- org.apache.tomcat.util.digester package.
-
- -- Michael Koch <konqueror at gmx.de> Wed, 03 Oct 2007 20:04:18 +0200
-
-tomcat5.5 (5.5.23-1) unstable; urgency=low
-
- [ Marcus Better ]
- * New upstream version.
- * Don't include /var/lib/tomcat5.5/conf/catalina.policy since it is
- auto-generated at startup. Thanks to Javier Serrano Polo. (Closes:
- #426761)
- * Make sure files under /var/lib/tomcat5.5/conf are not
- executable. Thanks to Marco Nenciarini. (Closes: #426740)
- * Fixes a failure to start if the temp directory contained too many
- files. Thanks to Maarten van der Hoef (Closes: #427978)
- * tomcat5.5-admin now depends on libcommons-collections3-java and
- libcommons-digester-java.
-
- [ Michael Koch ]
- * Clean up correctly on (re-)build (Closes: #434617).
- * Replaced obsolete ${Source-Version} by ${source:Version}.
- * Added myself to Uploaders.
- * Updated (Build-)Depends on libcommons-modeler-java to (>= 2.0).
- * Clear up comment in debian/tomcat5.5.default about TOMCAT55_USER.
- (Closes: #425020).
- * Make cron.daily script work when package is removed but not purged
- (Closes: #436020).
- * Applied patch from David Pashley to move configuration from
- /var/lib/tomcat5.5/conf to /etc/tomcat5.5 (Closes: #434728).
- * Use ${catalina.base} instead of ${catalina.home} in
- debian/policy/50user.policy (Closes: #431704).
- * Make tomcat5.5 depend on libecj-java instead of ecj-bootstrap
- (Closes: #396170).
- * Don't make tomcat5.5 on two non-virtual java runtimes. Removed kaffe.
- * Don't let tomcat5.5 suggest libapache-mod-jk. Doesn't exist anymore.
- * Fixed watch file.
- * Set CATALINA_BASE to /var/lib/$NAME in debian/tomcat5.5.init.
-
- -- Michael Koch <konqueror at gmx.de> Sun, 02 Sep 2007 11:28:05 +0200
-
-tomcat5.5 (5.5.20-5) unstable; urgency=low
-
- * Messages are now logged to the system log instead of the pipe
- "/var/log/tomcat5.5/catalina.out". (Closes: #402603, #402879)
- * The security manager is enabled by default. A warning is logged to the
- syslog when running under GCJ, which doesn't work in this mode
- currently. (Closes: #411137)
- * debian/rules: Set SHELL=/bin/bash as required. Thanks to David
- Pashley. (Closes: #413845)
- * Webapps are now permitted to read the properties "catalina.base" and
- "catalina.home". Thanks to Adrian Bridgett. (Closes: #412479)
- * Added the symlink "/usr/share/tomcat5.5/webapps" pointing to
- "/var/lib/tomcat5.5/webapps". Thanks to Cyrille
- <cnofficial at neotilus.com> and Florent Angebault. (Closes: #406614)
- * Build with source level 1.5, since GCJ now supports generics. (Closes:
- #424465)
- * Recognise Sun JDK 6 from the sun-java6-jdk package.
- * debian/control: Removed Stefan Gybas (on own request) and Wolfgang
- Baer from Uploaders.
-
- -- Marcus Better <marcus at better.se> Tue, 24 Apr 2007 15:04:17 +0200
-
-tomcat5.5 (5.5.20-4) unstable; urgency=low
-
- * The symlink "/usr/share/tomcat5.5/common/endorsed/xml-apis" is now
- correctly named "xml-apis.jar". Thanks to Javier Serrano
- Polo. (Closes: #402265)
- * The tomcat55 user now has write permissions to
- "/var/lib/tomcat5.5/conf", so that Tomcat can deploy webapps in WAR
- archives. (Closes: #402224)
- * The named pipe /var/log/tomcat5.5/catalina.out is now properly
- created.
- * The TOMCAT5_SHUTDOWN variable in /etc/default/tomcat5.5 is obsolete
- and has been removed.
- * The init script now supports the try-restart action.
- * Install the cron file.
-
- -- Marcus Better <marcus at better.se> Sat, 9 Dec 2006 22:41:52 +0100
-
-tomcat5.5 (5.5.20-3) experimental; urgency=low
-
- * Really fix the "/etc/init.d/tomcat5.5 status" command this
- time. (Closes: #398044)
- * Use jsvc for daemon startup, instead of the catalina.sh script. Daemon
- shutdown is now faster and more reliable.
- * Add missing permissions required by the admin webapp. Thanks to
- Jonathan-Marc Lapointe.
- * The CATALINA_OPTS variable in /etc/default/tomcat5.5 has been renamed
- to the more intuitive JAVA_OPTS.
-
- -- Marcus Better <marcus at better.se> Sat, 25 Nov 2006 21:20:18 +0100
-
-tomcat5.5 (5.5.20-2) unstable; urgency=medium
-
- * Now runs with java-gcj-compat. (Closes: #395167)
- * Add compatibility links for JDK 1.4. Thanks to Javier Serrano
- Polo. (Closes: #397996).
- * Fix accidental double removal of the tomcat55 user on purge in some
- cases. Thanks to Andreas Beckmann. (Closes: #393224)
- * Fix typo affecting "/etc/init.d/tomcat5.5 status" command. Thanks to
- Jhair Tocancipa Triana. (Closes: #398044)
- * Webapps are now installed in /usr/share/tomcat5.5-webapps. Their
- context definitions are copied into
- /var/lib/tomcat5.5/conf/Catalina/localhost on first install, but if
- removed they will no longer be re-enabled on every upgrade. Thanks to
- Adrian Bridgett. (Closes: #399184)
- * Change owner of various files from tomcat5 to tomcat55 on upgrade from
- release 5.5.17-1 or earlier. Thanks to Mike Whitaker. (Closes: #392569)
- * Don't use juli LogManager with java-gcj-compat, as workaround for bug
- #399251.
- * We no longer need xsltproc to generate documentation, since the
- required supporting functions are now available in main.
- * debian/ant.properties, debian/rules: Don't delete PureTLS code from
- the source. It will be ignored during build anyway.
- * Rebuild jkstatus-ant from source instead of using precompiled class
- files.
- * Simplified the .install files by grouping by directory.
- * Install forgotten files `catalina.properties', `logging.properties'
- and `context.xml' in /var/lib/tomcat5.5/conf.
- * Synchronized security policy files with upstream.
- * debian/rules: Don't use CDBS. Thus we no longer need a bogus "ant xxx"
- invocation in the "clean" target, and the script is simple enough
- anyway.
-
- -- Marcus Better <marcus at better.se> Tue, 21 Nov 2006 12:06:17 +0100
-
-tomcat5.5 (5.5.20-1) unstable; urgency=low
-
- * New upstream release.
- * Build JSP and servlet examples from source instead of copying them
- from libservlet2.4-java. (Closes: #393905)
- * debian/control: Add some missing dependencies.
- * Enable commons-daemon functionality, it should work correctly by now.
- * Make init script LSB compliant.
- * Don't call /etc/init.d/tomcat5.5 directly from the maintainer scripts.
-
- -- Marcus Better <marcus at better.se> Mon, 23 Oct 2006 13:28:15 +0200
-
-tomcat5.5 (5.5.17-2) unstable; urgency=low
-
- * debian/control: removed apache-utils version and added alternative
- apache2-utils (that provide the virtual apache-utils package)
- * debian/tomcat5.init: added Sun's jdk path as provided by sun-java5-bin
- package. (closes: #388617).
- * debian/control: updated apache2-common to apache2.2-common (closes:
- #391006) (thanks to Andrew Meaden and Luk Claes).
- * debian/control (depends): removed -webapps and -admin from Depends
- field and move them to Suggest to avoid circular dependencies, thanks
- to Bill Allombert. (closes: #387362).
- * tomcat5.5 has now the user tomcat55 and remove user tomcat5 if package
- tomcat5 is marked as purge or if it's never been installed (closes:
- #386831).
-
- -- Arnaud Vandyck <avdyk at debian.org> Mon, 9 Oct 2006 16:36:25 +0200
-
-tomcat5.5 (5.5.17-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: added tomcat5.5 dependency against ecj-boostrap so
- there is a jsp compiler closes: #384062).
-
- -- Arnaud Vandyck <avdyk at debian.org> Tue, 12 Sep 2006 14:42:58 +0200
-
-tomcat5.5 (5.5.15-1) experimental; urgency=low
-
- * Arnaud Vandyck <avdyk at debian.org>:
- + All the work as been done by Wolfgang to have this package in
- Debian.
- + The package is now tomcat5.5 and not tomcat5.
- + Now build with gcj instead of kaffe.
- + Put cdbs and debhelper in Build-Depends.
- + Standards-Version updated to 3.7.2.
- + tomcat depends on tomcat-webapps and tomcat-admin, not only suggest
- * New major upstream release
- + New source layout - adaptions all over the place
- + Ported all patches to new source layout
- + Added patch (09_UseSystemDBCP.patch) to use system dbcp instead of
- repackaged tomcat stuff (naming-factory-dbcp.jar)
- + Drop now unneeded dependencies on libsaxpath-java, libjaxen-java,
- libregexp-java from build-dependencies and dependencies
- + Move dependency on libcommons-collections3-java,
- libcommons-fileupload-java, libcommons-beanutils-java and
- libcommons-digester-java to tomcat5-admin (only needed here)
- + Move libraries around as required by new binary layout (e.g. i18n jars
- into own directory)
- + Moved and linked new jars (tomcat-jkstatus-ant.jar, tomcat-juli.jar)
- + Updated 03catalina.policy to include tomcat-juli.jar, remove launcher.jar
- + Install ant task definitions with libtomcat5-java
- * Remove JDK 1.3 directories from JDK_DIRS in tomcat.init (not supported)
- * Updated tomcat.default to remove JDK 1.3 options
- * Updated description to include host-manager, fixed URLs
- * Minor updates in README.Debian
-
- -- Wolfgang Baer <WBaer at gmx.de> Fri, 27 Jan 2006 10:07:47 +0100
-
-tomcat5 (5.0.30-9) unstable; urgency=low
-
- * kaffe compiler transition
- + Remove build.compiler jikes property
- + Modify tomcat5.init to use default compiler instead of jikes
- * Fix spelling error in README.Debian (closes: #346573)
-
- -- Wolfgang Baer <WBaer at gmx.de> Tue, 17 Jan 2006 11:50:52 +0100
-
-tomcat5 (5.0.30-8) unstable; urgency=low
-
- * Correct description to refer to tomcat5-webapps (closes: #336984)
- * Test in tomcat5.init for JDK like environment so we are sure
- java-gcj-compat-dev is installed and used (closes: #337270)
-
- -- Wolfgang Baer <WBaer at gmx.de> Mon, 7 Nov 2005 19:17:58 +0100
-
-tomcat5 (5.0.30-7) unstable; urgency=low
-
- * Move to main - upload with orig.tar.gz included
- * Works with kaffe (>= 1.1.6-3) and java-gcj-compat-dev
- + changed debian/control accordingly
- + adjusted tomcat5.init file
- * Removed libcommons-httpclient-java build-dep - not needed
-
- -- Wolfgang Baer <WBaer at gmx.de> Thu, 06 Oct 2005 21:59:36 +0200
-
-tomcat5 (5.0.30-6) unstable; urgency=low
-
- * Move commons-fileupload jar from common/lib to server/lib
- * Copy fixed struts-config.xml during install over the old one. The fixed
- one is taken from upstream (published at download location)
- * Tomcat5 has a new context file handling. The xml files with the context of
- a webapp needs to be put into conf/[Engine name]/[Host name] whereas the
- default engine which serves the admin webapp has to be called "Catalina":
- + Create conf/Catalina/localhost directory during install
- + Deploy the context files for the webapps into this directory
- (closes: #315038)
- + Added NEWS.Debian file to inform about moving context files to new
- context directory hierarchy.
- * Install the jsp/servlet examples (closes: #325508, #325507, #326126)
- * Added unzip to build-deps (needed to unzip example webapps)
- * Cleaned up debian/rules a bit
- * libcommons-launcher-java dependency added in last upload (closes: #324041)
- * Works with latest kaffe vm (closes: #320845) - added versioned dependency
- * Changed depends to j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe
- * Removed depends on j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe | java-compiler
- as the above depends already includes an java-compiler as JDKs
- * Removed note in description about non-free JDKs - kaffe works and the
- info is superceded by the existance of java-package
- * Updated *.policy files to match new jars and fixed typos
- * As tomcat5 is now functional we can close the whishlist bugs for
- packaging tomcat5 (closes: #222876, #267741)
- * Disable commons-daemon copy/build - not available on all platforms
- + Added patch 15_dont_copy_daemon.patch
- + Removed related stuff from debian/rules and debian/control
- * Removed classpath entry from MF and added jars directly to setclasspath.sh
- + Patch 01_remove_classpath_manifest_a.patch removes the entry
- + Patch 01_remove_classpath_manifest_b.patch adds it to setclasspath.sh
- * Fixed typo CALALINA in README.Debian
- * Fixed lintian warning in tomcat5.postinst
- * Extended JDK_DIRS and enabled Security Manager for non-free JDKs
- * Build documentation through commandline xslt processing
- + Patch 03_fix_doc_stylesheet.patch to fix stylsheet variable definition
- + Added xsltproc to build-deps and process docs in debian/rules
- + Moved RELEASE-NOTES to webapps/ROOT where it belongs
- + Added tomcat-docs.xml context definition to allow linking and also
- starting tomcat5 without tomcat5-webapps installed (removed linking
- for tomcat-docs from server.xml)
- * Added myself to uploaders
-
- * Upload sponsored by Petter Reinholdtsen
-
- -- Wolfgang Baer <WBaer at gmx.de> Wed, 07 Sep 2005 17:25:44 +0200
-
-tomcat5 (5.0.30-5) unstable; urgency=low
-
- * debian/control (libtomcat5-java: Depends): added
- libcommons-launcher-java
-
- -- Arnaud Vandyck <avdyk at debian.org> Sat, 20 Aug 2005 10:34:05 +0200
-
-tomcat5 (5.0.30-4) unstable; urgency=low
-
- * upload to unstable
- * debian/control: ant transition: change the dep from libant1.6-java to
- ant
- * debian/libtomcat5-java.links: added some links and corrected ant once
- * updated to libcommons-collection3-java
-
- -- Arnaud Vandyck <avdyk at debian.org> Fri, 19 Aug 2005 16:06:27 +0200
-
-tomcat5 (5.0.30-3) experimental; urgency=low
-
- * Added libapache2-mod-jk to suggests, missing libcommons-el-java
- to libtomcat5-java build-depends
- * Fixed/Added links in libtomcat5-java (jsp-api/commons-el jars added)
- * Changed JDK dirs (as generated by java-package), enabled security
- manager and therefore put kaffe as last jdk (currently has problems)
- * Fixed typo in ant.properties to correctly include logging-api.jar
- and fixed libtomcat5-java accordingly
- * Fixed servlet-api link in tomcat5-webapps.links and included needed
- jsp-api link
- * Standards-Version 3.6.2 - no changes required
- * Build-Deps to Build-Dep-Indep to fix linitan warning
-
- -- Wolfgang Baer <WBaer at gmx.de> Wed, 29 Jun 2005 22:32:49 +0200
-
-tomcat5 (5.0.30-2) experimental; urgency=low
-
- * libtomcat5-java: does not provide commons-logging-api and
- commons-daemon but use symlink to /usr/share/java. Now, tomcat5 can
- start with non-free jdks (but it does not run with free one at the
- moment for me) (closes: #315038)
-
- -- Arnaud Vandyck <avdyk at debian.org> Tue, 21 Jun 2005 12:44:21 +0200
-
-tomcat5 (5.0.30-1) experimental; urgency=low
-
- * Initial release release based on tomcat4 package by Stefan Gybas.
-
- -- Arnaud Vandyck <avdyk at debian.org> Sat, 11 Jun 2005 17:00:35 +0200
Copied: tags/tomcat5.5/5.5.26-3/debian/changelog (from rev 7115, trunk/tomcat5.5/debian/changelog)
===================================================================
--- tags/tomcat5.5/5.5.26-3/debian/changelog (rev 0)
+++ tags/tomcat5.5/5.5.26-3/debian/changelog 2008-10-05 12:09:51 UTC (rev 7116)
@@ -0,0 +1,803 @@
+tomcat5.5 (5.5.26-3) unstable; urgency=high
+
+ * CVE-2008-1947: Fix XSS issue in host-manager web application.
+ Closes: #484643
+
+ -- Michael Koch <konqueror at gmx.de> Fri, 06 Jun 2008 09:34:15 +0200
+
+tomcat5.5 (5.5.26-2) unstable; urgency=low
+
+ * Fixed bootstrap.MF to put commons-logging-api.jar onto classpath instead
+ of commons-logging-api-1.1.1.jar. Closes: #477363
+
+ -- Michael Koch <konqueror at gmx.de> Sun, 01 Jun 2008 11:34:40 +0200
+
+tomcat5.5 (5.5.26-1) unstable; urgency=low
+
+ [ Michael Koch ]
+ * New upstream release.
+ - CVE-2007-5333: unauthorized disclosure of information. Closes: #465645
+ - CVS-2007-6286: handling of empty requests.
+ * debian/rules: Don't file when files to delete don't exist.
+ Closes: #458977
+ * debian/tomcat5.5.init: Change directory to $CATALINA_BASE/temp before
+ starting the daemon. Patch by David Pashley. Closes: #418826
+ * debian/tomcat5.5.init: Use 'printf' instead of 'echo -e'.
+ Closes: #472899
+
+ [ Marcus Better ]
+ * debian/policy/04webapps.policy: Grant read permission to JULI for the
+ (non-existing) logging.properties file in the example webapps. Closes:
+ #460839.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 19 Apr 2008 23:18:30 +0200
+
+tomcat5.5 (5.5.25-5) unstable; urgency=low
+
+ * debian/tomcat5.5.init: Check if tomcat-users.xml exists.
+ Thanks to Javier Serrano Polo for the patch. Closes: #445857.
+ * debian/tomcat5.5-webapps.postrm: Purge links created in postinst script.
+ Closes: #453879.
+ * debian/tomcat5.5-admin.links: Fix symlink for commons-io.jar.
+ Closes: #452366.
+ * debian/tomcat5.5.init: Check user id of the user running the init script.
+ Closes: #457956.
+ * Renamed /etc/cron.daily/tomcat5.5 to /etc/cron.daily/tomcat55.
+ Closes: #454296.
+ * debian/tomcat5.5.init: source /etc/default/locale and export LANG so
+ tomcat gets started with system locale. Originally reported to
+ https://bugs.launchpad.net/ubuntu/+source/tomcat5.5/+bug/153672.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 03 Jan 2008 13:23:44 +0100
+
+tomcat5.5 (5.5.25-4) unstable; urgency=high
+
+ * CVE-2007-5342: Fix unauthorized modification of data because of
+ too open permissions. Closes: #458237.
+ * Always clean temporary directory on startup. Closes: #456608.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 29 Dec 2007 20:15:40 +0100
+
+tomcat5.5 (5.5.25-3) unstable; urgency=low
+
+ * debian/libtomcat5.5-java.links: Removed links for xml-apis.jar and
+ xercesImpl.jar. Closes: #443382, #455495.
+ * Added libgnumail-java to Build-Depends. Closes: #454312.
+ * Updated Standards-Version to 3.7.3.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 13 Dec 2007 22:15:18 +0100
+
+tomcat5.5 (5.5.25-2) unstable; urgency=high
+
+ [ Michael Koch ]
+ CVE-2007-5461:
+ * Fix absolute path traversal vulnerability. Closes: #448664.
+
+ [ Marcus Better ]
+ * Add required commons-io symlink to the admin webapp, which fixes WAR
+ file uploads. (Closes: #452366)
+ * debian/control: Use the new Homepage and Vcs-* fields.
+ * debian/NEWS: Remove outdated entry.
+
+ -- Michael Koch <konqueror at gmx.de> Fri, 30 Nov 2007 10:46:33 +0100
+
+tomcat5.5 (5.5.25-1) unstable; urgency=high
+
+ * New upstream release. Setting usrgency to high.
+ - Fixes XSS issues. CVE-2007-1355, CVS-2007-2449 and CVE-2007-2450.
+ * debian/policy/04webapps.policy: fix permissions on
+ org.apache.tomcat.util.digester package.
+
+ -- Michael Koch <konqueror at gmx.de> Wed, 03 Oct 2007 20:04:18 +0200
+
+tomcat5.5 (5.5.23-1) unstable; urgency=low
+
+ [ Marcus Better ]
+ * New upstream version.
+ * Don't include /var/lib/tomcat5.5/conf/catalina.policy since it is
+ auto-generated at startup. Thanks to Javier Serrano Polo. (Closes:
+ #426761)
+ * Make sure files under /var/lib/tomcat5.5/conf are not
+ executable. Thanks to Marco Nenciarini. (Closes: #426740)
+ * Fixes a failure to start if the temp directory contained too many
+ files. Thanks to Maarten van der Hoef (Closes: #427978)
+ * tomcat5.5-admin now depends on libcommons-collections3-java and
+ libcommons-digester-java.
+
+ [ Michael Koch ]
+ * Clean up correctly on (re-)build (Closes: #434617).
+ * Replaced obsolete ${Source-Version} by ${source:Version}.
+ * Added myself to Uploaders.
+ * Updated (Build-)Depends on libcommons-modeler-java to (>= 2.0).
+ * Clear up comment in debian/tomcat5.5.default about TOMCAT55_USER.
+ (Closes: #425020).
+ * Make cron.daily script work when package is removed but not purged
+ (Closes: #436020).
+ * Applied patch from David Pashley to move configuration from
+ /var/lib/tomcat5.5/conf to /etc/tomcat5.5 (Closes: #434728).
+ * Use ${catalina.base} instead of ${catalina.home} in
+ debian/policy/50user.policy (Closes: #431704).
+ * Make tomcat5.5 depend on libecj-java instead of ecj-bootstrap
+ (Closes: #396170).
+ * Don't make tomcat5.5 on two non-virtual java runtimes. Removed kaffe.
+ * Don't let tomcat5.5 suggest libapache-mod-jk. Doesn't exist anymore.
+ * Fixed watch file.
+ * Set CATALINA_BASE to /var/lib/$NAME in debian/tomcat5.5.init.
+
+ -- Michael Koch <konqueror at gmx.de> Sun, 02 Sep 2007 11:28:05 +0200
+
+tomcat5.5 (5.5.20-5) unstable; urgency=low
+
+ * Messages are now logged to the system log instead of the pipe
+ "/var/log/tomcat5.5/catalina.out". (Closes: #402603, #402879)
+ * The security manager is enabled by default. A warning is logged to the
+ syslog when running under GCJ, which doesn't work in this mode
+ currently. (Closes: #411137)
+ * debian/rules: Set SHELL=/bin/bash as required. Thanks to David
+ Pashley. (Closes: #413845)
+ * Webapps are now permitted to read the properties "catalina.base" and
+ "catalina.home". Thanks to Adrian Bridgett. (Closes: #412479)
+ * Added the symlink "/usr/share/tomcat5.5/webapps" pointing to
+ "/var/lib/tomcat5.5/webapps". Thanks to Cyrille
+ <cnofficial at neotilus.com> and Florent Angebault. (Closes: #406614)
+ * Build with source level 1.5, since GCJ now supports generics. (Closes:
+ #424465)
+ * Recognise Sun JDK 6 from the sun-java6-jdk package.
+ * debian/control: Removed Stefan Gybas (on own request) and Wolfgang
+ Baer from Uploaders.
+
+ -- Marcus Better <marcus at better.se> Tue, 24 Apr 2007 15:04:17 +0200
+
+tomcat5.5 (5.5.20-4) unstable; urgency=low
+
+ * The symlink "/usr/share/tomcat5.5/common/endorsed/xml-apis" is now
+ correctly named "xml-apis.jar". Thanks to Javier Serrano
+ Polo. (Closes: #402265)
+ * The tomcat55 user now has write permissions to
+ "/var/lib/tomcat5.5/conf", so that Tomcat can deploy webapps in WAR
+ archives. (Closes: #402224)
+ * The named pipe /var/log/tomcat5.5/catalina.out is now properly
+ created.
+ * The TOMCAT5_SHUTDOWN variable in /etc/default/tomcat5.5 is obsolete
+ and has been removed.
+ * The init script now supports the try-restart action.
+ * Install the cron file.
+
+ -- Marcus Better <marcus at better.se> Sat, 9 Dec 2006 22:41:52 +0100
+
+tomcat5.5 (5.5.20-3) experimental; urgency=low
+
+ * Really fix the "/etc/init.d/tomcat5.5 status" command this
+ time. (Closes: #398044)
+ * Use jsvc for daemon startup, instead of the catalina.sh script. Daemon
+ shutdown is now faster and more reliable.
+ * Add missing permissions required by the admin webapp. Thanks to
+ Jonathan-Marc Lapointe.
+ * The CATALINA_OPTS variable in /etc/default/tomcat5.5 has been renamed
+ to the more intuitive JAVA_OPTS.
+
+ -- Marcus Better <marcus at better.se> Sat, 25 Nov 2006 21:20:18 +0100
+
+tomcat5.5 (5.5.20-2) unstable; urgency=medium
+
+ * Now runs with java-gcj-compat. (Closes: #395167)
+ * Add compatibility links for JDK 1.4. Thanks to Javier Serrano
+ Polo. (Closes: #397996).
+ * Fix accidental double removal of the tomcat55 user on purge in some
+ cases. Thanks to Andreas Beckmann. (Closes: #393224)
+ * Fix typo affecting "/etc/init.d/tomcat5.5 status" command. Thanks to
+ Jhair Tocancipa Triana. (Closes: #398044)
+ * Webapps are now installed in /usr/share/tomcat5.5-webapps. Their
+ context definitions are copied into
+ /var/lib/tomcat5.5/conf/Catalina/localhost on first install, but if
+ removed they will no longer be re-enabled on every upgrade. Thanks to
+ Adrian Bridgett. (Closes: #399184)
+ * Change owner of various files from tomcat5 to tomcat55 on upgrade from
+ release 5.5.17-1 or earlier. Thanks to Mike Whitaker. (Closes: #392569)
+ * Don't use juli LogManager with java-gcj-compat, as workaround for bug
+ #399251.
+ * We no longer need xsltproc to generate documentation, since the
+ required supporting functions are now available in main.
+ * debian/ant.properties, debian/rules: Don't delete PureTLS code from
+ the source. It will be ignored during build anyway.
+ * Rebuild jkstatus-ant from source instead of using precompiled class
+ files.
+ * Simplified the .install files by grouping by directory.
+ * Install forgotten files `catalina.properties', `logging.properties'
+ and `context.xml' in /var/lib/tomcat5.5/conf.
+ * Synchronized security policy files with upstream.
+ * debian/rules: Don't use CDBS. Thus we no longer need a bogus "ant xxx"
+ invocation in the "clean" target, and the script is simple enough
+ anyway.
+
+ -- Marcus Better <marcus at better.se> Tue, 21 Nov 2006 12:06:17 +0100
+
+tomcat5.5 (5.5.20-1) unstable; urgency=low
+
+ * New upstream release.
+ * Build JSP and servlet examples from source instead of copying them
+ from libservlet2.4-java. (Closes: #393905)
+ * debian/control: Add some missing dependencies.
+ * Enable commons-daemon functionality, it should work correctly by now.
+ * Make init script LSB compliant.
+ * Don't call /etc/init.d/tomcat5.5 directly from the maintainer scripts.
+
+ -- Marcus Better <marcus at better.se> Mon, 23 Oct 2006 13:28:15 +0200
+
+tomcat5.5 (5.5.17-2) unstable; urgency=low
+
+ * debian/control: removed apache-utils version and added alternative
+ apache2-utils (that provide the virtual apache-utils package)
+ * debian/tomcat5.init: added Sun's jdk path as provided by sun-java5-bin
+ package. (closes: #388617).
+ * debian/control: updated apache2-common to apache2.2-common (closes:
+ #391006) (thanks to Andrew Meaden and Luk Claes).
+ * debian/control (depends): removed -webapps and -admin from Depends
+ field and move them to Suggest to avoid circular dependencies, thanks
+ to Bill Allombert. (closes: #387362).
+ * tomcat5.5 has now the user tomcat55 and remove user tomcat5 if package
+ tomcat5 is marked as purge or if it's never been installed (closes:
+ #386831).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Mon, 9 Oct 2006 16:36:25 +0200
+
+tomcat5.5 (5.5.17-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: added tomcat5.5 dependency against ecj-boostrap so
+ there is a jsp compiler closes: #384062).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Tue, 12 Sep 2006 14:42:58 +0200
+
+tomcat5.5 (5.5.15-1) experimental; urgency=low
+
+ * Arnaud Vandyck <avdyk at debian.org>:
+ + All the work as been done by Wolfgang to have this package in
+ Debian.
+ + The package is now tomcat5.5 and not tomcat5.
+ + Now build with gcj instead of kaffe.
+ + Put cdbs and debhelper in Build-Depends.
+ + Standards-Version updated to 3.7.2.
+ + tomcat depends on tomcat-webapps and tomcat-admin, not only suggest
+ * New major upstream release
+ + New source layout - adaptions all over the place
+ + Ported all patches to new source layout
+ + Added patch (09_UseSystemDBCP.patch) to use system dbcp instead of
+ repackaged tomcat stuff (naming-factory-dbcp.jar)
+ + Drop now unneeded dependencies on libsaxpath-java, libjaxen-java,
+ libregexp-java from build-dependencies and dependencies
+ + Move dependency on libcommons-collections3-java,
+ libcommons-fileupload-java, libcommons-beanutils-java and
+ libcommons-digester-java to tomcat5-admin (only needed here)
+ + Move libraries around as required by new binary layout (e.g. i18n jars
+ into own directory)
+ + Moved and linked new jars (tomcat-jkstatus-ant.jar, tomcat-juli.jar)
+ + Updated 03catalina.policy to include tomcat-juli.jar, remove launcher.jar
+ + Install ant task definitions with libtomcat5-java
+ * Remove JDK 1.3 directories from JDK_DIRS in tomcat.init (not supported)
+ * Updated tomcat.default to remove JDK 1.3 options
+ * Updated description to include host-manager, fixed URLs
+ * Minor updates in README.Debian
+
+ -- Wolfgang Baer <WBaer at gmx.de> Fri, 27 Jan 2006 10:07:47 +0100
+
+tomcat5 (5.0.30-9) unstable; urgency=low
+
+ * kaffe compiler transition
+ + Remove build.compiler jikes property
+ + Modify tomcat5.init to use default compiler instead of jikes
+ * Fix spelling error in README.Debian (closes: #346573)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Tue, 17 Jan 2006 11:50:52 +0100
+
+tomcat5 (5.0.30-8) unstable; urgency=low
+
+ * Correct description to refer to tomcat5-webapps (closes: #336984)
+ * Test in tomcat5.init for JDK like environment so we are sure
+ java-gcj-compat-dev is installed and used (closes: #337270)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Mon, 7 Nov 2005 19:17:58 +0100
+
+tomcat5 (5.0.30-7) unstable; urgency=low
+
+ * Move to main - upload with orig.tar.gz included
+ * Works with kaffe (>= 1.1.6-3) and java-gcj-compat-dev
+ + changed debian/control accordingly
+ + adjusted tomcat5.init file
+ * Removed libcommons-httpclient-java build-dep - not needed
+
+ -- Wolfgang Baer <WBaer at gmx.de> Thu, 06 Oct 2005 21:59:36 +0200
+
+tomcat5 (5.0.30-6) unstable; urgency=low
+
+ * Move commons-fileupload jar from common/lib to server/lib
+ * Copy fixed struts-config.xml during install over the old one. The fixed
+ one is taken from upstream (published at download location)
+ * Tomcat5 has a new context file handling. The xml files with the context of
+ a webapp needs to be put into conf/[Engine name]/[Host name] whereas the
+ default engine which serves the admin webapp has to be called "Catalina":
+ + Create conf/Catalina/localhost directory during install
+ + Deploy the context files for the webapps into this directory
+ (closes: #315038)
+ + Added NEWS.Debian file to inform about moving context files to new
+ context directory hierarchy.
+ * Install the jsp/servlet examples (closes: #325508, #325507, #326126)
+ * Added unzip to build-deps (needed to unzip example webapps)
+ * Cleaned up debian/rules a bit
+ * libcommons-launcher-java dependency added in last upload (closes: #324041)
+ * Works with latest kaffe vm (closes: #320845) - added versioned dependency
+ * Changed depends to j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe
+ * Removed depends on j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe | java-compiler
+ as the above depends already includes an java-compiler as JDKs
+ * Removed note in description about non-free JDKs - kaffe works and the
+ info is superceded by the existance of java-package
+ * Updated *.policy files to match new jars and fixed typos
+ * As tomcat5 is now functional we can close the whishlist bugs for
+ packaging tomcat5 (closes: #222876, #267741)
+ * Disable commons-daemon copy/build - not available on all platforms
+ + Added patch 15_dont_copy_daemon.patch
+ + Removed related stuff from debian/rules and debian/control
+ * Removed classpath entry from MF and added jars directly to setclasspath.sh
+ + Patch 01_remove_classpath_manifest_a.patch removes the entry
+ + Patch 01_remove_classpath_manifest_b.patch adds it to setclasspath.sh
+ * Fixed typo CALALINA in README.Debian
+ * Fixed lintian warning in tomcat5.postinst
+ * Extended JDK_DIRS and enabled Security Manager for non-free JDKs
+ * Build documentation through commandline xslt processing
+ + Patch 03_fix_doc_stylesheet.patch to fix stylsheet variable definition
+ + Added xsltproc to build-deps and process docs in debian/rules
+ + Moved RELEASE-NOTES to webapps/ROOT where it belongs
+ + Added tomcat-docs.xml context definition to allow linking and also
+ starting tomcat5 without tomcat5-webapps installed (removed linking
+ for tomcat-docs from server.xml)
+ * Added myself to uploaders
+
+ * Upload sponsored by Petter Reinholdtsen
+
+ -- Wolfgang Baer <WBaer at gmx.de> Wed, 07 Sep 2005 17:25:44 +0200
+
+tomcat5 (5.0.30-5) unstable; urgency=low
+
+ * debian/control (libtomcat5-java: Depends): added
+ libcommons-launcher-java
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 20 Aug 2005 10:34:05 +0200
+
+tomcat5 (5.0.30-4) unstable; urgency=low
+
+ * upload to unstable
+ * debian/control: ant transition: change the dep from libant1.6-java to
+ ant
+ * debian/libtomcat5-java.links: added some links and corrected ant once
+ * updated to libcommons-collection3-java
+
+ -- Arnaud Vandyck <avdyk at debian.org> Fri, 19 Aug 2005 16:06:27 +0200
+
+tomcat5 (5.0.30-3) experimental; urgency=low
+
+ * Added libapache2-mod-jk to suggests, missing libcommons-el-java
+ to libtomcat5-java build-depends
+ * Fixed/Added links in libtomcat5-java (jsp-api/commons-el jars added)
+ * Changed JDK dirs (as generated by java-package), enabled security
+ manager and therefore put kaffe as last jdk (currently has problems)
+ * Fixed typo in ant.properties to correctly include logging-api.jar
+ and fixed libtomcat5-java accordingly
+ * Fixed servlet-api link in tomcat5-webapps.links and included needed
+ jsp-api link
+ * Standards-Version 3.6.2 - no changes required
+ * Build-Deps to Build-Dep-Indep to fix linitan warning
+
+ -- Wolfgang Baer <WBaer at gmx.de> Wed, 29 Jun 2005 22:32:49 +0200
+
+tomcat5 (5.0.30-2) experimental; urgency=low
+
+ * libtomcat5-java: does not provide commons-logging-api and
+ commons-daemon but use symlink to /usr/share/java. Now, tomcat5 can
+ start with non-free jdks (but it does not run with free one at the
+ moment for me) (closes: #315038)
+
+ -- Arnaud Vandyck <avdyk at debian.org> Tue, 21 Jun 2005 12:44:21 +0200
+
+tomcat5 (5.0.30-1) experimental; urgency=low
+
+ * Initial release release based on tomcat4 package by Stefan Gybas.
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 11 Jun 2005 17:00:35 +0200
+tomcat5.5 (5.5.26-2) unstable; urgency=low
+
+ * Fixed bootstrap.MF to put commons-logging-api.jar onto classpath instead
+ of commons-logging-api-1.1.1.jar. Closes: #477363
+
+ -- Michael Koch <konqueror at gmx.de> Sun, 01 Jun 2008 11:34:40 +0200
+
+tomcat5.5 (5.5.26-1) unstable; urgency=low
+
+ [ Michael Koch ]
+ * New upstream release.
+ - CVE-2007-5333: unauthorized disclosure of information. Closes: #465645
+ - CVS-2007-6286: handling of empty requests.
+ * debian/rules: Don't file when files to delete don't exist.
+ Closes: #458977
+ * debian/tomcat5.5.init: Change directory to $CATALINA_BASE/temp before
+ starting the daemon. Patch by David Pashley. Closes: #418826
+ * debian/tomcat5.5.init: Use 'printf' instead of 'echo -e'.
+ Closes: #472899
+
+ [ Marcus Better ]
+ * debian/policy/04webapps.policy: Grant read permission to JULI for the
+ (non-existing) logging.properties file in the example webapps. Closes:
+ #460839.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 19 Apr 2008 23:18:30 +0200
+
+tomcat5.5 (5.5.25-5) unstable; urgency=low
+
+ * debian/tomcat5.5.init: Check if tomcat-users.xml exists.
+ Thanks to Javier Serrano Polo for the patch. Closes: #445857.
+ * debian/tomcat5.5-webapps.postrm: Purge links created in postinst script.
+ Closes: #453879.
+ * debian/tomcat5.5-admin.links: Fix symlink for commons-io.jar.
+ Closes: #452366.
+ * debian/tomcat5.5.init: Check user id of the user running the init script.
+ Closes: #457956.
+ * Renamed /etc/cron.daily/tomcat5.5 to /etc/cron.daily/tomcat55.
+ Closes: #454296.
+ * debian/tomcat5.5.init: source /etc/default/locale and export LANG so
+ tomcat gets started with system locale. Originally reported to
+ https://bugs.launchpad.net/ubuntu/+source/tomcat5.5/+bug/153672.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 03 Jan 2008 13:23:44 +0100
+
+tomcat5.5 (5.5.25-4) unstable; urgency=high
+
+ * CVE-2007-5342: Fix unauthorized modification of data because of
+ too open permissions. Closes: #458237.
+ * Always clean temporary directory on startup. Closes: #456608.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 29 Dec 2007 20:15:40 +0100
+
+tomcat5.5 (5.5.25-3) unstable; urgency=low
+
+ * debian/libtomcat5.5-java.links: Removed links for xml-apis.jar and
+ xercesImpl.jar. Closes: #443382, #455495.
+ * Added libgnumail-java to Build-Depends. Closes: #454312.
+ * Updated Standards-Version to 3.7.3.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 13 Dec 2007 22:15:18 +0100
+
+tomcat5.5 (5.5.25-2) unstable; urgency=high
+
+ [ Michael Koch ]
+ CVE-2007-5461:
+ * Fix absolute path traversal vulnerability. Closes: #448664.
+
+ [ Marcus Better ]
+ * Add required commons-io symlink to the admin webapp, which fixes WAR
+ file uploads. (Closes: #452366)
+ * debian/control: Use the new Homepage and Vcs-* fields.
+ * debian/NEWS: Remove outdated entry.
+
+ -- Michael Koch <konqueror at gmx.de> Fri, 30 Nov 2007 10:46:33 +0100
+
+tomcat5.5 (5.5.25-1) unstable; urgency=high
+
+ * New upstream release. Setting usrgency to high.
+ - Fixes XSS issues. CVE-2007-1355, CVS-2007-2449 and CVE-2007-2450.
+ * debian/policy/04webapps.policy: fix permissions on
+ org.apache.tomcat.util.digester package.
+
+ -- Michael Koch <konqueror at gmx.de> Wed, 03 Oct 2007 20:04:18 +0200
+
+tomcat5.5 (5.5.23-1) unstable; urgency=low
+
+ [ Marcus Better ]
+ * New upstream version.
+ * Don't include /var/lib/tomcat5.5/conf/catalina.policy since it is
+ auto-generated at startup. Thanks to Javier Serrano Polo. (Closes:
+ #426761)
+ * Make sure files under /var/lib/tomcat5.5/conf are not
+ executable. Thanks to Marco Nenciarini. (Closes: #426740)
+ * Fixes a failure to start if the temp directory contained too many
+ files. Thanks to Maarten van der Hoef (Closes: #427978)
+ * tomcat5.5-admin now depends on libcommons-collections3-java and
+ libcommons-digester-java.
+
+ [ Michael Koch ]
+ * Clean up correctly on (re-)build (Closes: #434617).
+ * Replaced obsolete ${Source-Version} by ${source:Version}.
+ * Added myself to Uploaders.
+ * Updated (Build-)Depends on libcommons-modeler-java to (>= 2.0).
+ * Clear up comment in debian/tomcat5.5.default about TOMCAT55_USER.
+ (Closes: #425020).
+ * Make cron.daily script work when package is removed but not purged
+ (Closes: #436020).
+ * Applied patch from David Pashley to move configuration from
+ /var/lib/tomcat5.5/conf to /etc/tomcat5.5 (Closes: #434728).
+ * Use ${catalina.base} instead of ${catalina.home} in
+ debian/policy/50user.policy (Closes: #431704).
+ * Make tomcat5.5 depend on libecj-java instead of ecj-bootstrap
+ (Closes: #396170).
+ * Don't make tomcat5.5 on two non-virtual java runtimes. Removed kaffe.
+ * Don't let tomcat5.5 suggest libapache-mod-jk. Doesn't exist anymore.
+ * Fixed watch file.
+ * Set CATALINA_BASE to /var/lib/$NAME in debian/tomcat5.5.init.
+
+ -- Michael Koch <konqueror at gmx.de> Sun, 02 Sep 2007 11:28:05 +0200
+
+tomcat5.5 (5.5.20-5) unstable; urgency=low
+
+ * Messages are now logged to the system log instead of the pipe
+ "/var/log/tomcat5.5/catalina.out". (Closes: #402603, #402879)
+ * The security manager is enabled by default. A warning is logged to the
+ syslog when running under GCJ, which doesn't work in this mode
+ currently. (Closes: #411137)
+ * debian/rules: Set SHELL=/bin/bash as required. Thanks to David
+ Pashley. (Closes: #413845)
+ * Webapps are now permitted to read the properties "catalina.base" and
+ "catalina.home". Thanks to Adrian Bridgett. (Closes: #412479)
+ * Added the symlink "/usr/share/tomcat5.5/webapps" pointing to
+ "/var/lib/tomcat5.5/webapps". Thanks to Cyrille
+ <cnofficial at neotilus.com> and Florent Angebault. (Closes: #406614)
+ * Build with source level 1.5, since GCJ now supports generics. (Closes:
+ #424465)
+ * Recognise Sun JDK 6 from the sun-java6-jdk package.
+ * debian/control: Removed Stefan Gybas (on own request) and Wolfgang
+ Baer from Uploaders.
+
+ -- Marcus Better <marcus at better.se> Tue, 24 Apr 2007 15:04:17 +0200
+
+tomcat5.5 (5.5.20-4) unstable; urgency=low
+
+ * The symlink "/usr/share/tomcat5.5/common/endorsed/xml-apis" is now
+ correctly named "xml-apis.jar". Thanks to Javier Serrano
+ Polo. (Closes: #402265)
+ * The tomcat55 user now has write permissions to
+ "/var/lib/tomcat5.5/conf", so that Tomcat can deploy webapps in WAR
+ archives. (Closes: #402224)
+ * The named pipe /var/log/tomcat5.5/catalina.out is now properly
+ created.
+ * The TOMCAT5_SHUTDOWN variable in /etc/default/tomcat5.5 is obsolete
+ and has been removed.
+ * The init script now supports the try-restart action.
+ * Install the cron file.
+
+ -- Marcus Better <marcus at better.se> Sat, 9 Dec 2006 22:41:52 +0100
+
+tomcat5.5 (5.5.20-3) experimental; urgency=low
+
+ * Really fix the "/etc/init.d/tomcat5.5 status" command this
+ time. (Closes: #398044)
+ * Use jsvc for daemon startup, instead of the catalina.sh script. Daemon
+ shutdown is now faster and more reliable.
+ * Add missing permissions required by the admin webapp. Thanks to
+ Jonathan-Marc Lapointe.
+ * The CATALINA_OPTS variable in /etc/default/tomcat5.5 has been renamed
+ to the more intuitive JAVA_OPTS.
+
+ -- Marcus Better <marcus at better.se> Sat, 25 Nov 2006 21:20:18 +0100
+
+tomcat5.5 (5.5.20-2) unstable; urgency=medium
+
+ * Now runs with java-gcj-compat. (Closes: #395167)
+ * Add compatibility links for JDK 1.4. Thanks to Javier Serrano
+ Polo. (Closes: #397996).
+ * Fix accidental double removal of the tomcat55 user on purge in some
+ cases. Thanks to Andreas Beckmann. (Closes: #393224)
+ * Fix typo affecting "/etc/init.d/tomcat5.5 status" command. Thanks to
+ Jhair Tocancipa Triana. (Closes: #398044)
+ * Webapps are now installed in /usr/share/tomcat5.5-webapps. Their
+ context definitions are copied into
+ /var/lib/tomcat5.5/conf/Catalina/localhost on first install, but if
+ removed they will no longer be re-enabled on every upgrade. Thanks to
+ Adrian Bridgett. (Closes: #399184)
+ * Change owner of various files from tomcat5 to tomcat55 on upgrade from
+ release 5.5.17-1 or earlier. Thanks to Mike Whitaker. (Closes: #392569)
+ * Don't use juli LogManager with java-gcj-compat, as workaround for bug
+ #399251.
+ * We no longer need xsltproc to generate documentation, since the
+ required supporting functions are now available in main.
+ * debian/ant.properties, debian/rules: Don't delete PureTLS code from
+ the source. It will be ignored during build anyway.
+ * Rebuild jkstatus-ant from source instead of using precompiled class
+ files.
+ * Simplified the .install files by grouping by directory.
+ * Install forgotten files `catalina.properties', `logging.properties'
+ and `context.xml' in /var/lib/tomcat5.5/conf.
+ * Synchronized security policy files with upstream.
+ * debian/rules: Don't use CDBS. Thus we no longer need a bogus "ant xxx"
+ invocation in the "clean" target, and the script is simple enough
+ anyway.
+
+ -- Marcus Better <marcus at better.se> Tue, 21 Nov 2006 12:06:17 +0100
+
+tomcat5.5 (5.5.20-1) unstable; urgency=low
+
+ * New upstream release.
+ * Build JSP and servlet examples from source instead of copying them
+ from libservlet2.4-java. (Closes: #393905)
+ * debian/control: Add some missing dependencies.
+ * Enable commons-daemon functionality, it should work correctly by now.
+ * Make init script LSB compliant.
+ * Don't call /etc/init.d/tomcat5.5 directly from the maintainer scripts.
+
+ -- Marcus Better <marcus at better.se> Mon, 23 Oct 2006 13:28:15 +0200
+
+tomcat5.5 (5.5.17-2) unstable; urgency=low
+
+ * debian/control: removed apache-utils version and added alternative
+ apache2-utils (that provide the virtual apache-utils package)
+ * debian/tomcat5.init: added Sun's jdk path as provided by sun-java5-bin
+ package. (closes: #388617).
+ * debian/control: updated apache2-common to apache2.2-common (closes:
+ #391006) (thanks to Andrew Meaden and Luk Claes).
+ * debian/control (depends): removed -webapps and -admin from Depends
+ field and move them to Suggest to avoid circular dependencies, thanks
+ to Bill Allombert. (closes: #387362).
+ * tomcat5.5 has now the user tomcat55 and remove user tomcat5 if package
+ tomcat5 is marked as purge or if it's never been installed (closes:
+ #386831).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Mon, 9 Oct 2006 16:36:25 +0200
+
+tomcat5.5 (5.5.17-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: added tomcat5.5 dependency against ecj-boostrap so
+ there is a jsp compiler closes: #384062).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Tue, 12 Sep 2006 14:42:58 +0200
+
+tomcat5.5 (5.5.15-1) experimental; urgency=low
+
+ * Arnaud Vandyck <avdyk at debian.org>:
+ + All the work as been done by Wolfgang to have this package in
+ Debian.
+ + The package is now tomcat5.5 and not tomcat5.
+ + Now build with gcj instead of kaffe.
+ + Put cdbs and debhelper in Build-Depends.
+ + Standards-Version updated to 3.7.2.
+ + tomcat depends on tomcat-webapps and tomcat-admin, not only suggest
+ * New major upstream release
+ + New source layout - adaptions all over the place
+ + Ported all patches to new source layout
+ + Added patch (09_UseSystemDBCP.patch) to use system dbcp instead of
+ repackaged tomcat stuff (naming-factory-dbcp.jar)
+ + Drop now unneeded dependencies on libsaxpath-java, libjaxen-java,
+ libregexp-java from build-dependencies and dependencies
+ + Move dependency on libcommons-collections3-java,
+ libcommons-fileupload-java, libcommons-beanutils-java and
+ libcommons-digester-java to tomcat5-admin (only needed here)
+ + Move libraries around as required by new binary layout (e.g. i18n jars
+ into own directory)
+ + Moved and linked new jars (tomcat-jkstatus-ant.jar, tomcat-juli.jar)
+ + Updated 03catalina.policy to include tomcat-juli.jar, remove launcher.jar
+ + Install ant task definitions with libtomcat5-java
+ * Remove JDK 1.3 directories from JDK_DIRS in tomcat.init (not supported)
+ * Updated tomcat.default to remove JDK 1.3 options
+ * Updated description to include host-manager, fixed URLs
+ * Minor updates in README.Debian
+
+ -- Wolfgang Baer <WBaer at gmx.de> Fri, 27 Jan 2006 10:07:47 +0100
+
+tomcat5 (5.0.30-9) unstable; urgency=low
+
+ * kaffe compiler transition
+ + Remove build.compiler jikes property
+ + Modify tomcat5.init to use default compiler instead of jikes
+ * Fix spelling error in README.Debian (closes: #346573)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Tue, 17 Jan 2006 11:50:52 +0100
+
+tomcat5 (5.0.30-8) unstable; urgency=low
+
+ * Correct description to refer to tomcat5-webapps (closes: #336984)
+ * Test in tomcat5.init for JDK like environment so we are sure
+ java-gcj-compat-dev is installed and used (closes: #337270)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Mon, 7 Nov 2005 19:17:58 +0100
+
+tomcat5 (5.0.30-7) unstable; urgency=low
+
+ * Move to main - upload with orig.tar.gz included
+ * Works with kaffe (>= 1.1.6-3) and java-gcj-compat-dev
+ + changed debian/control accordingly
+ + adjusted tomcat5.init file
+ * Removed libcommons-httpclient-java build-dep - not needed
+
+ -- Wolfgang Baer <WBaer at gmx.de> Thu, 06 Oct 2005 21:59:36 +0200
+
+tomcat5 (5.0.30-6) unstable; urgency=low
+
+ * Move commons-fileupload jar from common/lib to server/lib
+ * Copy fixed struts-config.xml during install over the old one. The fixed
+ one is taken from upstream (published at download location)
+ * Tomcat5 has a new context file handling. The xml files with the context of
+ a webapp needs to be put into conf/[Engine name]/[Host name] whereas the
+ default engine which serves the admin webapp has to be called "Catalina":
+ + Create conf/Catalina/localhost directory during install
+ + Deploy the context files for the webapps into this directory
+ (closes: #315038)
+ + Added NEWS.Debian file to inform about moving context files to new
+ context directory hierarchy.
+ * Install the jsp/servlet examples (closes: #325508, #325507, #326126)
+ * Added unzip to build-deps (needed to unzip example webapps)
+ * Cleaned up debian/rules a bit
+ * libcommons-launcher-java dependency added in last upload (closes: #324041)
+ * Works with latest kaffe vm (closes: #320845) - added versioned dependency
+ * Changed depends to j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe
+ * Removed depends on j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe | java-compiler
+ as the above depends already includes an java-compiler as JDKs
+ * Removed note in description about non-free JDKs - kaffe works and the
+ info is superceded by the existance of java-package
+ * Updated *.policy files to match new jars and fixed typos
+ * As tomcat5 is now functional we can close the whishlist bugs for
+ packaging tomcat5 (closes: #222876, #267741)
+ * Disable commons-daemon copy/build - not available on all platforms
+ + Added patch 15_dont_copy_daemon.patch
+ + Removed related stuff from debian/rules and debian/control
+ * Removed classpath entry from MF and added jars directly to setclasspath.sh
+ + Patch 01_remove_classpath_manifest_a.patch removes the entry
+ + Patch 01_remove_classpath_manifest_b.patch adds it to setclasspath.sh
+ * Fixed typo CALALINA in README.Debian
+ * Fixed lintian warning in tomcat5.postinst
+ * Extended JDK_DIRS and enabled Security Manager for non-free JDKs
+ * Build documentation through commandline xslt processing
+ + Patch 03_fix_doc_stylesheet.patch to fix stylsheet variable definition
+ + Added xsltproc to build-deps and process docs in debian/rules
+ + Moved RELEASE-NOTES to webapps/ROOT where it belongs
+ + Added tomcat-docs.xml context definition to allow linking and also
+ starting tomcat5 without tomcat5-webapps installed (removed linking
+ for tomcat-docs from server.xml)
+ * Added myself to uploaders
+
+ * Upload sponsored by Petter Reinholdtsen
+
+ -- Wolfgang Baer <WBaer at gmx.de> Wed, 07 Sep 2005 17:25:44 +0200
+
+tomcat5 (5.0.30-5) unstable; urgency=low
+
+ * debian/control (libtomcat5-java: Depends): added
+ libcommons-launcher-java
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 20 Aug 2005 10:34:05 +0200
+
+tomcat5 (5.0.30-4) unstable; urgency=low
+
+ * upload to unstable
+ * debian/control: ant transition: change the dep from libant1.6-java to
+ ant
+ * debian/libtomcat5-java.links: added some links and corrected ant once
+ * updated to libcommons-collection3-java
+
+ -- Arnaud Vandyck <avdyk at debian.org> Fri, 19 Aug 2005 16:06:27 +0200
+
+tomcat5 (5.0.30-3) experimental; urgency=low
+
+ * Added libapache2-mod-jk to suggests, missing libcommons-el-java
+ to libtomcat5-java build-depends
+ * Fixed/Added links in libtomcat5-java (jsp-api/commons-el jars added)
+ * Changed JDK dirs (as generated by java-package), enabled security
+ manager and therefore put kaffe as last jdk (currently has problems)
+ * Fixed typo in ant.properties to correctly include logging-api.jar
+ and fixed libtomcat5-java accordingly
+ * Fixed servlet-api link in tomcat5-webapps.links and included needed
+ jsp-api link
+ * Standards-Version 3.6.2 - no changes required
+ * Build-Deps to Build-Dep-Indep to fix linitan warning
+
+ -- Wolfgang Baer <WBaer at gmx.de> Wed, 29 Jun 2005 22:32:49 +0200
+
+tomcat5 (5.0.30-2) experimental; urgency=low
+
+ * libtomcat5-java: does not provide commons-logging-api and
+ commons-daemon but use symlink to /usr/share/java. Now, tomcat5 can
+ start with non-free jdks (but it does not run with free one at the
+ moment for me) (closes: #315038)
+
+ -- Arnaud Vandyck <avdyk at debian.org> Tue, 21 Jun 2005 12:44:21 +0200
+
+tomcat5 (5.0.30-1) experimental; urgency=low
+
+ * Initial release release based on tomcat4 package by Stefan Gybas.
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 11 Jun 2005 17:00:35 +0200
More information about the pkg-java-commits
mailing list