svn commit: r726960 - in /hadoop/core/trunk: CHANGES.txt build.xml

[ni...@apache.org]

Author: nigel
Date: Mon Dec 15 21:17:32 2008
New Revision: 726960

URL: http://svn.apache.org/viewvc?rev=726960&view=rev
Log:
HADOOP-3921. Fixed clover (code coverage) target to work with JDK 6. Contributed by Tom White

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/build.xml

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=726960&r1=726959&r2=726960&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Mon Dec 15 21:17:32 2008
@@ -409,6 +409,9 @@
     HADOOP-4860. Split TestFileTailingAdapters into three separate tests to
     avoid contention. (Eric Yang via cdouglas)
 
+    HADOOP-3921. Fixed clover (code coverage) target to work with JDK 6.
+    (tomwhite via nigel)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/build.xml?rev=726960&r1=726959&r2=726960&view=diff
==============================================================================
--- hadoop/core/trunk/build.xml (original)
+++ hadoop/core/trunk/build.xml Mon Dec 15 21:17:32 2008
@@ -176,7 +176,8 @@
   <property name="jdiff.jar" value="${jdiff.home}/jdiff-${jdiff.version}.jar"/>
   <property name="xerces.jar" value="${jdiff.home}/xerces-${xerces.version}.jar"/>
 
-  <available property="clover.present" classname="com.cenqua.clover.tasks.CloverReportTask" />
+  <property name="clover.jar" location="${clover.home}/lib/clover.jar"/>
+  <available property="clover.present" file="${clover.jar}" />
 
   <!-- check if clover reports should be generated -->
   <condition property="clover.enabled">
@@ -205,6 +206,7 @@
     <pathelement location="${build.dir}"/>
     <pathelement location="${build.examples}"/>
     <pathelement location="${build.tools}"/>
+    <pathelement path="${clover.jar}"/>
     <fileset dir="${test.lib.dir}">
       <include name="**/*.jar" />
       <exclude name="**/excluded/" />
@@ -1417,10 +1419,10 @@
 
 
 
- <target name="clover" depends="clover.setup, clover.info" description="Instrument the Unit tests using Clover.  Requires a Clover license and clover.jar in the ANT classpath.  To use, specify -Drun.clover=true on the command line."/>
+ <target name="clover" depends="clover.setup, clover.info" description="Instrument the Unit tests using Clover.  To use, specify -Dclover.home=&lt;base of clover installation&gt; -Drun.clover=true on the command line."/>
 
 <target name="clover.setup" if="clover.enabled">
-   <taskdef resource="clovertasks"/>
+   <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
    <mkdir dir="${clover.db.dir}"/>
    <clover-setup initString="${clover.db.dir}/hadoop_coverage.db">
      <fileset dir="src" includes="core/**/* tools/**/* hdfs/**/* mapred/**/*"/>
@@ -1437,8 +1439,8 @@
   <fail unless="clover.present">
   ##################################################################
    Clover not found.
-   Please make sure clover.jar is in ANT_HOME/lib, or made available
-   to Ant using other mechanisms like -lib or CLASSPATH.
+   Please specify -Dclover.home=&lt;base of clover installation&gt;
+   on the command line.
   ##################################################################
   </fail>
 </target>