markt 2004/05/08 15:30:14
Modified: catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java HTMLManagerServlet.java
catalina/src/share/org/apache/catalina/valves
ErrorReportValve.java
webapps/tomcat-docs tomcat-docs.xsl
Log:
Fix bug 21790. Modify noshade references to align with XHTML reference guide.
- Patch supplied by Henning Schmiedehausen
Removed unused imports identified by Eclipse.
Revision Changes Path
1.61 +6 -15
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- DefaultServlet.java 21 Nov 2003 19:00:52 -0000 1.60
+++ DefaultServlet.java 8 May 2004 22:30:13 -0000 1.61
@@ -76,10 +76,7 @@
import java.io.RandomAccessFile;
import java.io.Reader;
import java.io.InputStreamReader;
-import java.io.Writer;
import java.io.OutputStreamWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.sql.Timestamp;
import java.util.Date;
import java.util.Enumeration;
@@ -87,32 +84,26 @@
import java.util.StringTokenizer;
import java.util.Locale;
import java.util.TimeZone;
-import java.util.Hashtable;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.naming.NamingException;
import javax.naming.InitialContext;
-import javax.naming.Context;
import javax.naming.NamingEnumeration;
import javax.naming.NameClassPair;
import javax.naming.directory.DirContext;
-import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import org.apache.naming.resources.Resource;
import org.apache.naming.resources.ResourceAttributes;
import org.apache.catalina.Globals;
import org.apache.catalina.util.FastHttpDateFormat;
import org.apache.catalina.util.MD5Encoder;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.util.URLEncoder;
@@ -1455,7 +1446,7 @@
}
sb.append("</h1>");
- sb.append("<HR size=\"1\" noshade>");
+ sb.append("<HR size=\"1\" noshade=\"noshade\">");
sb.append("<table width=\"100%\" cellspacing=\"0\"" +
" cellpadding=\"5\" align=\"center\">\r\n");
@@ -1533,7 +1524,7 @@
// Render the page footer
sb.append("</table>\r\n");
- sb.append("<HR size=\"1\" noshade>");
+ sb.append("<HR size=\"1\" noshade=\"noshade\">");
sb.append("<h3>").append(ServerInfo.getServerInfo()).append("</h3>");
sb.append("</body>\r\n");
sb.append("</html>\r\n");
1.17 +6 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java
Index: HTMLManagerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- HTMLManagerServlet.java 14 Jun 2003 02:07:46 -0000 1.16
+++ HTMLManagerServlet.java 8 May 2004 22:30:13 -0000 1.17
@@ -71,7 +71,6 @@
import java.net.URL;
import java.net.MalformedURLException;
import java.text.MessageFormat;
-import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -85,7 +84,6 @@
import org.apache.catalina.util.ServerInfo;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.DiskFileUpload;
-import org.apache.commons.fileupload.FileUploadException;
/**
* Servlet that enables remote management of the web applications installed
@@ -659,7 +657,7 @@
" </td>\n" +
" </tr>\n" +
"</table>\n" +
- "<hr size=\"1\" noshade\"\">\n" +
+ "<hr size=\"1\" noshade=\"noshade\">\n" +
"<table cellspacing=\"4\" width=\"100%\" border=\"0\">\n" +
" <tr>\n" +
" <td class=\"page-title\" bordercolor=\"#000000\" " +
@@ -861,7 +859,7 @@
"\n";
private static final String HTML_TAIL_SECTION =
- "<hr size=\"1\" noshade\"\">\n" +
+ "<hr size=\"1\" noshade=\"noshade\">\n" +
"<center><font size=\"-1\" color=\"#525D76\">\n" +
" <em>Copyright © 1999-2002, Apache Software Foundation</em>" +
"</font></center>\n" +
1.15 +6 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Index: ErrorReportValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ErrorReportValve.java 1 Jan 2004 23:54:27 -0000 1.14
+++ ErrorReportValve.java 8 May 2004 22:30:14 -0000 1.15
@@ -291,7 +291,7 @@
sb.append("<h1>");
sb.append(sm.getString("errorReportValve.statusHeader",
"" + statusCode, message)).append("</h1>");
- sb.append("<HR size=\"1\" noshade>");
+ sb.append("<HR size=\"1\" noshade=\"noshade\">");
sb.append("<p><b>type</b> ");
if (throwable != null) {
sb.append(sm.getString("errorReportValve.exceptionReport"));
@@ -328,7 +328,7 @@
}
}
- sb.append("<HR size=\"1\" noshade>");
+ sb.append("<HR size=\"1\" noshade=\"noshade\">");
sb.append("<h3>").append(ServerInfo.getServerInfo()).append("</h3>");
sb.append("</body></html>");
1.11 +3 -3 jakarta-tomcat-4.0/webapps/tomcat-docs/tomcat-docs.xsl
Index: tomcat-docs.xsl
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/tomcat-docs.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tomcat-docs.xsl 12 Jan 2003 17:26:47 -0000 1.10
+++ tomcat-docs.xsl 8 May 2004 22:30:14 -0000 1.11
@@ -95,7 +95,7 @@
<xsl:comment>HEADER SEPARATOR</xsl:comment>
<tr>
<td colspan="2">
- <hr noshade="" size="1"/>
+ <hr noshade="noshade" size="1"/>
</td>
</tr>
@@ -150,7 +150,7 @@
<xsl:comment>FOOTER SEPARATOR</xsl:comment>
<tr>
<td colspan="2">
- <hr noshade="" size="1"/>
+ <hr noshade="noshade" size="1"/>
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
