Author: kkolinko
Date: Mon Nov 18 11:52:16 2013
New Revision: 1543002
URL: http://svn.apache.org/r1543002
Log:
Update sample Eclipse IDE project:
Explicitly use a Java 6 SE JDK.
Exclude WebSocket classes that require Java 7 from build path.
Modified:
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1543002&r1=1543001&r2=1543002&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath Mon Nov 18
11:52:16 2013
@@ -16,10 +16,10 @@
limitations under the License.
-->
<classpath>
- <classpathentry kind="src" path="java"/>
- <classpathentry kind="src" path="test"/>
+ <classpathentry excluding="org/apache/tomcat/websocket/" kind="src"
path="java"/>
+ <classpathentry
excluding="org/apache/tomcat/websocket/|org/apache/catalina/websocket/"
kind="src" path="test"/>
<classpathentry kind="src" path="webapps/examples/WEB-INF/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/tomcat7-deps/dbcp/tomcat-dbcp.jar"
sourcepath="/TOMCAT_LIBS_BASE/tomcat7-deps/dbcp/src/java"/>
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=1543002&r1=1543001&r2=1543002&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Nov 18 11:52:16 2013
@@ -255,6 +255,11 @@
Add support for the Cobertura code coverage tool when running the unit
tests. Based on a patch by mhasko. (markt)
</add>
+ <update>
+ Update sample Eclipse IDE project. Explicitly use a Java 6 SE JDK.
+ Exclude JSR356 WebSocket classes from build path, as they cannot be
+ compiled with Java 6. (kkolinko)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
