From 2b13c21b7bbe49834703b3ec882750e5afc74ecc Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Tue, 5 Apr 2011 09:26:19 +0000
Subject: QPID-3184: Amend ant build to produce cobertura coverage.xml

Applied patch from Andrew MacBean <andymacbean@gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1088934 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/build.xml  | 13 ++++++++++++-
 qpid/java/module.xml |  3 ---
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/build.xml b/qpid/java/build.xml
index 635e72bdd5..f9ed71d31d 100644
--- a/qpid/java/build.xml
+++ b/qpid/java/build.xml
@@ -217,7 +217,18 @@
         <include name="**/*.ser"/>
       </fileset>
     </cobertura-merge>
-    <cobertura-report format="html"
+    <cobertura-report format="xml"
+                      destdir="${build.coveragereport}"
+		      datafile="${build.coveragereport}/cobertura.ser"
+		      >
+      <fileset dir="${project.root}/common/src/main/java" includes="**/*.java" />
+      <fileset dir="${project.root}/build/scratch/common/src" includes="**/*.java" />
+      <fileset dir="${project.root}/broker/src/main/java" includes="**/*.java" />
+      <fileset dir="${project.root}/build/scratch/broker/src" includes="**/*.java" />
+      <fileset dir="${project.root}/client/src/main/java" includes="**/*.java" />
+      <fileset dir="${project.root}/build/scratch/client/src" includes="**/*.java" />
+    </cobertura-report>
+	<cobertura-report format="html"
                       destdir="${build.coveragereport}"
 		      datafile="${build.coveragereport}/cobertura.ser"
 		      >
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 6ff807d377..7ce9dca7e6 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -659,9 +659,6 @@
       <fileset dir="${module.classes}">
         <include name="**/*.class"/>
       </fileset>
-      <fileset dir="${module.test.classes}">
-        <include name="**/*.class"/>
-      </fileset>      
     </cobertura-instrument>
   </target>
 
-- 
cgit v1.2.1