Author: kkolinko
Date: Wed Aug 8 23:38:07 2012
New Revision: 1371017
URL: http://svn.apache.org/viewvc?rev=1371017&view=rev
Log:
Remove "and later" part from JDK version in BUILDING.txt
Describe the issue with Apache Commons DBCP.
Align HTML building instructions with TXT ones.
Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/webapps/docs/building.xml
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1371017&r1=1371016&r2=1371017&view=diff
==============================================================================
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Wed Aug 8 23:38:07 2012
@@ -37,12 +37,27 @@ source distribution, do the following:
1. If the JDK is already installed, skip to (2).
- 2. Download a version 7 or later Java Development Kit (JDK) release (use the
+ 2. Download a version 7 of Java Development Kit (JDK) release (use the
latest update available for your chosen version) from one of:
http://www.oracle.com/technetwork/java/javase/downloads/index.html
http://openjdk.java.net/install/index.html
- or another JDK vendor
+ or another JDK vendor.
+
+ Note:
+ Apache Tomcat builds a private copy of the Apache Commons DBCP
+ library, which is used to provide support for database connection
+ pooling. As far as java.sql interfaces differ in different Java
+ versions, the library can be successfully compiled only with the
+ specified version of JDK.
+
+ See Apache Commons DBCP project web site for more details,
+ http://commons.apache.org/dbcp/
+
+ If you really want to use a later version of JDK to build Tomcat,
+ several workarounds are possible. One of them is to skip building the
+ library. Note though that you might not be able to create a "release"
+ without it.
3. Install the JDK according to the instructions included with the release.
Modified: tomcat/trunk/webapps/docs/building.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=1371017&r1=1371016&r2=1371017&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/building.xml (original)
+++ tomcat/trunk/webapps/docs/building.xml Wed Aug 8 23:38:07 2012
@@ -42,12 +42,13 @@ Tomcat. The following is a step by step
</section>
-<section name="Download a Java Development Kit (JDK) 1.6 or later">
+<section name="Download a Java Development Kit (JDK) version 7">
<p>
-Tomcat requires a JDK (version 1.6 or later) to be installed.
-<br/>The Sun JDK can be downloaded
-<a
href="http://www.oracle.com/technetwork/java/javase/downloads/index.html";>here</a>.
+Tomcat requires a JDK (version 7) to be installed. You can download one
from<br />
+<a
href="http://www.oracle.com/technetwork/java/javase/downloads/index.html";>http://www.oracle.com/technetwork/java/javase/downloads/index.html</a><br/>
+<a
href="http://openjdk.java.net/install/index.html";>http://openjdk.java.net/install/index.html</a><br/>
+or another JDK vendor.
</p>
<p>
@@ -81,7 +82,7 @@ available, which will be used to actuall
</section>
-<section name="Checkout or obtain the source code for Tomcat 7.0">
+<section name="Checkout or obtain the source code for Tomcat 8">
<p>
Tomcat SVN repository URL:
@@ -89,7 +90,7 @@ available, which will be used to actuall
</p>
<p>
Tomcat source packages:
- <a
href="http://tomcat.apache.org/download-70.cgi";>http://tomcat.apache.org/download-70.cgi</a>.
+ <a
href="http://tomcat.apache.org/download-80.cgi";>http://tomcat.apache.org/download-80.cgi</a>.
</p>
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
