Author: kkolinko
Date: Sat Aug 11 18:19:13 2012
New Revision: 1371985
URL: http://svn.apache.org/viewvc?rev=1371985&view=rev
Log:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=53601
Clarify that to build Apache Tomcat 6 from sources a Java 5 JDK is recommended.
Modified:
tomcat/tc6.0.x/trunk/BUILDING.txt
tomcat/tc6.0.x/trunk/webapps/docs/building.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/BUILDING.txt?rev=1371985&r1=1371984&r2=1371985&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc6.0.x/trunk/BUILDING.txt Sat Aug 11 18:19:13 2012
@@ -37,9 +37,31 @@ source distribution, do the following:
* If the JDK is already installed, skip to (1).
-* Download a Java Development Kit (JDK) release (version 1.5.x or later) from:
+* Download a Java Development Kit (JDK) of Java SE version 5 from
- http://java.sun.com/j2se/
+ http://www.oracle.com/technetwork/java/javase/downloads/index.html
+ or from another JDK vendor.
+
+ Note regarding versions of Java later than Java SE 5:
+
+ As documented elsewhere, one of components in Apache Tomcat includes
+ a private copy of the Apache Commons DBCP library. The source code
+ for this library is downloaded, processed by the build script
+ (renaming the packages) and compiled.
+
+ Due to changes in JDBC interfaces implemented by the library between
+ versions of Java SE specification, the library has to target specific
+ version of Java and can be compiled only with the JDK version
+ implementing this version of specification.
+
+ See Apache Commons DBCP project web site for more details on
+ available versions of the library and its requirements,
+
+ http://commons.apache.org/dbcp/
+
+ It is possible to use later versions of JDK to build Tomcat 6.0, but the
+ building of that component (tomcat-dbcp.jar) will be skipped and a
+ warning will be printed.
* Install the JDK according to the instructions included with the release.
Modified: tomcat/tc6.0.x/trunk/webapps/docs/building.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/building.xml?rev=1371985&r1=1371984&r2=1371985&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/building.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/building.xml Sat Aug 11 18:19:13 2012
@@ -42,10 +42,11 @@ Tomcat. The following is a step by step
</section>
-<section name="Download a Java Development Kit (JDK) release (version 1.5.x or
later)">
+<section name="Download a Java Development Kit (JDK) release (version 5)">
<p>
-The Sun JDK can be downloaded <a href="http://java.sun.com/j2se/";>here</a>.
+The JDK can be downloaded following the "Previous Releases" link from
+<a
href="http://www.oracle.com/technetwork/java/javase/downloads/index.html";>here</a>.
</p>
<p>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1371985&r1=1371984&r2=1371985&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Aug 11 18:19:13 2012
@@ -315,6 +315,10 @@
<bug>53664</bug>: Minor JNDI Howto document enhancement concerning mail
properties. Patch provided by Mark Eggers. (schultz)
</fix>
+ <fix>
+ <bug>53601</bug>: Clarify that to build Apache Tomcat 6 from sources
+ a Java 5 JDK is recommended. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
