From f83677056891e436bf5ba99e79240df2a44528cd Mon Sep 17 00:00:00 2001
From: "Stephen D. Huston" <shuston@apache.org>
Date: Fri, 21 Oct 2011 14:42:12 +0000
Subject: Merged out from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187375 13f79535-47bb-0310-9956-ffa450edef68
---
 java/build.xml | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

(limited to 'java/build.xml')

diff --git a/java/build.xml b/java/build.xml
index 9031166d76..1118822b14 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -22,18 +22,20 @@
 
   <import file="common.xml"/>
 
+  <property file="${project.root}/build.overrides"/>
 
   <findSubProjects name="broker-plugins" dir="broker-plugins"/>
-  <findSubProjects name="management" dir="management" excludes="common,example,tools/qpid-cli"/>
+  <findSubProjects name="client-plugins" dir="client-plugins"/>
+  <findSubProjects name="management" dir="management" excludes="common,example"/>
 
   <property name="modules.core"       value="junit-toolkit common management/common broker client tools"/>
   <property name="modules.examples"   value="client/example management/example"/>
   <property name="modules.tests"      value="systests perftests integrationtests testkit"/>
   <property name="modules.management" value="${management}"/>
-  <property name="modules.plugin"     value="${broker-plugins}"/>
-  <property name="modules.management.tools" value="management/tools/qpid-cli"/>
+  <property name="modules.plugin"     value="${broker-plugins} ${client-plugins}"/>
+  <property name="modules.opt"        value=""/>
   <property name="modules"            value="${modules.core} ${modules.examples}
-   ${modules.management} ${modules.management.tools} ${modules.tests} ${modules.plugin}"/>
+   ${modules.management} ${modules.tests} ${modules.plugin} ${modules.opt}"/>
 
   <property name="qpid.jar"           location="${build.lib}/qpid-all.jar"/>
   <basename property="qpid.jar.name"  file="${qpid.jar}"/>
@@ -78,7 +80,7 @@
     <iterate target="compile-tests"/>
   </target>
 
-  <target name="test" description="execute tests">
+  <target name="test" description="execute tests" depends="manifest">
 
     <delete file="${build.failed}"/>
 
@@ -93,6 +95,10 @@
     <fail if="failed" message="TEST SUITE FAILED"/>
 
   </target>
+  
+  <target name="report-module" description="generate junitreport for modules">
+    <iterate target="report-module"/>
+  </target>
 
   <target name="jar" description="create module jars">
     <iterate target="jar"/>
@@ -213,7 +219,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"
 		      >
@@ -277,4 +294,7 @@
     </findbugs>
   </target>
 
+  <target name="eclipse" description="build eclipse project and classpath files">
+    <iterate target="eclipse"/>
+  </target>
 </project>
-- 
cgit v1.2.1