Author: markt
Date: Mon Aug 5 20:35:12 2013
New Revision: 1510714
URL: http://svn.apache.org/r1510714
Log:
Add 8.0.x to version page and separate out columns for specifcations.
Modified:
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/whichversion.xml
Modified: tomcat/site/trunk/docs/whichversion.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1510714&r1=1510713&r2=1510714&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Mon Aug 5 20:35:12 2013
@@ -201,7 +201,10 @@ mapping between the specifications and t
<tr>
-<td bgcolor="#039acc" valign="top"><font color="#000000" size="-1"
face="arial,helvetica,sanserif"><strong>Servlet/JSP Spec</strong></font></td>
+<td bgcolor="#039acc" valign="top"><font color="#000000" size="-1"
face="arial,helvetica,sanserif"><strong>Servlet Spec</strong></font></td>
+ <td bgcolor="#039acc" valign="top"><font color="#000000" size="-1"
face="arial,helvetica,sanserif"><strong>JSP Spec</strong></font></td>
+ <td bgcolor="#039acc" valign="top"><font color="#000000" size="-1"
face="arial,helvetica,sanserif"><strong>EL Spec</strong></font></td>
+ <td bgcolor="#039acc" valign="top"><font color="#000000" size="-1"
face="arial,helvetica,sanserif"><strong>WebSocket Spec</strong></font></td>
<td bgcolor="#039acc" valign="top"><font color="#000000" size="-1"
face="arial,helvetica,sanserif"><strong>Apache Tomcat
version</strong></font></td>
<td bgcolor="#039acc" valign="top"><font color="#000000" size="-1"
face="arial,helvetica,sanserif"><strong>Actual release
revision</strong></font></td>
<td bgcolor="#039acc" valign="top"><font color="#000000" size="-1"
face="arial,helvetica,sanserif"><strong>Minimum Java
Version</strong></font></td>
@@ -211,7 +214,23 @@ mapping between the specifications and t
<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">3.1</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">2.3</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">3.0</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">1.0</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">8.0.x</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">8.0.0-RC1 (alpha)</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">1.7</font></td>
+
+</tr>
+
+
+<tr>
+
+<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">3.0</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">2.2</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">2.2</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">N/A</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.42</font></td>
<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">1.6</font></td>
@@ -221,7 +240,10 @@ mapping between the specifications and t
<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"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">2.5</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">2.1</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">2.1</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">N/A</font></td>
<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">6.0.x</font></td>
<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">6.0.37</font></td>
<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">1.5</font></td>
@@ -231,7 +253,10 @@ mapping between the specifications and t
<tr>
-<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">2.4/2.0</font></td>
+<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">2.4</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">2.0</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">N/A</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">N/A</font></td>
<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">5.5.x (archived)</font></td>
<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">5.5.36 (archived)</font></td>
<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">1.4</font></td>
@@ -241,7 +266,10 @@ mapping between the specifications and t
<tr>
-<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">2.3/1.2</font></td>
+<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">2.3</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">1.2</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">N/A</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">N/A</font></td>
<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">4.1.x (archived)</font></td>
<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">4.1.40 (archived)</font></td>
<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">1.3</font></td>
@@ -251,7 +279,10 @@ mapping between the specifications and t
<tr>
-<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">2.2/1.1</font></td>
+<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">2.2</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">1.1</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">N/A</font></td>
+ <td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">N/A</font></td>
<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">3.3.x (archived)</font></td>
<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">3.3.2 (archived)</font></td>
<td bgcolor="#a0ddf0" valign="top" align="left"><font color="#000000"
size="-1" face="arial,helvetica,sanserif">1.1</font></td>
Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1510714&r1=1510713&r2=1510714&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Mon Aug 5 20:35:12 2013
@@ -20,42 +20,70 @@ mapping between the specifications and t
<table class="detail-table">
<tr>
- <th><strong>Servlet/JSP Spec</strong></th>
+ <th><strong>Servlet Spec</strong></th>
+ <th><strong>JSP Spec</strong></th>
+ <th><strong>EL Spec</strong></th>
+ <th><strong>WebSocket Spec</strong></th>
<th><strong>Apache Tomcat version</strong></th>
<th><strong>Actual release revision</strong></th>
<th><strong>Minimum Java Version</strong></th>
</tr>
<tr>
- <td>3.0/2.2</td>
+ <td>3.1</td>
+ <td>2.3</td>
+ <td>3.0</td>
+ <td>1.0</td>
+ <td>8.0.x</td>
+ <td>8.0.0-RC1 (alpha)</td>
+ <td>1.7</td>
+</tr>
+
+<tr>
+ <td>3.0</td>
+ <td>2.2</td>
+ <td>2.2</td>
+ <td>N/A</td>
<td>7.0.x</td>
<td>7.0.42</td>
<td>1.6</td>
</tr>
<tr>
- <td>2.5/2.1</td>
+ <td>2.5</td>
+ <td>2.1</td>
+ <td>2.1</td>
+ <td>N/A</td>
<td>6.0.x</td>
<td>6.0.37</td>
<td>1.5</td>
</tr>
<tr>
- <td>2.4/2.0</td>
+ <td>2.4</td>
+ <td>2.0</td>
+ <td>N/A</td>
+ <td>N/A</td>
<td>5.5.x (archived)</td>
<td>5.5.36 (archived)</td>
<td>1.4</td>
</tr>
<tr>
- <td>2.3/1.2</td>
+ <td>2.3</td>
+ <td>1.2</td>
+ <td>N/A</td>
+ <td>N/A</td>
<td>4.1.x (archived)</td>
<td>4.1.40 (archived)</td>
<td>1.3</td>
</tr>
<tr>
- <td>2.2/1.1</td>
+ <td>2.2</td>
+ <td>1.1</td>
+ <td>N/A</td>
+ <td>N/A</td>
<td>3.3.x (archived)</td>
<td>3.3.2 (archived)</td>
<td>1.1</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
