Author: kkolinko
Date: Sun Nov 23 23:15:02 2014
New Revision: 1641295
URL: http://svn.apache.org/r1641295
Log:
Document creating second Eclipse project to compile WebSocket classes with Java
7 (ide-eclipse-websocket target added in 7.0.56 r1627245).
Modified:
tomcat/tc7.0.x/trunk/webapps/docs/building.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.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=1641295&r1=1641294&r2=1641295&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/building.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/building.xml Sun Nov 23 23:15:02 2014
@@ -229,13 +229,25 @@ Sample Eclipse project files and launch
The instructions below will automatically copy these into the required
locations.
</p>
<p>
-An Ant target is provided as a convenience to download all binary
dependencies, and to create
-the Eclipse project and classpath files in the root of the source tree.
+Two Ant targets are provided as a convenience. The first one, named
+<em>ide-eclipse</em>, downloads all binary dependencies and configures
+Eclipse project in the root of the source tree. The created Eclipse project
+targets a Java 6 JDK and skips WebSocket classes that cannot be compiled with
+Java 6.
+</p>
+
+<p>
+The second target, named <em>ide-eclipse-websocket</em>, creates directory
+<code>../tomcat-7.0.x-java7</code> and configures the second Eclipse project
+there. This project targets a Java 7 JDK. This project does not have its own
+source tree, but accesses a subset of the source tree of the first project,
+compiling all WebSocket classes that were skipped.
</p>
<p>
<code>cd ${tomcat.source}</code><br/>
-<code>ant ide-eclipse</code>
+<code>ant ide-eclipse</code><br/>
+<code>ant ide-eclipse-websocket</code>
</p>
<p>
@@ -254,11 +266,16 @@ Variables</em> to add two new <em>Classp
<tr><td>ANT_HOME</td><td>the base path of Ant 1.8.2 or later</td></tr>
</table>
+<p>
+In the <em>Preferences</em> dialog go to <em>Java->Installed JREs</em>
+and add JDK 6 and JDK 7 there. Close the dialog.
+</p>
<p>
-Use <em>File->Import</em> and choose <em>Existing Projects into
Workspace</em>.
+Use <em>File->Import</em> command from menu and choose <em>Existing
Projects into Workspace</em>.
From there choose the root directory of the Tomcat source tree
(<code>${tomcat.source}</code>)
-and import the Tomcat project located there.
+and import the project located there. Import the second project as well,
+if you have created it (<code>../tomcat-7.0.x-java7</code>).
</p>
<p>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1641295&r1=1641294&r2=1641295&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Nov 23 23:15:02 2014
@@ -99,7 +99,9 @@
</fix>
<update>
Improve HTML version of build instructions and align with
- BUILDING.txt. (kkolinko)
+ BUILDING.txt. Document creating second Eclipse project to compile
+ WebSocket classes with Java 7 (<code>ide-eclipse-websocket</code>
+ target added in 7.0.56). (kkolinko)
</update>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
