svn commit: r732390 - in /qpid/trunk/qpid/java: build.xml common.xml module.xml

[ai...@apache.org]

Author: aidan
Date: Wed Jan  7 08:38:20 2009
New Revision: 732390

URL: http://svn.apache.org/viewvc?rev=732390&view=rev
Log:
Only define cobertura task definition  when it's about to get used.

Modified:
    qpid/trunk/qpid/java/build.xml
    qpid/trunk/qpid/java/common.xml
    qpid/trunk/qpid/java/module.xml

Modified: qpid/trunk/qpid/java/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=732390&r1=732389&r2=732390&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Wed Jan  7 08:38:20 2009
@@ -195,7 +195,7 @@
     <delete dir="${tasks.classes}"/>
   </target>
 
-  <target name="coverage-report" description="generate coverage report">
+  <target name="coverage-report" description="generate coverage report" depends="cobertura-init">
     <cobertura-merge datafile="${build.coveragereport}/cobertura.ser">
       <!-- merge all module coverage reports -->
       <fileset dir="${build}">

Modified: qpid/trunk/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=732390&r1=732389&r2=732390&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Wed Jan  7 08:38:20 2009
@@ -61,8 +61,6 @@
     </fileset>
   </path>
 
-  <taskdef classpathref="cobertura.classpath" resource="tasks.properties" />
-
   <macrodef name="indirect">
     <attribute name="name"/>
     <attribute name="variable"/>
@@ -134,6 +132,10 @@
     </junitreport>
   </target>
 
+  <target name="cobertura-init">
+    <taskdef classpathref="cobertura.classpath" resource="tasks.properties" />
+  </target>
+
   <target name="help" description="display detailed build documentation">
     <echo>
   ant build

Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=732390&r1=732389&r2=732390&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Wed Jan  7 08:38:20 2009
@@ -470,7 +470,7 @@
     <delete dir="${module.instrumented}"/>
   </target>
 
-  <target name="instrument">
+  <target name="instrument" depends="cobertura-init">
     <cobertura-instrument todir="${module.instrumented}"
                           datafile="${cobertura.datafile}">
       <fileset dir="${module.classes}">
@@ -530,7 +530,7 @@
     </junit>
   </target>
 
-  <target name="coverage-report">
+  <target name="coverage-report" depends="cobertura-init">
       <echo message="${cobertura.datafile}"/>
       <cobertura-report format="html"
                       destdir="${module.coverage}"