--- oscache-2.4.1/osbuild.xml.sav	2006-02-16 22:52:23.000000000 +0100
+++ oscache-2.4.1/osbuild.xml	2006-02-16 22:54:19.000000000 +0100
@@ -40,7 +40,6 @@
     <property name="build.test" value="${build}/test"/>
     <property name="build.java-test" value="${build}/java-test"/>
     <property name="build.java" value="${build}/java"/>
-    <property name="build.clover" value="${build}/clover"/>
     <property name="dist" location="dist"/>
 
     <property name="docs" location="docs"/>
@@ -71,7 +70,6 @@
     </path>
 
     <available property="junit.available" classname="junit.framework.TestCase"/>
-    <available property="clover.available" classname="org.apache.tools.ant.taskdefs.CloverCompilerAdapter"/>
 
     <target name="init" depends="init-anthill, init-standalone">
         <tstamp/>
@@ -91,9 +89,6 @@
         <fail message="Cannot run test cases. Please copy lib/build/junit-3.8.1.jar to ${ant.home}/lib"/>
     </target>
 
-    <target name="clover-check" depends="init" unless="clover.available">
-        <fail message="Cannot run coverage tests. Please copy lib/build/clover.jar and lib/build/clover.license (if it exists) to ${ant.home}/lib"/>
-    </target>
 
     <target name="clean" depends="init">
         <delete dir="${build}"/>
@@ -162,20 +157,12 @@
         <compile srcdir="${src.test}" destdir="${build.test}" classpath="${build.java}"
                  source="${test.compile.version}" target="${test.compile.version}"/>
 
-        <taskdef resource="clovertasks"/>
         <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
 
-        <mkdir dir="${build.clover}"/>
-        <clover-setup initString="${build.clover}/coverage.db">
-            <files>
-                <exclude name="${src.test}/**/*.java"/>
-            </files>
-        </clover-setup>
-
         <compile srcdir="${src.java}" destdir="${build.java-test}"/>
     </target>
 
-    <target name="test" depends="junit-check, clover-check, compile, test-compile" description="run tests"
+    <target name="test" depends="junit-check, compile, test-compile" description="run tests"
             unless="skip.tests">
         <run-junit />
     </target>
@@ -229,30 +216,11 @@
         </copy>
     </target>
 
-    <target name="reports" depends="junit.report, clover.report, javadocs"
+    <target name="reports" depends="junit.report, javadocs"
             description="generate javadocs and junit and coverage reports"/>
 
     <target name="docs" depends="reports, docs.impl"/>
 
-    <target name="clover.report" depends="test" description="generate coverage reports" unless="skip.tests">
-        <clover-report>
-            <current outfile="${dist.docs}/clover">
-                <format type="html"/>
-            </current>
-        </clover-report>
-    </target>
-
-    <target name="clover.historical" depends="clover.report" description="generate coverage historical reports"
-            unless="skip.tests">
-        <clover-historypoint historyDir="${build.clover}"/>
-
-        <clover-report>
-            <historical outfile="${dist.docs}/clover" historyDir="${build.clover}">
-                <format type="html"/>
-            </historical>
-        </clover-report>
-    </target>
-
     <target name="junit.report" depends="test" description="generate junit reports" unless="skip.tests">
         <junitreport todir="${dist.docs}/junit">
             <fileset dir="${dist.docs}/junit">
@@ -299,7 +267,6 @@
         <antcall target="predist.zip"/>
 
         <zip zipfile="${build}/${name}-${version}.zip" basedir="${dist}">
-            <exclude name="docs/clover/**/*"/>
             <exclude name="docs/junit/**/*"/>
         </zip>
     </target>
--- oscache-2.4.1/build.xml.orig	2007-05-13 12:55:36.000000000 -0400
+++ oscache-2.4.1/build.xml	2008-08-06 16:30:54.902081414 -0400
@@ -24,8 +24,6 @@
     <property name="common.build" value="../opensymphony/common/osbuild.xml"/>
     <import file="${common.build}"/>
  
-    <property name="clover.initstring" location="${build.clover}/coverageBase.db"/>
-    
     <!-- project properties -->
 
     <property name="src.webapp" value="${src}/webapp"/> <!-- new -->
@@ -196,18 +194,14 @@
         </sequential>
     </macrodef>
 
-    <!-- Compiling sources for junit tests and clover -->   
-    <target name="test-compile" depends="junit-check, clover-check">
+    <!-- Compiling sources for junit tests -->   
+    <target name="test-compile" depends="junit-check">
         <mkdir dir="${dist.docs}/junit"/>
-        <mkdir dir="${dist.docs}/clover"/>
         <mkdir dir="${build.test}"/>
-        <mkdir dir="${build.clover}"/>
-        <mkdir dir="${build.clover}/history" />
 
-	    <taskdef resource="clovertasks"/>
         <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
 	
-        <javac destdir="${build.test}" debug="${debug}" classpathref="cp" source="${test.compile.version}" target="${test.compile.version}" compiler="org.apache.tools.ant.taskdefs.CloverCompilerAdapter">
+        <javac destdir="${build.test}" debug="${debug}" classpathref="cp" source="${test.compile.version}" target="${test.compile.version}">
             <src path="${src.java}"/>
         </javac>
 
@@ -336,7 +330,6 @@
         <delete dir="${tmp.dir}/src"/>
         <delete dir="${tmp.dir}/${lib.build}"/>
         <delete dir="${tmp.dir}/docs/junit"/>
-        <delete dir="${tmp.dir}/docs/clover"/>
         <delete file="${tmp.lib}/jgroups-all.jar"/>
 
         <zip zipfile="${dist}/${name}-${version}-binary.zip" basedir="${tmp.dir}" includes="**"/>
@@ -354,22 +347,6 @@
 
     </target>
 
-    <target name="clover.report" depends="test">
-        <clover-report>
-            <current outfile="${dist.docs}/clover">
-                <fileset dir="${src.java}" excludes="**/Test*"/>
-                <format type="html"/>
-            </current>
-        </clover-report>
-<!--
-        <clover-historypoint historyDir="${build.clover}/history" />
-
-        <clover-report>
-            <historical outfile="${dist.docs}/clover/historical.pdf" historyDir="${build.clover}/history" />
-        </clover-report>
--->        
-    </target>
-	
     <target name="junit.report" depends="test">
         <junitreport todir="${dist.docs}/junit">
             <fileset dir="${dist.docs}/junit">
@@ -387,4 +364,4 @@
         <ivy-report todir="${dist.docs}/dependencies" graph="false"/>
     </target>
     
-</project>
\ No newline at end of file
+</project>