yoavs 2005/07/22 05:52:32
Modified: webapps/ROOT index.jsp
webapps/docs changelog.xml
Log:
Bugzilla 34931: http://issues.apache.org/bugzilla/show_bug.cgi?id=34931
Revision Changes Path
1.18 +218 -192 jakarta-tomcat-catalina/webapps/ROOT/index.jsp
Index: index.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/ROOT/index.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- index.jsp 15 Jan 2005 18:18:31 -0000 1.17
+++ index.jsp 22 Jul 2005 12:52:31 -0000 1.18
@@ -1,192 +1,218 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en"
"http://www.w3.org/TR/REC-html40/strict.dtd";>
-<%@ page session="false" %>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title><%= application.getServerInfo() %></title>
- <style type="text/css">
- <!--
- body {
- color: #000000;
- background-color: #FFFFFF;
- font-family: Arial, "Times New Roman", Times;
- font-size: 16px;
- }
-
- A:link {
- color: blue
- }
-
- A:visited {
- color: blue
- }
-
- td {
- color: #000000;
- font-family: Arial, "Times New Roman", Times;
- font-size: 16px;
- }
-
- .code {
- color: #000000;
- font-family: "Courier New", Courier;
- font-size: 16px;
- }
- -->
- </style>
-</head>
-
-<body>
-
-<!-- Header -->
-<table width="100%">
- <tr>
- <td align="left" width="130"><a
href="http://jakarta.apache.org/tomcat/index.html";><img src="tomcat.gif"
height="92" width="130" border="0" alt="The Mighty Tomcat - MEOW!"></td>
- <td align="left" valign="top">
- <table>
- <tr><td align="left" valign="top"><b><%=
application.getServerInfo() %></b></td></tr>
- </table>
- </td>
- <td align="right"><a href="http://jakarta.apache.org/";><img
src="jakarta-banner.gif" height="48" width="505" border="0" alt="The Jakarta
Project"></a></td>
- </tr>
-</table>
-
-<br>
-
-<table>
- <tr>
-
- <!-- Table of Contents -->
- <td valign="top">
- <table width="100%" border="1" cellspacing="0" cellpadding="3"
bordercolor="#000000">
- <tr>
- <td bgcolor="#D2A41C" bordercolor="#000000" align="left"
nowrap>
- <font face="Verdana"
size="+1"><i>Administration</i> </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="#FFDC75" bordercolor="#000000" nowrap>
- <a href="manager/status">Status</a><br>
- <a href="admin">Tomcat Administration</a><br>
- <a href="manager/html">Tomcat Manager</a><br>
-
- </td>
- </tr>
- </table>
- <br>
- <table width="100%" border="1" cellspacing="0" cellpadding="3"
bordercolor="#000000">
- <tr>
- <td bgcolor="#D2A41C" bordercolor="#000000" align="left"
nowrap>
- <font face="Verdana"
size="+1"><i>Documentation</i> </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="#FFDC75" bordercolor="#000000" nowrap>
- <a href="RELEASE-NOTES.txt">Release Notes</a><br>
- <a href="tomcat-docs/changelog.html">Change
Log</a><br>
- <a href="tomcat-docs">Tomcat Documentation</a><br>
-
- </td>
- </tr>
- </table>
- <br>
- <table width="100%" border="1" cellspacing="0" cellpadding="3"
bordercolor="#000000">
- <tr>
- <td bgcolor="#D2A41C" bordercolor="#000000" align="left"
nowrap>
- <font face="Verdana" size="+1"><i>Tomcat
Online</i> </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="#FFDC75" bordercolor="#000000" nowrap>
- <a href="http://jakarta.apache.org/tomcat/";>Home
Page</a><br>
- <a
href="http://jakarta.apache.org/tomcat/bugreport.html";>Bug Database</a><br>
- <a
href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&resolution=LATER&resolution=REMIND&resolution=---&bugidtype=include&product=Tomcat+5&cmdtype=doit&order=Importance";>Open
Bugs</a><br>
- <a
href="http://nagoya.apache.org/eyebrowse/SummarizeList?listId=88";>Users Mailing
List</a><br>
- <a
href="http://nagoya.apache.org/eyebrowse/SummarizeList?listId=46";>Developers
Mailing List</a><br>
- <a href="irc://irc.freenode.net/#tomcat">IRC</a><br>
-
- </td>
- </tr>
- </table>
- <br>
- <table width="100%" border="1" cellspacing="0" cellpadding="3"
bordercolor="#000000">
- <tr>
- <td bgcolor="#D2A41C" bordercolor="#000000" align="left"
nowrap>
- <font face="Verdana"
size="+1"><i>Examples</i> </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="#FFDC75" bordercolor="#000000" nowrap>
- <a href="jsp-examples/">JSP Examples</a><br>
- <a href="servlets-examples/">Servlet Examples</a><br>
- <a href="webdav/">WebDAV capabilities</a><br>
-
- </td>
- </tr>
- </table>
- <br>
- <table width="100%" border="1" cellspacing="0" cellpadding="3"
bordercolor="#000000">
- <tr>
- <td bgcolor="#D2A41C" bordercolor="#000000" align="left"
nowrap>
- <font face="Verdana"
size="+1"><i>Miscellaneous</i> </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="#FFDC75" bordercolor="#000000" nowrap>
- <a href="http://java.sun.com/products/jsp";>Sun's
Java Server Pages Site</a><br>
- <a href="http://java.sun.com/products/servlet";>Sun's
Servlet Site</a><br>
-
- </td>
- </tr>
- </table>
- </td>
-
- <td> </td>
-
- <!-- Body -->
- <td align="left" valign="top">
- <p><center><b>If you're seeing this page via a web browser, it
means you've setup Tomcat successfully. Congratulations!</b></center></p>
-
- <p>As you may have guessed by now, this is the default Tomcat
home page. It can be found on the local filesystem at:
- <blockquote>
- <p class="code">$CATALINA_HOME/webapps/ROOT/index.jsp</p>
- </blockquote>
- </p>
-
- <p>where "$CATALINA_HOME" is the root of the Tomcat installation
directory. If you're seeing this page, and you don't think you should be, then
either you're either a user who has arrived at new installation of Tomcat, or
you're an administrator who hasn't got his/her setup quite right. Providing the
latter is the case, please refer to the <a href="tomcat-docs">Tomcat
Documentation</a> for more detailed setup and administration information than
is found in the INSTALL file.</p>
-
- <p><b>NOTE:</b> This page is precompiled. If you change it, this
page will not change since
- it was compiled into a servlet at build time.
- (See <tt>$CATALINA_HOME/webapps/ROOT/WEB-INF/web.xml</tt>
as to how it was mapped.)
- </p>
-
- <p><b>NOTE: For security reasons, using the administration webapp
- is restricted to users with role "admin". The manager webapp
- is restricted to users with role "manager".</b>
- Users are defined in
<code>$CATALINA_HOME/conf/tomcat-users.xml</code>.</p>
-
- <p>Included with this release are a host of sample Servlets and
JSPs (with associated source code), extensive documentation (including the
Servlet 2.4 and JSP 2.0 API JavaDoc), and an introductory guide to developing
web applications.</p>
-
- <p>Tomcat mailing lists are available at the Jakarta project web
site:</p>
-
- <ul>
- <li><b><a href="mailto:[EMAIL
PROTECTED]">tomcat-user@jakarta.apache.org</a></b> for general questions
related to configuring and using Tomcat</li>
- <li><b><a href="mailto:[EMAIL
PROTECTED]">tomcat-dev@jakarta.apache.org</a></b> for developers working on
Tomcat</li>
- </ul>
-
- <p>Thanks for using Tomcat!</p>
-
- <p align="right"><font size=-1><img src="tomcat-power.gif"
width="77" height="80"></font><br>
-
- <font size=-1>Copyright © 1999-2004 Apache Software
Foundation</font><br>
- <font size=-1>All Rights Reserved</font> <br>
- </p>
- <p align="right"> </p>
-
- </td>
-
- </tr>
-</table>
-
-</body>
-</html>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<%@ page session="false" %>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+ <head>
+ <title><%= application.getServerInfo() %></title>
+ <style type="text/css">
+ /*<![CDATA[*/
+ body {
+ color: #000000;
+ background-color: #FFFFFF;
+ font-family: Arial, "Times New Roman", Times, serif;
+ margin: 10px 0px;
+ }
+
+ img {
+ border: none;
+ }
+
+ a:link, a:visited {
+ color: blue
+ }
+
+ th {
+ font-family: Verdana, "Times New Roman", Times, serif;
+ font-size: 110%;
+ font-weight: normal;
+ font-style: italic;
+ background: #D2A41C;
+ text-align: left;
+ }
+
+ td {
+ color: #000000;
+ font-family: Arial, Helvetica, sans-serif;
+ }
+
+ td.menu {
+ background: #FFDC75;
+ }
+
+ .center {
+ text-align: center;
+ }
+
+ .code {
+ color: #000000;
+ font-family: "Courier New", Courier, monospace;
+ font-size: 110%;
+ margin-left: 2.5em;
+ }
+
+ #banner {
+ margin-bottom: 12px;
+ }
+
+ p#congrats {
+ margin-top: 0;
+ font-weight: bold;
+ text-align: center;
+ }
+
+ p#footer {
+ text-align: right;
+ font-size: 80%;
+ }
+ /*]]>*/
+ </style>
+</head>
+
+<body>
+
+<!-- Header -->
+<table id="banner" width="100%">
+ <tr>
+ <td align="left" style="width:130px">
+ <a href="http://jakarta.apache.org/tomcat/index.html";>
+ <img src="tomcat.gif" height="92" width="130" alt="The Mighty Tomcat
- MEOW!"/>
+ </a>
+ </td>
+ <td align="left" valign="top"><b><%= application.getServerInfo()
%></b></td>
+ <td align="right">
+ <a href="http://jakarta.apache.org/";>
+ <img src="jakarta-banner.gif" height="48" width="505" alt="The
Jakarta Project"/>
+ </a>
+ </td>
+ </tr>
+</table>
+
+<table>
+ <tr>
+
+ <!-- Table of Contents -->
+ <td valign="top">
+ <table width="100%" border="1" cellspacing="0" cellpadding="3">
+ <tr>
+ <th>Administration</th>
+ </tr>
+ <tr>
+ <td class="menu">
+ <a href="manager/status">Status</a><br/>
+ <a href="admin">Tomcat Administration</a><br/>
+ <a href="manager/html">Tomcat Manager</a><br/>
+
+ </td>
+ </tr>
+ </table>
+
+ <br />
+ <table width="100%" border="1" cellspacing="0" cellpadding="3">
+ <tr>
+ <th>Documentation</th>
+ </tr>
+ <tr>
+ <td class="menu">
+ <a href="RELEASE-NOTES.txt">Release Notes</a><br/>
+ <a
href="tomcat-docs/changelog.html">Change Log</a><br/>
+ <a href="tomcat-docs">Tomcat Documentation</a><br/>
+
+ </td>
+ </tr>
+ </table>
+
+ <br/>
+ <table width="100%" border="1" cellspacing="0" cellpadding="3">
+ <tr>
+ <th>Tomcat Online</th>
+ </tr>
+ <tr>
+ <td class="menu">
+ <a
href="http://jakarta.apache.org/tomcat/";>Home Page</a><br/>
+ <a href="http://jakarta.apache.org/tomcat/faq";>FAQ</a><br/>
+ <a
href="http://jakarta.apache.org/tomcat/bugreport.html";>Bug Database</a><br/>
+ <a
href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&resolution=LATER&resolution=REMIND&resolution=---&bugidtype=include&product=Tomcat+5&cmdtype=doit&order=Importance";>Open
Bugs</a><br/>
+ <a
href="http://nagoya.apache.org/eyebrowse/SummarizeList?listId=88";>Users Mailing List</a><br/>
+ <a
href="http://nagoya.apache.org/eyebrowse/SummarizeList?listId=46";>Developers Mailing List</a><br/>
+ <a href="irc://irc.freenode.net/#tomcat">IRC</a><br/>
+
+ </td>
+ </tr>
+ </table>
+
+ <br/>
+ <table width="100%" border="1" cellspacing="0" cellpadding="3">
+ <tr>
+ <th>Examples</th>
+ </tr>
+ <tr>
+ <td class="menu">
+ <a href="jsp-examples/">JSP Examples</a><br/>
+ <a
href="servlets-examples/">Servlet Examples</a><br/>
+ <a href="webdav/">WebDAV capabilities</a><br/>
+
+ </td>
+ </tr>
+ </table>
+
+ <br/>
+ <table width="100%" border="1" cellspacing="0" cellpadding="3">
+ <tr>
+ <th>Miscellaneous</th>
+ </tr>
+ <tr>
+ <td class="menu">
+ <a
href="http://java.sun.com/products/jsp";>Sun's Java Server Pages Site</a><br/>
+ <a
href="http://java.sun.com/products/servlet";>Sun's Servlet Site</a><br/>
+
+ </td>
+ </tr>
+ </table>
+ </td>
+
+ <td style="width:20px"> </td>
+
+ <!-- Body -->
+ <td align="left" valign="top">
+ <p id="congrats">If you're seeing this page via a web browser, it
means you've setup Tomcat successfully. Congratulations!</p>
+
+ <p>As you may have guessed by now, this is the default Tomcat home
page. It can be found on the local filesystem at:</p>
+ <p class="code">$CATALINA_HOME/webapps/ROOT/index.jsp</p>
+
+ <p>where "$CATALINA_HOME" is the root of the Tomcat installation
directory. If you're seeing this page, and you don't think you should be, then
either you're either a user who has arrived at new installation of Tomcat, or
you're an administrator who hasn't got his/her setup quite right. Providing the
latter is the case, please refer to the <a href="tomcat-docs">Tomcat
Documentation</a> for more detailed setup and administration information than
is found in the INSTALL file.</p>
+
+ <p><b>NOTE:</b> This page is precompiled. If you change it, this
page will not change since
+ it was compiled into a servlet at build time.
+ (See <tt>$CATALINA_HOME/webapps/ROOT/WEB-INF/web.xml</tt>
as to how it was mapped.)
+ </p>
+
+ <p><b>NOTE: For security reasons, using the administration webapp
+ is restricted to users with role "admin". The manager webapp
+ is restricted to users with role "manager".</b>
+ Users are defined in
<code>$CATALINA_HOME/conf/tomcat-users.xml</code>.</p>
+
+ <p>Included with this release are a host of sample Servlets and
JSPs (with associated source code), extensive documentation (including the
Servlet 2.4 and JSP 2.0 API JavaDoc), and an introductory guide to developing
web applications.</p>
+
+ <p>Tomcat mailing lists are available at the Jakarta project web
site:</p>
+
+ <ul>
+ <li><b><a href="mailto:[EMAIL
PROTECTED]">tomcat-user@jakarta.apache.org</a></b> for general questions
related to configuring and using Tomcat</li>
+ <li><b><a href="mailto:[EMAIL
PROTECTED]">tomcat-dev@jakarta.apache.org</a></b> for developers working on
Tomcat</li>
+ </ul>
+
+ <p>Thanks for using Tomcat!</p>
+
+ <p id="footer"><img src="tomcat-power.gif" width="77"
height="80" alt="Powered by Tomcat"/><br/>
+
+
+ Copyright © 1999-2005 Apache Software Foundation<br/>
+ All Rights Reserved
+ </p>
+ </td>
+
+ </tr>
+</table>
+
+</body>
+</html>
1.331 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- changelog.xml 21 Jul 2005 21:40:56 -0000 1.330
+++ changelog.xml 22 Jul 2005 12:52:32 -0000 1.331
@@ -81,6 +81,10 @@
<fix>
<bug>35090</bug>: Minor documentation typo fix. (yoavs)
</fix>
+ <fix>
+ <bug>34931</bug>: Rewrote ROOT/index.jsp to be XHTML strict
compliant, per Richard
+ Beton's patch. (yoavs)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
