Author: markt
Date: Tue Jun 22 17:52:40 2010
New Revision: 956964
URL: http://svn.apache.org/viewvc?rev=956964&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=49122
Update ROOT's index page
Patch provided by pid
Modified:
tomcat/trunk/webapps/ROOT/index.html
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/webapps/ROOT/index.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/index.html?rev=956964&r1=956963&r2=956964&view=diff
==============================================================================
--- tomcat/trunk/webapps/ROOT/index.html (original)
+++ tomcat/trunk/webapps/ROOT/index.html Tue Jun 22 17:52:40 2010
@@ -22,192 +22,155 @@
<title>Apache Tomcat</title>
<style type="text/css">
/*<![CDATA[*/
- body {
- color: #000000;
- background-color: #FFFFFF;
- font-family: Arial, "Times New Roman", Times, serif;
- margin: 10px 0px;
- }
-
+ body {
+ color: #000;
+ background-color: #fff;
+ color: #333;
+ font-family: Arial, "Times New Roman", Times, serif;
+ margin: 0;
+ padding: 10px;
+ min-width: 700px;
+ }
img {
border: none;
}
-
a:link, a:visited {
- color: blue
+ 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;
+ code {
+ display: block;
+ font-size: 120%;
+ color: #090;
+ margin: 0.5em 0.5em 0;
}
-
- td {
- color: #000000;
- font-family: Arial, Helvetica, sans-serif;
- }
-
- td.menu {
- background: #FFDC75;
+ h1, h2 {
+ font-size: 110%;
+ margin-top: 0;
}
-
- .center {
- text-align: center;
+ p#footer {
+ text-align: right;
+ font-size: 80%;
+ }
+ div#header {
+ min-width: 700px;
+ }
+ div#header h1 {
+ margin: 0;
+ }
+ div.fl {
+ float: left;
+ }
+ div.fr {
+ float: right;
+ }
+ #content div.fl {
+ width: 20%;
+ margin-right: 2%;
+ }
+ div#main {
+ float: left;
+ width: 77%;
+ }
+ .clear {
+ display: block;
+ clear: both;
+ }
+ .panel {
+ border: 2px solid #000;
+ background-color: #FFDC75;
+ padding: 0 0 20px;
+ margin: 0 0 20px;
+ }
+ .panel h3 {
+ border-bottom: 2px solid #000;
+ background-color: #D2A41C;
+ margin: 0 0 2px;
+ padding: 4px 4px 2px;
+ font: normal 110% Verdana, "Times New Roman", Times, serif;
+ font-style: italic;
}
-
- .code {
- color: #000000;
- font-family: "Courier New", Courier, monospace;
- font-size: 110%;
- margin-left: 2.5em;
+ .panel p {
+ margin: 0;
+ padding: 2px 4px 0;
}
-
- #banner {
- margin-bottom: 12px;
- }
-
- p#congrats {
- margin-top: 0;
- font-weight: bold;
- text-align: center;
- }
-
- p#footer {
- text-align: right;
- font-size: 80%;
- }
- /*]]>*/
- </style>
+ /*]]>*/
+ </style>
</head>
<body>
<!-- Header -->
-<table id="banner" width="100%">
- <tr>
- <td align="left" style="width:130px">
- <a href="http://tomcat.apache.org/";>
- <img src="tomcat.gif" height="92" width="130" alt="The Mighty Tomcat -
MEOW!"/>
- </a>
- </td>
- <td align="left" valign="top"><b>Apache Tomcat @VERSION@</b></td>
- <td align="right">
- <a href="http://www.apache.org/";>
- <img src="asf-logo-wide.gif" height="51" width="537" alt="The Apache
Software Foundation"/>
- </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="/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="/docs/changelog.html">Change Log</a><br/>
- <a href="/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://tomcat.apache.org/";>Home Page</a><br/>
- <a href="http://tomcat.apache.org/faq/";>FAQ</a><br/>
- <a
href="http://tomcat.apache.org/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+6&cmdtype=doit&order=Importance";>Open
Bugs</a><br/>
- <a
href="http://mail-archives.apache.org/mod_mbox/tomcat-users/";>Users Mailing List</a><br/>
- <a
href="http://mail-archives.apache.org/mod_mbox/tomcat-dev/";>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>Miscellaneous</th>
- </tr>
- <tr>
- <td class="menu">
- <a href="/examples/servlets/">Servlets Examples</a><br/>
- <a href="/examples/jsp/">JSP Examples</a><br/>
- <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.html</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
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="/docs">Tomcat Documentation</a> for
more detailed setup and administration information than is found in the INSTALL
file.</p>
-
- <p><b>NOTE: For security reasons, using 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, and an
introductory guide to developing web applications.</p>
-
- <p>Tomcat mailing lists are available at the Tomcat project web
site:</p>
-
- <ul>
- <li><b><a
href="mailto:[email protected]";>[email protected]</a></b> for
general questions related to configuring and using Tomcat</li>
- <li><b><a
href="mailto:[email protected]";>[email protected]</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 © 19...@year@ Apache Software Foundation<br/>
+<div id="header">
+ <div class="fl">
+ <img src="tomcat.gif" alt="The Mighty Tomcat - MEOW!"/>
+ </div>
+ <div class="fl">
+ <h1>Apache Tomcat @VERSION@</h1>
+ </div>
+ <div class="fr">
+ <img src="asf-logo-wide.gif" alt="The Apache Software Foundation"/>
+ </div>
+ <span class="clear"></span>
+</div>
+
+<div id="content">
+ <div class="fl">
+ <div class="panel">
+ <h3>Administration</h3>
+ <p><a href="/manager/status">Status</a></p>
+ <p><a href="/manager/html">Tomcat Manager</a></p>
+ <p><a href="/host-manager/html">Host Manager</a></p>
+ </div>
+ <div class="panel">
+ <h3>Documentation</h3>
+ <p><a href="RELEASE-NOTES.txt">Release Notes</a></p>
+ <p><a href="/docs/changelog.html">Change Log</a></p>
+ <p><a href="/docs">Tomcat Documentation</a></p>
+ </div>
+ <div class="panel">
+ <h3>Tomcat Online</h3>
+ <p><a href="http://tomcat.apache.org/";>Home Page</a></p>
+ <p><a href="http://tomcat.apache.org/faq/";>FAQ</a></p>
+ <p><a href="http://tomcat.apache.org/bugreport.html";>Bug
Database</a></p>
+ <p><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+7&cmdtype=doit&order=Importance";>Open
Bugs</a></p>
+ <p><a
href="http://mail-archives.apache.org/mod_mbox/tomcat-users/";>Users Mailing
List</a></p>
+ <p><a
href="http://mail-archives.apache.org/mod_mbox/tomcat-dev/";>Developers Mailing
List</a></p>
+ <p><a href="irc://irc.freenode.net/#tomcat">IRC</a></p>
+ </div>
+ <div class="panel">
+ <h3>Miscellaneous</h3>
+ <p><a href="http://localhost:8080/examples/servlets/";>Servlets
Examples</a></p>
+ <p><a href="http://localhost:8080/examples/jsp/";>JSP
Examples</a></p>
+ <p><a href="http://java.sun.com/products/jsp";>Sun's Java Server
Pages Site</a></p>
+ <p><a href="http://java.sun.com/products/servlet";>Sun's Servlet
Site</a></p>
+ </div>
+ </div>
+ <div id="main">
+ <h2>If you're seeing this page via a web browser, it means you've
setup Tomcat successfully. Congratulations!</h2>
+ <p>Now join the Tomcat Announce mailing list, which is a low volume
mailing list for releases, security vulnerabilities and other project
announcements.</p>
+ <ul>
+ <li><strong><a
href="mailto:[email protected]";>[email protected]</a>
for important announcements.</strong></li>
+ </ul>
+ <p>As you may have guessed by now, this is the default Tomcat home
page. It can be found on the local filesystem at:
+ <code>$CATALINA_HOME/webapps/ROOT/index.html</code></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 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="/docs">Tomcat
Documentation</a> for more detailed setup and administration information than
is found in the INSTALL file.</p>
+ <p><strong>NOTE: For security reasons, using the manager webapp is
restricted to users with role "manager".</strong>
+ 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, and an introductory
guide to developing web applications.</p>
+ <p>Tomcat mailing lists are available at the Tomcat project web
site:</p>
+ <ul>
+ <li><strong><a
href="mailto:[email protected]";>[email protected]</a></strong> for
general questions related to configuring and using Tomcat</li>
+ <li><strong><a
href="mailto:[email protected]";>[email protected]</a></strong> 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 © 19...@year@ Apache Software Foundation<br/>
All Rights Reserved
- </p>
- </td>
-
- </tr>
-</table>
-
+ </p>
+ </div>
+ <span class="clear"></span>
+</div>
</body>
</html>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=956964&r1=956963&r2=956964&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 22 17:52:40 2010
@@ -86,6 +86,10 @@
<subsection name="Web applications">
<changelog>
<fix>
+ <bug>49112</bug>: Update the ROOT web application's index page. Patch
+ provided by pid. (markt)
+ </fix>
+ <fix>
<bug>49213</bug>: Add the permissions necessary to enable the Manager
application to operate currently when running with a security manager.
(markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
