Author: markt
Date: Tue Jun 29 05:31:28 2010
New Revision: 958827

URL: http://svn.apache.org/viewvc?rev=958827&view=rev
Log:
Prep for 7.0.0 release

Modified:
    tomcat/site/trunk/docs/bugreport.html
    tomcat/site/trunk/docs/contact.html
    tomcat/site/trunk/docs/download-55.html
    tomcat/site/trunk/docs/download-60.html
    tomcat/site/trunk/docs/download-70.html
    tomcat/site/trunk/docs/download-connectors.html
    tomcat/site/trunk/docs/download-native.html
    tomcat/site/trunk/docs/findhelp.html
    tomcat/site/trunk/docs/getinvolved.html
    tomcat/site/trunk/docs/heritage.html
    tomcat/site/trunk/docs/index.html
    tomcat/site/trunk/docs/irc.html
    tomcat/site/trunk/docs/legal.html
    tomcat/site/trunk/docs/lists.html
    tomcat/site/trunk/docs/migration.html
    tomcat/site/trunk/docs/oldnews.html
    tomcat/site/trunk/docs/resources.html
    tomcat/site/trunk/docs/security-3.html
    tomcat/site/trunk/docs/security-4.html
    tomcat/site/trunk/docs/security-5.html
    tomcat/site/trunk/docs/security-6.html
    tomcat/site/trunk/docs/security-7.html
    tomcat/site/trunk/docs/security-impact.html
    tomcat/site/trunk/docs/security-jk.html
    tomcat/site/trunk/docs/security-native.html
    tomcat/site/trunk/docs/security.html
    tomcat/site/trunk/docs/svn.html
    tomcat/site/trunk/docs/whichversion.html
    tomcat/site/trunk/docs/whoweare.html
    tomcat/site/trunk/xdocs/index.xml
    tomcat/site/trunk/xdocs/stylesheets/project.xml
    tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/contact.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/contact.html (original)
+++ tomcat/site/trunk/docs/contact.html Tue Jun 29 05:31:28 2010
@@ -65,7 +65,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/download-55.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-55.html (original)
+++ tomcat/site/trunk/docs/download-55.html Tue Jun 29 05:31:28 2010
@@ -65,7 +65,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/download-60.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-60.html (original)
+++ tomcat/site/trunk/docs/download-60.html Tue Jun 29 05:31:28 2010
@@ -65,7 +65,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Tue Jun 29 05:31:28 2010
@@ -65,7 +65,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-connectors.html (original)
+++ tomcat/site/trunk/docs/download-connectors.html Tue Jun 29 05:31:28 2010
@@ -65,7 +65,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Tue Jun 29 05:31:28 2010
@@ -65,7 +65,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/findhelp.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/findhelp.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/findhelp.html (original)
+++ tomcat/site/trunk/docs/findhelp.html Tue Jun 29 05:31:28 2010
@@ -65,7 +65,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/getinvolved.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/getinvolved.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/getinvolved.html (original)
+++ tomcat/site/trunk/docs/getinvolved.html Tue Jun 29 05:31:28 2010
@@ -65,7 +65,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/heritage.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/heritage.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/heritage.html (original)
+++ tomcat/site/trunk/docs/heritage.html Tue Jun 29 05:31:28 2010
@@ -65,7 +65,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>
@@ -195,11 +198,13 @@
 <blockquote>
 
 <p>Apache Tomcat is an open source software implementation of the <a 
href="http://java.sun.com/products/servlets";>Java Servlet</a> and <a 
href="http://java.sun.com/products/jsp";>JavaServer Pages</a> technologies.  
-The Java Servlet and JavaServer Pages specifications are developed under the 
<a href="http://jcp.org/en/introduction/overview";>Java Community 
Process</a>.</p> 
+The Java Servlet and JavaServer Pages specifications are developed under the
+<a href="http://jcp.org/en/introduction/overview";>Java Community Process</a>.
+</p> 
 
 <p>Apache Tomcat is developed in an open and participatory environment and 
-released under the <a href="http://www.apache.org/licenses";>Apache 
- License version 2</a>.  Apache Tomcat is intended to be a collaboration of 
the 
+released under the <a href="http://www.apache.org/licenses";>Apache License
+version 2</a>.  Apache Tomcat is intended to be a collaboration of the 
 best-of-breed developers from around the world.  We invite you to 
 participate in this open development project.  To learn more about getting 
 involved, <a href="getinvolved.html">click here</a>.  </p> 
@@ -222,6 +227,49 @@ and their stories are listed on the 
 <tr>
 <td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="Tomcat 7.0.0 Released">
+<!--()-->
+</a>
+<a name="Tomcat_7.0.0_Released">
+<strong>Tomcat 7.0.0 Released</strong>
+</a>
+</font>
+</td>
+<td align="right" bgcolor="#525D76">
+<font color="#ffffff" face="arial,helvetica.sanserif">
+<strong>2010-06-29</strong>
+</font>
+</td>
+</tr>
+<tr>
+<td colspan="2">
+<p>
+<blockquote>
+<p>
+The Apache Tomcat Project is proud to announce the release of version 7.0.0 
beta
+of Apache Tomcat. This release is the first Apache Tomcat release to support 
the
+Servlet 3.0, JSP 2.2 and EL 2.2 specifications. In addition, it includes
+numerous other improvements such as web application memory leak detection and
+prevention, extensive internal code clean-up and support for including external
+content directly in a web application (aliases).</p>
+<p align="center">
+<a href="download-70.cgi">Download</a> |
+<a href="tomcat-7.0-doc/changelog.html">ChangeLog for 7.0.0</a>
+</p>
+</blockquote>
+</p>
+</td>
+</tr>
+<tr>
+<td>
+<br/>
+</td>
+</tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr>
+<td bgcolor="#525D76">
+<font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="Apache Tomcat Track at ApacheCon North America 2010">
 <!--()-->
 </a>
@@ -252,7 +300,7 @@ Foundation (ASF) will run to Atlanta thi
 sessions on Servers, Cloud Computing, Search NoSQL, Incubating projects,
 innovations, emerging technologies, and more.</p>
 <p>
-The Tomcat Project Management Committee (PMC) have sollicited session 
proposals from the
+The Tomcat Project Management Committee (PMC) have solicited session proposals 
from the
 Tomcat community and beyond.  We have notified proposers of
 acceptance or rejection and will publish the track program shortly. The Tomcat 
track should
 take place on Thursday the 3rd and is a whole day track.
@@ -334,7 +382,7 @@ fixes over Apache Tomcat 5.5.28.
 <blockquote>
 <p>
 The Apache Tomcat Project is proud to announce the release of version 6.0.26 
of Apache Tomcat.
-This release includes many bugfixes over Apache Tomcat 6.0.24.
+This release includes many bug fixes over Apache Tomcat 6.0.24.
 
 </p>
 <p align="center">

Modified: tomcat/site/trunk/docs/irc.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/irc.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/irc.html (original)
+++ tomcat/site/trunk/docs/irc.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/legal.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/lists.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/lists.html (original)
+++ tomcat/site/trunk/docs/lists.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/migration.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/resources.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/resources.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/resources.html (original)
+++ tomcat/site/trunk/docs/resources.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/security-3.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-3.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-3.html (original)
+++ tomcat/site/trunk/docs/security-3.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/security-4.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-4.html (original)
+++ tomcat/site/trunk/docs/security-4.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/security-5.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-5.html (original)
+++ tomcat/site/trunk/docs/security-5.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/security-6.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-6.html (original)
+++ tomcat/site/trunk/docs/security-6.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/security-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/security-impact.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-impact.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-impact.html (original)
+++ tomcat/site/trunk/docs/security-impact.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/security-jk.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-jk.html (original)
+++ tomcat/site/trunk/docs/security-jk.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/security-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-native.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-native.html (original)
+++ tomcat/site/trunk/docs/security-native.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/security.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security.html (original)
+++ tomcat/site/trunk/docs/security.html Tue Jun 29 05:31:28 2010
@@ -66,7 +66,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/svn.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/svn.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/svn.html (original)
+++ tomcat/site/trunk/docs/svn.html Tue Jun 29 05:31:28 2010
@@ -65,7 +65,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Tue Jun 29 05:31:28 2010
@@ -67,7 +67,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>
@@ -225,6 +228,21 @@ and the respective Apache Tomcat version
 
 <tr>
   <td bgcolor="#a0ddf0" valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">3.0/2.2</font>
+</td>
+  <td bgcolor="#a0ddf0" valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">7.0.x</font>
+</td>
+  <td bgcolor="#a0ddf0" valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">7.0.0 
(beta)</font>
+</td>
+  <td bgcolor="#a0ddf0" valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">1.6</font>
+</td>
+</tr>
+
+<tr>
+  <td bgcolor="#a0ddf0" valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">2.5/2.1</font>
 </td>
   <td bgcolor="#a0ddf0" valign="top" align="left">
@@ -368,6 +386,49 @@ stably for extended periods of time.</p>
 <tr>
 <td bgcolor="#525D76">
 <font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="Apache Tomcat 7.x">
+<!--()-->
+</a>
+<a name="Apache_Tomcat_7.x">
+<strong>Apache Tomcat 7.x</strong>
+</a>
+</font>
+</td>
+</tr>
+<tr>
+<td>
+<p>
+<blockquote>
+
+<p>
+<strong>Apache Tomcat 7.x</strong> is the current focus of
+development.  It builds upon the improvements made in Tomcat 6.0.x and
+implements the <strong>Servlet 3.0</strong>, <strong>JSP 2.2</strong> and
+<strong>EL 2.2</strong> specifications. In addition to that, it includes the
+following improvements:
+<ul>
+<li>Web application memory leak detection and prevention</li>
+<li>Improved security for the Manager and Host Manager applications</li>
+<li>Generic CSRF protection</li>
+<li>Support for including external content directly in a web application</li>
+<li>Refactoring (connectors, lifecycle) and lots of internal code clean-up</li>
+</ul>
+</p>
+
+</blockquote>
+</p>
+</td>
+</tr>
+<tr>
+<td>
+<br/>
+</td>
+</tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr>
+<td bgcolor="#525D76">
+<font color="#ffffff" face="arial,helvetica,sanserif">
 <a name="Apache Tomcat 6.x">
 <!--()-->
 </a>
@@ -383,10 +444,10 @@ stably for extended periods of time.</p>
 <blockquote>
 
 <p>
-<strong>Apache Tomcat 6.x</strong> is the current focus of
-development.  It builds upon the improvements made in Tomcat 5.5.x and 
implements
-the <strong>Servlet 2.5</strong> and <strong>JSP 2.1</strong>
-specifications. In addition to that, it includes the following improvements:
+<strong>Apache Tomcat 6.x</strong> builds upon the improvements made in
+Tomcat 5.5.x and implements the <strong>Servlet 2.5</strong> and
+<strong>JSP 2.1</strong> specifications. In addition to that, it includes the
+following improvements:
 <ul>
 <li>Memory usage optimizations</li>
 <li>Advanced IO capabilities</li>

Modified: tomcat/site/trunk/docs/whoweare.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Tue Jun 29 05:31:28 2010
@@ -65,7 +65,10 @@
 <a href="./whichversion.html">Which version?</a>
 </li>
 <li>
-<a href="./download-60.cgi">Tomcat 6.x</a>
+<a href="./download-70.cgi">Tomcat 7.0</a>
+</li>
+<li>
+<a href="./download-60.cgi">Tomcat 6.0</a>
 </li>
 <li>
 <a href="./download-55.cgi">Tomcat 5.5</a>

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Tue Jun 29 05:31:28 2010
@@ -13,11 +13,13 @@
 <p>Apache Tomcat is an open source software implementation of the <a
 href="http://java.sun.com/products/servlets";>Java Servlet</a> and <a 
 href="http://java.sun.com/products/jsp";>JavaServer Pages</a> technologies.  
-The Java Servlet and JavaServer Pages specifications are developed under the 
<a href="http://jcp.org/en/introduction/overview";>Java Community 
Process</a>.</p> 
+The Java Servlet and JavaServer Pages specifications are developed under the
+<a href="http://jcp.org/en/introduction/overview";>Java Community Process</a>.
+</p> 
 
 <p>Apache Tomcat is developed in an open and participatory environment and 
-released under the <a href="http://www.apache.org/licenses";>Apache 
- License version 2</a>.  Apache Tomcat is intended to be a collaboration of 
the 
+released under the <a href="http://www.apache.org/licenses";>Apache License
+version 2</a>.  Apache Tomcat is intended to be a collaboration of the 
 best-of-breed developers from around the world.  We invite you to 
 participate in this open development project.  To learn more about getting 
 involved, <a href="getinvolved.html">click here</a>.  </p> 
@@ -28,6 +30,20 @@ and their stories are listed on the 
 <a href="http://wiki.apache.org/tomcat/PoweredBy";>PoweredBy</a> wiki page.</p>
 </section>
 
+<section name="Tomcat 7.0.0 Released" rtext="2010-06-29">
+<p>
+The Apache Tomcat Project is proud to announce the release of version 7.0.0 
beta
+of Apache Tomcat. This release is the first Apache Tomcat release to support 
the
+Servlet 3.0, JSP 2.2 and EL 2.2 specifications. In addition, it includes
+numerous other improvements such as web application memory leak detection and
+prevention, extensive internal code clean-up and support for including external
+content directly in a web application (aliases).</p>
+<p align="center">
+<a href="download-70.cgi">Download</a> |
+<a href="tomcat-7.0-doc/changelog.html">ChangeLog for 7.0.0</a>
+</p>
+</section>
+
 <section name="Apache Tomcat Track at ApacheCon North America 2010" 
rtext="2010-05-27">
 <p><a href="http://na.apachecon.com/c/acna2010/";><img
 src="images/ACNA2010_120x240_basic.gif" width="120" height="240"
@@ -41,7 +57,7 @@ Foundation (ASF) will run to Atlanta thi
 sessions on Servers, Cloud Computing, Search NoSQL, Incubating projects,
 innovations, emerging technologies, and more.</p>
 <p>
-The Tomcat Project Management Committee (PMC) have sollicited session 
proposals from the
+The Tomcat Project Management Committee (PMC) have solicited session proposals 
from the
 Tomcat community and beyond.  We have notified proposers of
 acceptance or rejection and will publish the track program shortly. The Tomcat 
track should
 take place on Thursday the 3rd and is a whole day track.
@@ -65,7 +81,7 @@ fixes over Apache Tomcat 5.5.28.
 <section name="Tomcat 6.0.26 Released" rtext="2010-03-11">
 <p>
 The Apache Tomcat Project is proud to announce the release of version 6.0.26 
of Apache Tomcat.
-This release includes many bugfixes over Apache Tomcat 6.0.24.
+This release includes many bug fixes over Apache Tomcat 6.0.24.
 
 </p>
 <p align="center">

Modified: tomcat/site/trunk/xdocs/stylesheets/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/project.xml?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/stylesheets/project.xml (original)
+++ tomcat/site/trunk/xdocs/stylesheets/project.xml Tue Jun 29 05:31:28 2010
@@ -12,7 +12,8 @@
 
     <menu name="Download">
         <item name="Which version?"           href="/whichversion.html"/>
-        <item name="Tomcat 6.x"               href="/download-60.cgi"/>
+        <item name="Tomcat 7.0"               href="/download-70.cgi"/>
+        <item name="Tomcat 6.0"               href="/download-60.cgi"/>
         <item name="Tomcat 5.5"               href="/download-55.cgi"/>
         <item name="Tomcat Connectors"        href="/download-connectors.cgi"/>
         <item name="Tomcat Native"            href="/download-native.cgi"/>

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=958827&r1=958826&r2=958827&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Tue Jun 29 05:31:28 2010
@@ -24,6 +24,13 @@ and the respective Apache Tomcat version
 </tr>
 
 <tr>
+  <td>3.0/2.2</td>
+  <td>7.0.x</td>
+  <td>7.0.0 (beta)</td>
+  <td>1.6</td>
+</tr>
+
+<tr>
   <td>2.5/2.1</td>
   <td>6.0.x</td>
   <td>6.0.26</td>
@@ -97,12 +104,31 @@ stably for extended periods of time.</p>
 
 </section>
 
+<section name="Apache Tomcat 7.x">
+
+<p><strong>Apache Tomcat 7.x</strong> is the current focus of
+development.  It builds upon the improvements made in Tomcat 6.0.x and
+implements the <strong>Servlet 3.0</strong>, <strong>JSP 2.2</strong> and
+<strong>EL 2.2</strong> specifications. In addition to that, it includes the
+following improvements:
+<ul>
+<li>Web application memory leak detection and prevention</li>
+<li>Improved security for the Manager and Host Manager applications</li>
+<li>Generic CSRF protection</li>
+<li>Support for including external content directly in a web application</li>
+<li>Refactoring (connectors, lifecycle) and lots of internal code clean-up</li>
+</ul>
+</p>
+
+</section>
+
+
 <section name="Apache Tomcat 6.x">
 
-<p><strong>Apache Tomcat 6.x</strong> is the current focus of
-development.  It builds upon the improvements made in Tomcat 5.5.x and 
implements
-the <strong>Servlet 2.5</strong> and <strong>JSP 2.1</strong>
-specifications. In addition to that, it includes the following improvements:
+<p><strong>Apache Tomcat 6.x</strong> builds upon the improvements made in
+Tomcat 5.5.x and implements the <strong>Servlet 2.5</strong> and
+<strong>JSP 2.1</strong> specifications. In addition to that, it includes the
+following improvements:
 <ul>
 <li>Memory usage optimizations</li>
 <li>Advanced IO capabilities</li>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to