[jboss-svn-commits] JBL Code SVN: r32015 - in labs/jbosstm/trunk: ArjunaJTS and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: jhalliday
Date: 2010-03-10 09:20:00 -0500 (Wed, 10 Mar 2010)
New Revision: 32015

Modified:
   labs/jbosstm/trunk/ArjunaJTS/sharedbuild.xml
   labs/jbosstm/trunk/sharedbuild.xml
Log:
Remove idl generated code from emma statistics. JBTM-729


Modified: labs/jbosstm/trunk/ArjunaJTS/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/sharedbuild.xml	2010-03-10 13:22:51 UTC (rev 32014)
+++ labs/jbosstm/trunk/ArjunaJTS/sharedbuild.xml	2010-03-10 14:20:00 UTC (rev 32015)
@@ -37,7 +37,10 @@
     </target>
 
     <target name="compile" depends="init, compile-idl">
-        <compile.macro>
+        <!-- additional elements to compile the .java files which are generated from idl,
+            but exclude those classes from the emma code coverage: -->
+        <compile.macro
+                emmafilter="-org.omg.*, -com.arjuna.ArjunaOTS.*">
             <additional.classpath>
                 <path refid="jacorb.classpath"/>
             </additional.classpath>

Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml	2010-03-10 13:22:51 UTC (rev 32014)
+++ labs/jbosstm/trunk/sharedbuild.xml	2010-03-10 14:20:00 UTC (rev 32015)
@@ -105,6 +105,9 @@
         <attribute name="excluded.classes" default="${excluded.classes}"/>
         <attribute name="includeant" default="false"/>
         <attribute name="includeemma" default="${emma.enabled}"/>
+        <!-- default coverage filter == empty string == include everything, see
+            http://emma.sourceforge.net/reference_single/reference.html#filtersyntax.ANT -->
+        <attribute name="emmafilter" default=""/>
 
         <element name="additional.classpath" optional="true"/>
         <element name="additional.src.dirs" optional="true"/>
@@ -124,7 +127,8 @@
         <emma enabled="@{includeemma}">
             <instr mode="overwrite"
                    metadatafile="${build.dir}/metadata.emma"
-                   merge="true">
+                   merge="true"
+                   filter="@{emmafilter}">
                 <instrpath>
                     <pathelement location="${build.dir}/classes"/>
                 </instrpath>