svn commit: r1400664 - in /incubator/jspwiki/trunk: ChangeLog build.xml

[ju...@apache.org]

Author: juanpablo
Date: Sun Oct 21 15:00:52 2012
New Revision: 1400664

URL: http://svn.apache.org/viewvc?rev=1400664&view=rev
Log:
* ensure correct information on cobertura reports.

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.xml

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1400664&r1=1400663&r2=1400664&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Oct 21 15:00:52 2012
@@ -1,3 +1,7 @@
+2012-10-21  Juan Pablo Santos (juanpablo AT apache DOT org)
+       
+       * ensure correct information on cobertura reports.
+       
 2012-10-21  Florian Holeczek (florianh AT apache DOT org)
 
        * some further fixes to license headers

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1400664&r1=1400663&r2=1400664&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sun Oct 21 15:00:52 2012
@@ -302,10 +302,12 @@
   <!-- Removes the build directory and the tests build directory -->
   <target name="clean"
           description="Cleans away all generated files.">
+    <delete file="cobertura.ser" />
   	<delete dir="${tests.build}" />
     <delete dir="${code.build}" />
     <delete dir="${tests.reports}" />
   	<delete dir="${docs.javadoc}" />
+    <delete dir="${doc.rat}" />
   	<delete file="etc/jspwiki.properties" />
     <delete file="etc/i18n/CoreResources_en.properties" />
     <delete file="etc/i18n/plugin/PluginResources_en.properties" />
@@ -317,7 +319,6 @@
     <delete file="tests/etc/jspwiki_vers.properties" />
     <delete dir="tests/etc/db" />
     <delete dir="tests/etc/WEB-INF/dtd" />
-    <delete dir="${doc.rat}" />
     <delete file="tests/etc/WEB-INF/web.xml" />
     <delete>
       <fileset dir="." includes="**/*~" defaultexcludes="no"/>
@@ -1615,10 +1616,12 @@ To automate the JAR signing processs, yo
   </target>
 	
   <target name="coverage-tests" depends="compile,tests">
+  	<!-- delete previous info, if any -->
+    <delete file="cobertura.ser" />
+    <delete dir="${tests.build}/instrumented-classes" />
   	<!-- bootstrap cobertura ant-tasks -->
-  	<taskdef classpathref="path.optional" resource="tasks.properties" />
-  	<cobertura-instrument todir="${tests.build}/instrumented-classes" 
-    	                  datafile="${tests.build}/cobertura.ser">
+    <taskdef classpathref="path.optional" resource="tasks.properties" />
+  	<cobertura-instrument todir="${tests.build}/instrumented-classes">
       <fileset dir="${code.build}">
         <include name="**/*.class"/>
       </fileset>