svn commit: r1641141 - /tomcat/tc7.0.x/trunk/webapps/docs/building.xml

[kk...@apache.org]

Author: kkolinko
Date: Sun Nov 23 00:02:11 2014
New Revision: 1641141

URL: http://svn.apache.org/r1641141
Log:
Aligning building.html with BUILDING.txt:
Document installing Java 7 JDK in parallel with Java 6 one.

Modified:
    tomcat/tc7.0.x/trunk/webapps/docs/building.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/building.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/building.xml?rev=1641141&r1=1641140&r2=1641141&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/building.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/building.xml Sun Nov 23 00:02:11 2014
@@ -43,17 +43,25 @@ The following is a quick step by step gu
 
 </section>
 
-<section name="Download a Java Development Kit (JDK) version 6">
+<section name="Download Java Development Kit (JDK) versions 6 and 7">
 
 <p>
-Building Apache Tomcat requires a JDK (version 6) 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/>
-or from another JDK vendor.
+  Building Apache Tomcat requires a Java 6 JDK to be installed and optionally
+  a Java 7 JDK installed in parallel with Java 6 one. The Java 7 JDK is only
+  required if you wish to build Tomcat with JSR-356 (Java WebSocket 1.1)
+  support.
 </p>
 
 <p>
-<b>IMPORTANT</b>: Set an environment variable JAVA_HOME to the pathname of the
-directory into which you installed the JDK release.
+  You can download JDKs from Oracle<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/>
+  or from another JDK vendor.
+</p>
+
+<p>
+  <b>IMPORTANT</b>: Set an environment variable JAVA_HOME to the pathname of
+  the directory into which you installed the Java 6 JDK. The path to Java 7
+  JDK is configured in <code>build.properties</code> file (see below).
 </p>
 
 </section>
@@ -161,6 +169,20 @@ proxy.use=on]]></source>
 <section name="Building Tomcat">
 
 <p>
+  If you have installed a Java 7 JDK and wish to build Tomcat with JSR-356
+  (Java WebSocket 1.1) support, set <code>java.7.home</code> property in
+  file <code>${tomcat.source}/build.properties</code> to the location of
+  the Java 7 JDK installation.
+</p>
+
+<p>
+  An example, using 32-bit JDK on a 64-bit Windows system:
+</p>
+
+<source><![CDATA[# Location of Java 7 JDK
+java.7.home=C:/Program Files (x86)/Java/jdk1.7.0_72]]></source>
+
+<p>
 Use the following commands to build Tomcat:
 </p>
 



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