Author: kkolinko
Date: Fri Jan 24 15:12:33 2014
New Revision: 1561032
URL: http://svn.apache.org/r1561032
Log:
Update sample Eclipse IDE project to use JUnit 4 and
to prefer a Java 5 JDK instead of the default one
when several JDKs are configured.
Remove unused JUnit-related properties from Ant build files.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/eclipse.classpath
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1561032&r1=1561031&r2=1561032&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 24 15:12:33 2014
@@ -35,16 +35,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko, rjung
-1:
-* Update sample Eclipse IDE project to use JUnit 4 and
- to prefer a Java 5 JDK instead of the default one
- when several JDKs are configured.
- Remove unused JUnit-related properties from Ant build files.
-
https://people.apache.org/~kkolinko/patches/2014-01-24_tc6_junit4_eclipse.patch
- +1: kkolinko, markt, rjung
- -1:
- rjung: there are some additional junit references in file test/build.xml.
- I wasn't able to make them work. Maybe more cleanup opportunity?
-
* Remove second copy of RUNNING.txt from the full-docs distribution.
(Backport of r981845)
https://people.apache.org/~kkolinko/patches/2014-01-24_tc6_fulldocs_RUNNING.patch
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1561032&r1=1561031&r2=1561032&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Fri Jan 24 15:12:33 2014
@@ -58,8 +58,6 @@
<property name="tomcat.classes" value="${tomcat.output}/classes"/>
<property name="tomcat.dist" value="${tomcat.output}/dist"/>
<property name="tomcat.manifests" value="${tomcat.output}/manifests"/>
- <property name="test.failonerror" value="true"/>
- <property name="test.runner" value="junit.textui.TestRunner"/>
<!-- Can't be lower - jsp uses templates -->
<property name="compile.source" value="1.5"/>
@@ -118,8 +116,6 @@
<!-- Just build Tomcat -->
<target name="build-prepare">
- <available classname="junit.framework.TestCase" property="junit.present" />
-
<mkdir dir="${tomcat.classes}"/>
<delete dir="${tomcat.build}/temp" />
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=1561032&r1=1561031&r2=1561032&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Fri Jan 24 15:12:33 2014
@@ -61,8 +61,6 @@
<property name="tomcat.deployer" value="${tomcat.output}/deployer"/>
<property name="tomcat.extras" value="${tomcat.output}/extras"/>
<property name="tomcat.release" value="${tomcat.output}/release"/>
- <property name="test.failonerror" value="true"/>
- <property name="test.runner" value="junit.textui.TestRunner"/>
<!-- constant to declare a file binary for md5sum -->
<property name="md5sum.binary-prefix" value=" *" />
Modified: tomcat/tc6.0.x/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/eclipse.classpath?rev=1561032&r1=1561031&r2=1561032&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/eclipse.classpath (original)
+++ tomcat/tc6.0.x/trunk/eclipse.classpath Fri Jan 24 15:12:33 2014
@@ -19,9 +19,9 @@
<classpathentry
excluding="**/.svn/**|org/apache/tomcat/util/net/puretls/|org/apache/naming/factory/webservices/"
kind="src" path="java"/>
<classpathentry 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/J2SE-1.5"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/ecj-4.3.1/ecj-4.3.1.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
<classpathentry kind="output" path=".settings/output"/>
</classpath>
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=1561032&r1=1561031&r2=1561032&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Fri Jan 24 15:12:33 2014
@@ -62,8 +62,6 @@
<property name="tomcat.manifests" value="${tomcat.output}/manifests"/>
<property name="tomcat.deployer" value="${tomcat.output}/deployer"/>
<property name="tomcat.release" value="${tomcat.output}/release"/>
- <property name="test.failonerror" value="true"/>
- <property name="test.runner" value="junit.textui.TestRunner"/>
<!-- constant to declare a file binary for md5sum -->
<property name="md5sum.binary-prefix" value=" *" />
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=1561032&r1=1561031&r2=1561032&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 24 15:12:33 2014
@@ -70,6 +70,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <update>
+ Update sample Eclipse IDE project: use JUnit 4 library and prefer a
+ Java 5 JDK when several JDKs are configured. Cleanup the Ant build
+ files. (kkolinko)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.38 (markt)" rtext="not released">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
