Index: modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml
===================================================================
--- modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml	(revision 37360)
+++ modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools.modeshape.rest*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.modeshape.rest</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.modeshape.rest*</coverage.filter>
 	</properties>
 </project>
\ No newline at end of file
Index: modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml
===================================================================
--- modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml	(revision 37360)
+++ modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml	(working copy)
@@ -12,11 +12,10 @@
 	
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools.modeshape.rest.ui*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.modeshape.rest</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.modeshape.rest.ui*</coverage.filter>
 	</properties>
 	
-<build>
+	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
Index: vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml
===================================================================
--- vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml	(revision 37360)
+++ vpe/tests/org.jboss.tools.vpe.spring.test/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools.vpe.spring*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.vpe.spring</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.vpe.spring*</coverage.filter>
 	</properties>	
 </project>
Index: vpe/tests/pom.xml
===================================================================
--- vpe/tests/pom.xml	(revision 37360)
+++ vpe/tests/pom.xml	(working copy)
@@ -45,18 +45,6 @@
 				<module>org.jboss.tools.vpe.xulrunner.test</module>
 			</modules>
 		</profile>
-
-		<profile>
-			<id>vpe-tests-coverage-report</id>
-			<activation>
-				<property>
-					<name>vpe-coverage</name>
-				</property>
-			</activation>
-			<modules>
-				<module>../../build/reports/emma-coverage</module>
-			</modules>
-		</profile>
 	</profiles>
 
 	<build>
Index: vpe/tests/org.jboss.tools.vpe.test/pom.xml
===================================================================
--- vpe/tests/org.jboss.tools.vpe.test/pom.xml	(revision 37360)
+++ vpe/tests/org.jboss.tools.vpe.test/pom.xml	(working copy)
@@ -12,8 +12,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.vpe*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.vpe</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.vpe*</coverage.filter>
 	</properties>
 
 	<build>
Index: vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml
===================================================================
--- vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml	(revision 37360)
+++ vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml	(working copy)
@@ -13,7 +13,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.vpe*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.vpe,org.jboss.tools.vpe.jsp</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.vpe*</coverage.filter>
 	</properties>
 </project>
Index: vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml
===================================================================
--- vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml	(revision 37360)
+++ vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.vpe*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.vpe,org.jboss.tools.vpe.resref,org.jboss.tools.vpe.ui.palette</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.vpe*</coverage.filter>
 	</properties>
 
 	<build>
Index: vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml
===================================================================
--- vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml	(revision 37360)
+++ vpe/tests/org.jboss.tools.vpe.docbook.test/pom.xml	(working copy)
@@ -11,7 +11,6 @@
 	
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools.vpe.docbook*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.vpe.docbook</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.vpe.docbook*</coverage.filter>
 	</properties>	
 </project>
Index: vpe/tests/org.jboss.tools.vpe.html.test/pom.xml
===================================================================
--- vpe/tests/org.jboss.tools.vpe.html.test/pom.xml	(revision 37360)
+++ vpe/tests/org.jboss.tools.vpe.html.test/pom.xml	(working copy)
@@ -14,7 +14,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.vpe.html*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.vpe.html</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.vpe.html*</coverage.filter>
 	</properties>
 </project>
Index: vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml
===================================================================
--- vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml	(revision 37360)
+++ vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml	(working copy)
@@ -13,7 +13,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.vpe.xulrunner*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.vpe.xulrunner</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.vpe.xulrunner*</coverage.filter>
 	</properties>
 </project>
Index: as/tests/org.jboss.ide.eclipse.as.test/pom.xml
===================================================================
--- as/tests/org.jboss.ide.eclipse.as.test/pom.xml	(revision 37360)
+++ as/tests/org.jboss.ide.eclipse.as.test/pom.xml	(working copy)
@@ -19,7 +19,6 @@
 		<jbosstools.test.jboss.home.6.0>${requirement.build.root}/jboss-6.0.0.Final</jbosstools.test.jboss.home.6.0>
 		<jbosstools.test.jboss.home.7.0>${requirement.build.root}/jboss-7.0.0.Beta3</jbosstools.test.jboss.home.7.0>
 		<systemProperties>-Djbosstools.test.jboss.home.3.2=${jbosstools.test.jboss.home.3.2} -Djbosstools.test.jboss.home.4.0=${jbosstools.test.jboss.home.4.0} -Djbosstools.test.jboss.home.4.2=${jbosstools.test.jboss.home.4.2} -Djbosstools.test.jboss.home.5.0=${jbosstools.test.jboss.home.5.0} -Djbosstools.test.jboss.home.5.1=${jbosstools.test.jboss.home.5.1} -Djbosstools.test.jboss.home.6.0=${jbosstools.test.jboss.home.6.0} -Djbosstools.test.jboss.home.7.0=${jbosstools.test.jboss.home.7.0} </systemProperties>
-		<emma.filter>org.jboss.ide.eclipse.as.core*</emma.filter>
-		<emma.instrument.bundles>org.jboss.ide.eclipse.as.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.ide.eclipse.as.core*</coverage.filter>
 	</properties>
 </project>
Index: as/tests/org.jboss.ide.eclipse.as.archives.integration.test/pom.xml
===================================================================
--- as/tests/org.jboss.ide.eclipse.as.archives.integration.test/pom.xml	(revision 37360)
+++ as/tests/org.jboss.ide.eclipse.as.archives.integration.test/pom.xml	(working copy)
@@ -11,8 +11,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<properties>
-		<emma.filter>org.jboss.ide.eclipse.archives.webtools*</emma.filter>
-		<emma.instrument.bundles>org.jboss.ide.eclipse.archives.webtools</emma.instrument.bundles>
+		<coverage.filter>org.jboss.ide.eclipse.archives.webtools*</coverage.filter>
 	</properties>
 
 	
Index: as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml
===================================================================
--- as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml	(revision 37360)
+++ as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml	(working copy)
@@ -12,8 +12,7 @@
 	
 	<properties>
 		<systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA</systemProperties>
-		<emma.filter>org.jboss.ide.eclipse.as.ui*</emma.filter>
-		<emma.instrument.bundles>org.jboss.ide.eclipse.as.ui</emma.instrument.bundles>
+		<coverage.filter>org.jboss.ide.eclipse.as.ui*</coverage.filter>
 	</properties>
 
 	<build>
Index: birt/tests/org.jboss.tools.birt.core.test/pom.xml
===================================================================
--- birt/tests/org.jboss.tools.birt.core.test/pom.xml	(revision 37360)
+++ birt/tests/org.jboss.tools.birt.core.test/pom.xml	(working copy)
@@ -11,7 +11,6 @@
 	
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools.birt.core*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.birt.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.birt.core*</coverage.filter>
 	</properties>
 </project>
Index: deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml
===================================================================
--- deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml	(revision 37360)
+++ deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml	(working copy)
@@ -12,8 +12,7 @@
 	
 	<packaging>eclipse-plugin</packaging>
 	<properties>
-		<emma.filter />
-		<emma.instrument.bundles />
+		<coverage.filter>org.jboss.tools.deltacloud.*</coverage.filter>
 	</properties>
 	<build>
 		<plugins>
Index: hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml
===================================================================
--- hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml	(revision 37360)
+++ hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml	(working copy)
@@ -12,8 +12,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.hibernate.eclipse*</emma.filter>
-		<emma.instrument.bundles>org.hibernate.eclipse.console</emma.instrument.bundles>
+		<coverage.filter>org.hibernate.eclipse*</coverage.filter>
 	</properties>
 
 	<build>
Index: hibernatetools/tests/org.jboss.tools.hibernate.ui.test/pom.xml
===================================================================
--- hibernatetools/tests/org.jboss.tools.hibernate.ui.test/pom.xml	(revision 37360)
+++ hibernatetools/tests/org.jboss.tools.hibernate.ui.test/pom.xml	(working copy)
@@ -12,8 +12,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<properties>
-		<emma.filter>org.jboss.tools.hibernate.ui*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.hibernate.ui</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.hibernate.ui*</coverage.filter>
 	</properties>
 
 </project>
Index: hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml
===================================================================
--- hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml	(revision 37360)
+++ hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml	(working copy)
@@ -12,8 +12,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.hibernate.eclipse.jdt.ui*</emma.filter>
-		<emma.instrument.bundles>org.hibernate.eclipse.jdt.ui</emma.instrument.bundles>
+		<coverage.filter>org.hibernate.eclipse.jdt.ui*</coverage.filter>
 	</properties>
 	
 	<build>
Index: hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml
===================================================================
--- hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml	(revision 37360)
+++ hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml	(working copy)
@@ -12,8 +12,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.hibernate.jpt.core*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.hibernate.jpt.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.hibernate.jpt.core*</coverage.filter>
 	</properties>
 
 	<build>
Index: jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml
===================================================================
--- jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml	(revision 37360)
+++ jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml	(working copy)
@@ -5,13 +5,10 @@
 		<groupId>org.jboss.tools.jmx</groupId>
 		<artifactId>tests</artifactId>
 		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.jboss.tools.jmx.tests</groupId>
 	<artifactId>org.jboss.tools.jmx.ui.test</artifactId> 
 	
 	<packaging>eclipse-test-plugin</packaging>
-	<properties>
-		<emma.filter>org.jboss.tools.jmx.ui*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jmx.ui</emma.instrument.bundles>
-	</properties>
 </project>
Index: jmx/tests/pom.xml
===================================================================
--- jmx/tests/pom.xml	(revision 37360)
+++ jmx/tests/pom.xml	(working copy)
@@ -6,12 +6,18 @@
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>jmx</artifactId>
 		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.jboss.tools.jmx</groupId>
 	<artifactId>tests</artifactId>
 	<name>jmx.tests</name>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
+	
+	<properties>
+		<coverage.filter>org.jboss.tools.jmx.*</coverage.filter>
+	</properties>
+	
 	<modules>
 		<module>org.jboss.tools.jmx.core.test</module>
 		<module>org.jboss.tools.jmx.ui.test</module>
Index: jmx/tests/org.jboss.tools.jmx.core.test/pom.xml
===================================================================
--- jmx/tests/org.jboss.tools.jmx.core.test/pom.xml	(revision 37360)
+++ jmx/tests/org.jboss.tools.jmx.core.test/pom.xml	(working copy)
@@ -5,15 +5,12 @@
 		<groupId>org.jboss.tools.jmx</groupId>
 		<artifactId>tests</artifactId>
 		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.jboss.tools.jmx.tests</groupId>
 	<artifactId>org.jboss.tools.jmx.core.test</artifactId> 
 	
 	<packaging>eclipse-test-plugin</packaging>
-	<properties>
-		<emma.filter>org.jboss.tools.jmx.core*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jmx.core</emma.instrument.bundles>
-	</properties>
 	<build>
 		<plugins>
 			<plugin>
Index: bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/pom.xml
===================================================================
--- bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/pom.xml	(revision 37360)
+++ bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.eclipse.bpmn2.*</emma.filter>
-		<emma.instrument.bundles>org.eclipse.bpmn2,org.eclipse.bpmn2.edit,org.eclipse.bpmn2.editor,org.jboss.tools.bpmn2.model,org.jboss.tools.bpmn2.process.diagram,org.jboss.tools.jbpm</emma.instrument.bundles>
+		<coverage.filter>org.eclipse.bpmn2.*</coverage.filter>
 	</properties>
 </project>
Index: bpmn/tests/org.eclipse.bpmn2.tests/pom.xml
===================================================================
--- bpmn/tests/org.eclipse.bpmn2.tests/pom.xml	(revision 37360)
+++ bpmn/tests/org.eclipse.bpmn2.tests/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.bpmn.*</emma.filter>
-		<emma.instrument.bundles>org.eclipse.bpmn2,org.eclipse.bpmn2.edit,org.eclipse.bpmn2.editor,org.jboss.tools.bpmn2.model,org.jboss.tools.bpmn2.process.diagram,org.jboss.tools.jbpm</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.bpmn.*</coverage.filter>
 	</properties>
 </project>
Index: freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml
===================================================================
--- freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml	(revision 37360)
+++ freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml	(working copy)
@@ -11,7 +11,6 @@
 	
 	<packaging>eclipse-test-plugin</packaging>
 		<properties>
-		<emma.filter>org.jboss.ide.eclipse.freemarker*</emma.filter>
-		<emma.instrument.bundles>org.jboss.ide.eclipse.freemarker</emma.instrument.bundles>
+		<coverage.filter>org.jboss.ide.eclipse.freemarker*</coverage.filter>
 	</properties>
 </project>
Index: struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml
===================================================================
--- struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml	(revision 37360)
+++ struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml	(working copy)
@@ -11,8 +11,7 @@
 	
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.struts,org.jboss.tools.struts.text.ext,org.jboss.tools.struts.vpe.struts</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools*</coverage.filter>
 	</properties>	
 	<build>
 		<plugins>
Index: struts/tests/org.jboss.tools.struts.text.ext.test/pom.xml
===================================================================
--- struts/tests/org.jboss.tools.struts.text.ext.test/pom.xml	(revision 37360)
+++ struts/tests/org.jboss.tools.struts.text.ext.test/pom.xml	(working copy)
@@ -11,7 +11,6 @@
 	
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.struts,org.jboss.tools.struts.text.ext</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools*</coverage.filter>
 	</properties>
 </project>
Index: jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml
===================================================================
--- jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml	(revision 37360)
+++ jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jst.web.ui*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jst.web.ui</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jst.web.ui*</coverage.filter>
 	</properties>
 </project>
Index: jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml
===================================================================
--- jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml	(revision 37360)
+++ jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml	(working copy)
@@ -12,8 +12,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jst.web.kb*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jst.web.kb</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jst.web.kb*</coverage.filter>
 	</properties>
 
 	<build>
Index: jst/tests/org.jboss.tools.jst.jsp.test/pom.xml
===================================================================
--- jst/tests/org.jboss.tools.jst.jsp.test/pom.xml	(revision 37360)
+++ jst/tests/org.jboss.tools.jst.jsp.test/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<properties>
-		<emma.filter>org.jboss.tools.jst.jsp*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jst.jsp</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jst.jsp*</coverage.filter>
 	</properties>	
 </project>
Index: jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml
===================================================================
--- jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml	(revision 37360)
+++ jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml	(working copy)
@@ -11,7 +11,6 @@
 	
 	<packaging>eclipse-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools.jst*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jst*</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jst*</coverage.filter>
 	</properties>
 </project>
Index: jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml
===================================================================
--- jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml	(revision 37360)
+++ jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jst.text.ext*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jst.text.ext</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jst.text.ext*</coverage.filter>
 	</properties>
 </project>
Index: jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml
===================================================================
--- jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml	(revision 37360)
+++ jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	<packaging>eclipse-plugin</packaging>
 	
 	<properties>
-		<emma.filter>org.jboss.tools.jst*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jst*</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jst*</coverage.filter>
 	</properties>
 </project>
Index: jst/tests/org.jboss.tools.jst.web.test/pom.xml
===================================================================
--- jst/tests/org.jboss.tools.jst.web.test/pom.xml	(revision 37360)
+++ jst/tests/org.jboss.tools.jst.web.test/pom.xml	(working copy)
@@ -11,7 +11,6 @@
 	
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools.jst.web*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jst.web</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jst.web*</coverage.filter>
 	</properties>
 </project>
Index: jst/tests/org.jboss.tools.jst.css.test/pom.xml
===================================================================
--- jst/tests/org.jboss.tools.jst.css.test/pom.xml	(revision 37360)
+++ jst/tests/org.jboss.tools.jst.css.test/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<properties>
-		<emma.filter>org.jboss.tools.jst.css*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jst.css</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jst.css*</coverage.filter>
 	</properties>
 </project>
Index: jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/pom.xml
===================================================================
--- jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/pom.xml	(revision 37360)
+++ jbpm/tests/org.jboss.tools.flow.jpdl4.multipage.test/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	<version>4.3.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools.flow.jpdl4.multipage*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.flow.jpdl4.multipage</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.flow.jpdl4.multipage*</coverage.filter>
 	</properties>
 </project>
\ No newline at end of file
Index: jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml
===================================================================
--- jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml	(revision 37360)
+++ jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jbpm.convert*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jbpm.convert</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jbpm.convert*</coverage.filter>
 	</properties>
 
 	<build>
Index: jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml
===================================================================
--- jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml	(revision 37360)
+++ jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml	(working copy)
@@ -13,7 +13,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jbpm*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jbpm.common</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jbpm*</coverage.filter>
 	</properties>
 </project>
\ No newline at end of file
Index: jbpm/tests/org.jbpm.gd.jpdl.test/pom.xml
===================================================================
--- jbpm/tests/org.jbpm.gd.jpdl.test/pom.xml	(revision 37360)
+++ jbpm/tests/org.jbpm.gd.jpdl.test/pom.xml	(working copy)
@@ -13,7 +13,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jbpm.gd*</emma.filter>
-		<emma.instrument.bundles>org.jbpm.gd.jpdl</emma.instrument.bundles>
+		<coverage.filter>org.jbpm.gd*</coverage.filter>
 	</properties>
 </project>
\ No newline at end of file
Index: jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml
===================================================================
--- jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml	(revision 37360)
+++ jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml	(working copy)
@@ -13,7 +13,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.flow.jpdl4*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.flow.jpdl4</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.flow.jpdl4*</coverage.filter>
 	</properties>
 </project>
\ No newline at end of file
Index: forge/tests/org.jboss.tools.forge.core.test/pom.xml
===================================================================
--- forge/tests/org.jboss.tools.forge.core.test/pom.xml	(revision 37360)
+++ forge/tests/org.jboss.tools.forge.core.test/pom.xml	(working copy)
@@ -12,8 +12,7 @@
 	<packaging>eclipse-plugin</packaging>
 	
 	<properties>
-		<emma.filter>org.jboss.tools.forge.core*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.forge.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.forge.core*</coverage.filter>
 	</properties>
 	
 	<build>
Index: cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml
===================================================================
--- cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml	(revision 37360)
+++ cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml	(working copy)
@@ -10,10 +10,6 @@
 	<artifactId>org.jboss.tools.cdi.seam.text.ext.test</artifactId> 
 	<packaging>eclipse-test-plugin</packaging>
 
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.cdi.seam.text.ext,org.jboss.tools.cdi.core,org.jboss.tools.cdi.ui,org.jboss.tools.cdi.xml,org.jboss.tools.cdi.seam.config.core,org.jboss.tools.cdi.seam.solder.core</emma.instrument.bundles>
-	</properties>
-
 	<build>
 		<plugins>
 			<plugin>
Index: cdi/tests/org.jboss.tools.cdi.seam.config.core.test/pom.xml
===================================================================
--- cdi/tests/org.jboss.tools.cdi.seam.config.core.test/pom.xml	(revision 37360)
+++ cdi/tests/org.jboss.tools.cdi.seam.config.core.test/pom.xml	(working copy)
@@ -10,10 +10,6 @@
 	<artifactId>org.jboss.tools.cdi.seam.config.core.test</artifactId> 
 	<packaging>eclipse-test-plugin</packaging>
 
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.cdi.seam.config.core,org.jboss.tools.cdi.core,org.jboss.tools.cdi.xml</emma.instrument.bundles>
-	</properties>
-
 	<build>
 		<plugins>
 			<plugin>
Index: cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/pom.xml
===================================================================
--- cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/pom.xml	(revision 37360)
+++ cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/pom.xml	(working copy)
@@ -10,10 +10,6 @@
 	<artifactId>org.jboss.tools.cdi.seam.faces.core.test</artifactId> 
 	<packaging>eclipse-test-plugin</packaging>
 
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.cdi.seam.faces.core,org.jboss.tools.cdi.core,org.jboss.tools.cdi.xml</emma.instrument.bundles>
-	</properties>
-
 	<build>
 		<plugins>
 			<plugin>
Index: cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml
===================================================================
--- cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml	(revision 37360)
+++ cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml	(working copy)
@@ -10,10 +10,6 @@
 	<artifactId>org.jboss.tools.cdi.text.ext.test</artifactId> 
 	<packaging>eclipse-test-plugin</packaging>
 
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.cdi.text.ext,org.jboss.tools.cdi.core,org.jboss.tools.cdi.ui,org.jboss.tools.cdi.xml</emma.instrument.bundles>
-	</properties>
-
 	<build>
 		<plugins>
 			<plugin>
Index: cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml
===================================================================
--- cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml	(revision 37360)
+++ cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml	(working copy)
@@ -10,10 +10,6 @@
 	<artifactId>org.jboss.tools.cdi.ui.test</artifactId> 
 	<packaging>eclipse-test-plugin</packaging>
 
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.cdi.ui,org.jboss.tools.cdi.core,org.jboss.tools.cdi.xml</emma.instrument.bundles>
-	</properties>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -38,7 +34,8 @@
 						<groupId>org.eclipse.tycho</groupId>
 						<artifactId>tycho-surefire-plugin</artifactId>
 						<configuration>
-							<argLine>-XX:+UseLinuxPosixThreadCPUClocks -agentpath:/home/eskimo/Java/netbeans-7.0.1/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so=/home/eskimo/Java/netbeans-7.0.1/profiler/lib,5140</argLine>
+							<!-- tycho.testArgLine to avoid overriding java.agent set by Jacoco plugin -->
+							<argLine>${tycho.testArgLine} -XX:+UseLinuxPosixThreadCPUClocks -agentpath:/home/eskimo/Java/netbeans-7.0.1/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so=/home/eskimo/Java/netbeans-7.0.1/profiler/lib,5140</argLine>
 						</configuration>
 					</plugin>
 				</plugins>
Index: cdi/tests/pom.xml
===================================================================
--- cdi/tests/pom.xml	(revision 37360)
+++ cdi/tests/pom.xml	(working copy)
@@ -10,7 +10,7 @@
 	<artifactId>tests</artifactId>
 	<name>cdi.tests</name>
 	<properties>
-		<emma.filter>org.jboss.tools.cdi*</emma.filter>
+		<coverage.filter>org.jboss.tools.cdi*</coverage.filter>
 	</properties>
 	<packaging>pom</packaging>
 	<profiles>
@@ -47,18 +47,6 @@
 				<module>org.jboss.tools.cdi.ui.test</module>
 			</modules>
 		</profile>
-
-		<profile>
-			<id>cdi-tests-coverage-report</id>
-			<activation>
-				<property>
-					<name>cdi-coverage</name>
-				</property>
-			</activation>
-			<modules>
-				<module>../../build/reports/emma-coverage</module>
-			</modules>
-		</profile>
 	</profiles>
 </project>
 	
Index: cdi/tests/org.jboss.tools.cdi.core.test/pom.xml
===================================================================
--- cdi/tests/org.jboss.tools.cdi.core.test/pom.xml	(revision 37360)
+++ cdi/tests/org.jboss.tools.cdi.core.test/pom.xml	(working copy)
@@ -10,10 +10,6 @@
 	<artifactId>org.jboss.tools.cdi.core.test</artifactId> 
 	<packaging>eclipse-test-plugin</packaging>
 
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.cdi.core,org.jboss.tools.cdi.xml</emma.instrument.bundles>
-	</properties>
-
 	<build>
 		<plugins>
 			<plugin>
Index: cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/pom.xml
===================================================================
--- cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/pom.xml	(revision 37360)
+++ cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/pom.xml	(working copy)
@@ -11,10 +11,6 @@
 	<artifactId>org.jboss.tools.cdi.seam.config.ui.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.cdi.seam.config.ui,org.jboss.tools.cdi.core,org.jboss.tools.cdi.ui,org.jboss.tools.cdi.xml,org.jboss.tools.cdi.seam.config.core,org.jboss.tools.cdi.seam.solder.core</emma.instrument.bundles>
-	</properties>
-
 	<build>
 		<plugins>
 			<plugin>
Index: cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml
===================================================================
--- cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml	(revision 37360)
+++ cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml	(working copy)
@@ -10,10 +10,6 @@
 	<artifactId>org.jboss.tools.cdi.seam.solder.core.test</artifactId> 
 	<packaging>eclipse-test-plugin</packaging>
 
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.cdi.seam.solder.core,org.jboss.tools.cdi.core,org.jboss.tools.cdi.xml</emma.instrument.bundles>
-	</properties>
-
 	<build>
 		<plugins>
 			<plugin>
Index: cdi/tests/org.jboss.tools.cdi.seam.core.test/pom.xml
===================================================================
--- cdi/tests/org.jboss.tools.cdi.seam.core.test/pom.xml	(revision 37360)
+++ cdi/tests/org.jboss.tools.cdi.seam.core.test/pom.xml	(working copy)
@@ -9,9 +9,6 @@
 	<groupId>org.jboss.tools.cdi.tests</groupId>
 	<artifactId>org.jboss.tools.cdi.seam.core.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.cdi.seam.core,org.jboss.tools.cdi.core,org.jboss.tools.cdi.xml</emma.instrument.bundles>
-	</properties>
 	<build>
 		<plugins>
 			<plugin>
Index: common/tests/org.jboss.tools.common.validation.test/pom.xml
===================================================================
--- common/tests/org.jboss.tools.common.validation.test/pom.xml	(revision 37360)
+++ common/tests/org.jboss.tools.common.validation.test/pom.xml	(working copy)
@@ -10,9 +10,6 @@
 	<artifactId>org.jboss.tools.common.validation.test</artifactId> 
 	
 	<packaging>eclipse-test-plugin</packaging>
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.common,org.jboss.tools.common.el.core,org.jboss.tools.common.validation</emma.instrument.bundles>
-	</properties>
 	<build>
 		<plugins>
 			<plugin>
Index: common/tests/org.jboss.tools.common.verification.test/pom.xml
===================================================================
--- common/tests/org.jboss.tools.common.verification.test/pom.xml	(revision 37360)
+++ common/tests/org.jboss.tools.common.verification.test/pom.xml	(working copy)
@@ -10,7 +10,4 @@
 	<artifactId>org.jboss.tools.common.verification.test</artifactId> 
 	
 	<packaging>eclipse-test-plugin</packaging>
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.common,org.jboss.tools.common.model,org.jboss.tools.common.verification</emma.instrument.bundles>
-	</properties>
 </project>
Index: common/tests/org.jboss.tools.common.test/pom.xml
===================================================================
--- common/tests/org.jboss.tools.common.test/pom.xml	(revision 37360)
+++ common/tests/org.jboss.tools.common.test/pom.xml	(working copy)
@@ -10,7 +10,4 @@
 	<artifactId>org.jboss.tools.common.test</artifactId> 
 	
 	<packaging>eclipse-test-plugin</packaging>
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.common</emma.instrument.bundles>
-	</properties>
 </project>
Index: common/tests/org.jboss.tools.common.model.test/pom.xml
===================================================================
--- common/tests/org.jboss.tools.common.model.test/pom.xml	(revision 37360)
+++ common/tests/org.jboss.tools.common.model.test/pom.xml	(working copy)
@@ -10,8 +10,4 @@
 	<artifactId>org.jboss.tools.common.model.test</artifactId>
 	
 	<packaging>eclipse-test-plugin</packaging>
-
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.common,org.jboss.tools.common.model</emma.instrument.bundles>
-	</properties>
 </project>
Index: common/tests/org.jboss.tools.common.el.core.test/pom.xml
===================================================================
--- common/tests/org.jboss.tools.common.el.core.test/pom.xml	(revision 37360)
+++ common/tests/org.jboss.tools.common.el.core.test/pom.xml	(working copy)
@@ -10,7 +10,4 @@
 	<artifactId>org.jboss.tools.common.el.core.test</artifactId> 
 	
 	<packaging>eclipse-test-plugin</packaging>
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.common.resref.core,org.jboss.tools.common.el.core</emma.instrument.bundles>
-	</properties>
 </project>
Index: common/tests/pom.xml
===================================================================
--- common/tests/pom.xml	(revision 37360)
+++ common/tests/pom.xml	(working copy)
@@ -11,23 +11,11 @@
 	</parent>
 	<packaging>pom</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools.*</emma.filter>
+		<coverage.filter>org.jboss.tools.*</coverage.filter>
 	</properties>
 	
 	<profiles>
 		<profile>
-			<id>common-tests-libs</id>
-			<activation>
-				<property>
-					<name>common-coverage</name>
-				</property>
-			</activation>
-			<modules>
-				<module>../../build/libs</module>
-			</modules>
-		</profile>
-
-		<profile>
 			<id>common-tests-default</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
@@ -48,18 +36,6 @@
 				<module>org.jboss.tools.common.mylyn.test</module>
 			</modules>
 		</profile>
-
-		<profile>
-			<id>common-tests-coverage-report</id>
-			<activation>
-				<property>
-					<name>common-coverage</name>
-				</property>
-			</activation>
-			<modules>
-				<module>../../build/reports/emma-coverage</module>
-			</modules>
-		</profile>
 	</profiles>
 </project>
 
Index: common/tests/org.jboss.tools.common.mylyn.test/pom.xml
===================================================================
--- common/tests/org.jboss.tools.common.mylyn.test/pom.xml	(revision 37360)
+++ common/tests/org.jboss.tools.common.mylyn.test/pom.xml	(working copy)
@@ -10,8 +10,4 @@
 	<artifactId>org.jboss.tools.common.mylyn.test</artifactId>
 	
 	<packaging>eclipse-test-plugin</packaging>
-
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.common,org.jboss.tools.common.model</emma.instrument.bundles>
-	</properties>
 </project>
Index: common/tests/org.jboss.tools.common.verification.ui.test/pom.xml
===================================================================
--- common/tests/org.jboss.tools.common.verification.ui.test/pom.xml	(revision 37360)
+++ common/tests/org.jboss.tools.common.verification.ui.test/pom.xml	(working copy)
@@ -11,7 +11,6 @@
 	
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools.common.verification.ui*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.common,org.jboss.tools.common.model,org.jboss.tools.common.verification,org.jboss.tools.common.verification.ui</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.common.verification.ui*</coverage.filter>
 	</properties>
 </project>
Index: common/tests/org.jboss.tools.common.model.ui.test/pom.xml
===================================================================
--- common/tests/org.jboss.tools.common.model.ui.test/pom.xml	(revision 37360)
+++ common/tests/org.jboss.tools.common.model.ui.test/pom.xml	(working copy)
@@ -10,8 +10,4 @@
 	<artifactId>org.jboss.tools.common.model.ui.test</artifactId>
 	
 	<packaging>eclipse-test-plugin</packaging>
-
-	<properties>
-		<emma.instrument.bundles>org.jboss.tools.common.model,org.jboss.tools.common.model.ui,org.jboss.tools.common.text.ext,org.jboss.tools.common.text.xml</emma.instrument.bundles>
-	</properties>
 </project>
Index: esb/tests/org.jboss.tools.esb.core.test/pom.xml
===================================================================
--- esb/tests/org.jboss.tools.esb.core.test/pom.xml	(revision 37360)
+++ esb/tests/org.jboss.tools.esb.core.test/pom.xml	(working copy)
@@ -13,7 +13,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.esb.core*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.esb.core,org.jboss.tools.esb.project.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.esb.core*</coverage.filter>
 	</properties>
 </project>
\ No newline at end of file
Index: esb/tests/org.jboss.tools.esb.validator.test/pom.xml
===================================================================
--- esb/tests/org.jboss.tools.esb.validator.test/pom.xml	(revision 37360)
+++ esb/tests/org.jboss.tools.esb.validator.test/pom.xml	(working copy)
@@ -13,7 +13,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.esb.*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.esb.core,org.jboss.tools.esb.validator,org.jboss.tools.esb.project.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.esb.*</coverage.filter>
 	</properties>
 </project>
\ No newline at end of file
Index: esb/tests/org.jboss.tools.esb.project.core.test/pom.xml
===================================================================
--- esb/tests/org.jboss.tools.esb.project.core.test/pom.xml	(revision 37360)
+++ esb/tests/org.jboss.tools.esb.project.core.test/pom.xml	(working copy)
@@ -14,8 +14,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.0=${requirement.build.root}/jboss-soa-p.5.0.0/jboss-as -Djbosstools.test.jboss.home.5.1=${requirement.build.root}/jboss-5.1.0.GA -Djbosstools.test.soap.home.4.3=${requirement.build.root}/jboss-soa-p.4.3.0 -Djbosstools.test.soap.home.5.0=${requirement.build.root}/jboss-soa-p.5.0.0</systemProperties>
-		<emma.filter>org.jboss.tools.esb.core*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.esb.project.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.esb.core*</coverage.filter>
 	</properties>
 
 	<build>
Index: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml	(revision 37360)
+++ jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jsf.vpe.jsf*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jsf.vpe.jsf</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jsf.vpe.jsf*</coverage.filter>
 	</properties>
 
 	<build>
Index: jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml	(revision 37360)
+++ jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jsf.vpe.facelets*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jsf.vpe.facelets</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jsf.vpe.facelets*</coverage.filter>
 	</properties>
 
 </project>
Index: jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml	(revision 37360)
+++ jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jsf.ui*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jsf.ui</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jsf.ui*</coverage.filter>
 	</properties>
 </project>
Index: jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml	(revision 37360)
+++ jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jsf.vpe.jstl*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jsf.vpe.jstl</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jsf.vpe.jstl*</coverage.filter>
 	</properties>
 
 </project>
Index: jsf/tests/pom.xml
===================================================================
--- jsf/tests/pom.xml	(revision 37360)
+++ jsf/tests/pom.xml	(working copy)
@@ -49,18 +49,6 @@
 				<module>org.jboss.tools.jsf.vpe.seam.test</module>
 			</modules>
 		</profile>
-
-		<profile>
-			<id>cdi-tests-coverage-report</id>
-			<activation>
-				<property>
-					<name>jsf-coverage</name>
-				</property>
-			</activation>
-			<modules>
-				<module>../../build/reports/emma-coverage</module>
-			</modules>
-		</profile>
 	</profiles>
 	<build>
 		<plugins>
Index: jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml	(revision 37360)
+++ jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jsf.vpe.richfaces*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jsf.vpe.richfaces</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jsf.vpe.richfaces*</coverage.filter>
 	</properties>
 
 	<build>
Index: jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml	(revision 37360)
+++ jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jsf.vpe.myfaces*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jsf.vpe.myfaces</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jsf.vpe.myfaces*</coverage.filter>
 	</properties>
 
 </project>
Index: jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml	(revision 37360)
+++ jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml	(working copy)
@@ -13,7 +13,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jsf.text.ext*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jsf.text.ext,org.jboss.tools.jsf.text.ext.facelets,org.jboss.tools.jsf.text.ext.richfaces</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jsf.text.ext*</coverage.filter>
 	</properties>
 </project>
Index: jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml	(revision 37360)
+++ jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml	(working copy)
@@ -12,8 +12,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jsf.vpe.ajax4jsf*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jsf.vpe.ajax4jsf</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jsf.vpe.ajax4jsf*</coverage.filter>
 	</properties>
 
 	<build>
Index: jsf/tests/org.jboss.tools.jsf.test/pom.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.test/pom.xml	(revision 37360)
+++ jsf/tests/org.jboss.tools.jsf.test/pom.xml	(working copy)
@@ -12,8 +12,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jsf*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jsf</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jsf*</coverage.filter>
 	</properties>
 
 	<build>
Index: jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml	(revision 37360)
+++ jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools.jsf.vpe.jbpm*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jsf.vpe.jbpm</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jsf.vpe.jbpm*</coverage.filter>
 	</properties>
 </project>
Index: jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml	(revision 37360)
+++ jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jsf.verification*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jsf.verification</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jsf.verification*</coverage.filter>
 	</properties>
 </project>
Index: jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml
===================================================================
--- jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml	(revision 37360)
+++ jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.jsf.vpe.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.jsf.vpe.seam</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.jsf.vpe.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam221CR1.core.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam221CR1.core.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam221CR1.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.1.CR1</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam.xml.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam.xml.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam.xml.test/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.xml</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 </project>
Index: seam/tests/org.jboss.tools.seam.ui.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam.ui.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA -Djbosstools.test.seam.1.2.1.eap.home=${requirement.build.root}/jboss-eap-4.3/seam -Djbosstools.test.seam.2fp.eap.home=${requirement.build.root}/jboss-eap-4.3/seamfp -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.1.0.GA.home=${requirement.build.root}/jboss-seam-2.1.1.GA</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.core,org.jboss.tools.seam.ui</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml	(working copy)
@@ -11,7 +11,6 @@
 	
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.pages.xml</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 </project>
Index: seam/tests/org.jboss.tools.seam212GA.core.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam212GA.core.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam212GA.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.1.2</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam212GA.ui.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam212GA.ui.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam212GA.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.1.2</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.1.2.1.eap.home=${requirement.build.root}/jboss-eap-4.3/seam</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.1.1.GA</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam221CR2.ui.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam221CR2.ui.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam221CR2.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.1.CR2</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-eap-4.3/seamfp</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam220GA.core.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam220GA.core.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam220GA.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.0.GA</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.2.SP1</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.2.SP1</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.0.CR1</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.3.CR1</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seamfp.core.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seamfp.core.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seamfp.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-eap-4.3/seamfp</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam220CR1.core.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam220CR1.core.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam220CR1.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.0.CR1</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam211GA.core.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam211GA.core.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam211GA.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.1.1.GA</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.1.2.1.eap.home=${requirement.build.root}/jboss-eap-4.3/seam</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam221CR1.ui.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam221CR1.ui.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam221CR1.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.1.CR1</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.ui,org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.3.CR1</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam.core.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam.core.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.1.2.1.eap.home=${requirement.build.root}/requirements/target/jboss-eap-4.3/seam -Djbosstools.test.seam.2fp.eap.home=${requirement.build.root}/requirements/target/jboss-eap-4.3/seamfp -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/requirements/target/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.1.0.GA.home=${requirement.build.root}/requirements/target/jboss-seam-2.1.1.GA</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: seam/tests/org.jboss.tools.seam221CR2.core.test/pom.xml
===================================================================
--- seam/tests/org.jboss.tools.seam221CR2.core.test/pom.xml	(revision 37360)
+++ seam/tests/org.jboss.tools.seam221CR2.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.2.1.CR2</systemProperties>
-		<emma.filter>org.jboss.tools.seam*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.seam.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.seam*</coverage.filter>
 	</properties>
 
 	<build>
Index: archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml
===================================================================
--- archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml	(revision 37360)
+++ archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml	(working copy)
@@ -10,8 +10,7 @@
 	<artifactId>org.jboss.ide.eclipse.archives.test</artifactId> 
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.ide.eclipse.archives.core*</emma.filter>
-		<emma.instrument.bundles>org.jboss.ide.eclipse.archives.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.ide.eclipse.archives.core*</coverage.filter>
 	</properties>
 	<build>
 		<plugins>
Index: archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml
===================================================================
--- archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml	(revision 37360)
+++ archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml	(working copy)
@@ -10,7 +10,6 @@
 	<artifactId>org.jboss.ide.eclipse.archives.ui.test</artifactId> 
 	<packaging>eclipse-test-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.ide.eclipse.archives.ui*</emma.filter>
-		<emma.instrument.bundles>org.jboss.ide.eclipse.archives.ui</emma.instrument.bundles>
+		<coverage.filter>org.jboss.ide.eclipse.archives.ui*</coverage.filter>
 	</properties>
 </project>
Index: build/reports/emma-coverage/pom.xml
===================================================================
--- build/reports/emma-coverage/pom.xml	(revision 37360)
+++ build/reports/emma-coverage/pom.xml	(working copy)
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.tools.build.reports</groupId>
-	<artifactId>emma-coverage</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>pom</packaging>
-
-	<build>
-	<plugins>
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-antrun-plugin</artifactId>
-			<version>1.3</version>
-			<dependencies>
-				<dependency>
-					<groupId>emma</groupId>
-					<artifactId>emma_ant</artifactId>
-					<version>2.0.5312</version>
-				</dependency>
-				<dependency>
-					<groupId>emma</groupId>
-					<artifactId>emma</artifactId>
-					<version>2.0.5312</version>
-				</dependency>
-				<dependency>
-					<groupId>ant-contrib</groupId>
-					<artifactId>ant-contrib</artifactId>
-					<version>1.0b3</version>
-				</dependency>
-			</dependencies>
-			<executions>
-				<execution>
-					<id>emma-report</id>
-					<phase>post-integration-test</phase>
-					<goals>
-						<goal>run</goal>
-					</goals>
-					<configuration>
-						<tasks>
-							<taskdef resource="emma_ant.properties" />
-							<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-							<move todir="${project.build.directory}/emma">
-								<fileset dir="${basedir}/../../.." includes="*/tests/*/target/emma/*.es" />
-							</move>
-							<if>
-								<and>
-									<not>
-										<isset property="maven.test.skip"/>
-									</not>
-									<available type="dir" file="${project.build.directory}/emma" />
-								</and>
-								<then>
-									<echo>Process emma report...</echo>
-									<emma enabled="true">
-										<report>
-											<infileset dir="${project.build.directory}/emma" includes="*/tests/*/target/emma/*.es" />
-											<txt outfile="${project.build.directory}/coverage.txt" />
-											<xml outfile="${project.build.directory}/coverage.xml" />
-											<html outfile="${project.build.directory}/coverage.html" />
-										</report>
-									</emma>
-									<loadfile property="emma.txt"
-										srcFile="${project.build.directory}/coverage.txt"
-										failonerror="false" />
-									<echo>${emma.txt}</echo>
-								</then>
-								<else>
-									<echo>No emma session files were found</echo>
-								</else>
-							</if>
-						</tasks>
-					</configuration>
-				</execution>
-			</executions>
-		</plugin>
-	</plugins>
-	</build>
-	
-</project>
-
Index: build/pom-core.xml
===================================================================
--- build/pom-core.xml	(revision 37360)
+++ build/pom-core.xml	(working copy)
@@ -28,19 +28,6 @@
 		</profile>
 
 		<profile>
-			<id>libs</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-				<property>
-					<name>coverage</name>
-				</property>
-			</activation>
-			<modules>
-				<module>libs</module>
-			</modules>
-		</profile>
-
-		<profile>
 			<id>tests</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
@@ -578,19 +565,6 @@
 				<module>../central</module>
 			</modules>
 		</profile>
-
-		<profile>
-			<id>aggregate-coverage</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-				<property>
-					<name>coverage</name>
-				</property>
-			</activation>
-			<modules>
-				<module>reports/emma-coverage</module>
-			</modules>
-		</profile>
 	</profiles>
 
 	<repositories>
Index: build/libs/org.eclemma.runtime.equinox-1.1.0.200908261008.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: build/libs/pom.xml
===================================================================
--- build/libs/pom.xml	(revision 37360)
+++ build/libs/pom.xml	(working copy)
@@ -1,44 +0,0 @@
-<project
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-<groupId>org.jboss.tools.build</groupId>
-<artifactId>org.jboss.tools.build.libs</artifactId>
-<version>1.0.0-SNAPSHOT</version>
-<packaging>pom</packaging>
-<profiles>
-	<profile>
-		<id>coverage</id>
-		<activation>
-			<property>
-				<name>coverage</name>
-			</property>
-		</activation>
-		<build>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-install-plugin</artifactId>
-					<version>2.3.1</version>
-					  <executions>
-					    <execution>
-					      <id>eclemma-install</id>
-					      <goals>
-						<goal>install-file</goal>
-					      </goals>
-					      <phase>package</phase>
-					      <configuration>
-						<file>org.eclemma.runtime.equinox-1.1.0.200908261008.jar</file>
-						<groupId>org.eclemma.runtime.equinox</groupId>
-						<artifactId>org.eclemma.runtime.equinox</artifactId>
-						<version>1.1.0.200908261008</version>
-						<packaging>jar</packaging>
-	   				      </configuration>
-					  </execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</build>
-	</profile>
-
-</profiles>
-</project>
Index: build/pom-disabled-components.xml
===================================================================
--- build/pom-disabled-components.xml	(revision 37360)
+++ build/pom-disabled-components.xml	(working copy)
@@ -11,18 +11,6 @@
 	<profiles>
 
 		<profile>
-			<id>libs</id>
-			<activation>
-				<property>
-					<name>coverage</name>
-				</property>
-			</activation>
-			<modules>
-				<module>libs</module>
-			</modules>
-		</profile>
-
-		<profile>
 			<id>site</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
Index: build/pom.xml
===================================================================
--- build/pom.xml	(revision 37360)
+++ build/pom.xml	(working copy)
@@ -17,18 +17,6 @@
 			-P \!maven,\!ws,\!modeshape,\!flow,\!jbpm,\!gwt,\!deltacloud,\!runtime,\!usage,\!central,\!aggregate-coverage
 			
 		-->
-		<profile>
-			<id>libs</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-				<property>
-					<name>coverage</name>
-				</property>
-			</activation>
-			<modules>
-				<module>libs</module>
-			</modules>
-		</profile>
 
 		<profile>
 			<id>tests</id>
@@ -368,7 +356,6 @@
 			<modules>
 				<module>libs</module>
 				<module>../cdi/tests</module>
-				<module>reports/emma-coverage</module>
 			</modules>
 		</profile>
 
@@ -703,18 +690,6 @@
 			</modules>
 		</profile>
 
-		<profile>
-			<id>aggregate-coverage</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-				<property>
-					<name>coverage</name>
-				</property>
-			</activation>
-			<modules>
-				<module>reports/emma-coverage</module>
-			</modules>
-		</profile>
 	</profiles>
 
 	<repositories>
Index: build/parent/pom.xml
===================================================================
--- build/parent/pom.xml	(revision 37360)
+++ build/parent/pom.xml	(working copy)
@@ -24,13 +24,13 @@
 		<systemProperties></systemProperties>
 		<maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
 		<swtbot.test.skip>true</swtbot.test.skip>
+		<!-- Default value to be overriden by all components - if they use parent pom -->
+		<coverage.filter>org.jboss.tools.*</coverage.filter>
 
 		<!-- target files available for building: multiple sites, 1 unified site, 
 			1 local mirrored site -->
-		<target.platform.classifier.unified>unified
-		</target.platform.classifier.unified>
-		<target.platform.classifier.local>local
-		</target.platform.classifier.local>
+		<target.platform.classifier.unified>unified</target.platform.classifier.unified>
+		<target.platform.classifier.local>local</target.platform.classifier.local>
 
 		<!-- 1a. URL of latest JBT target platform site -->
 		<jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/latest/</jbosstools-target-site>
@@ -141,6 +141,28 @@
 				</configuration>
 			</plugin>
 
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.5.5-SNAPSHOT</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<!-- Where to put jacoco coverage report, basically in the tests/target folder
+								for each component -->
+							<destFile>../target/jacoco.exec</destFile>
+							<includes>
+								<include>${coverage.filter}</include>
+							</includes>
+							<!-- Merge reports from all executions -->
+							<append>true</append>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<!-- to skip running tests (compile only) use commandline flag: -Dmaven.test.skip 
 				To allow all tests in a pom to pass/fail, use commandline flag: -fae (fail 
 				at end) -->
@@ -155,7 +177,8 @@
 					<useUIHarness>true</useUIHarness>
 					<useUIThread>true</useUIThread>
 					<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
-					<argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties} -Dusage_reporting_enabled=false</argLine>
+					<!-- Repeated ${tycho.testArgLine} in order to keep configuration of java.agent made by jacoco plugin -->
+					<argLine>${tycho.testArgLine} ${memoryOptions1} ${memoryOptions2} ${systemProperties} -Dusage_reporting_enabled=false</argLine>
 					<!-- https://docs.sonatype.org/display/TYCHO/How+to+run+SWTBot+tests+with+Tycho -->
 					<!-- set useUIThread=true for regular ui tests -->
 					<!-- set useUIThread=false for swtbot tests (?) -->
@@ -501,149 +524,6 @@
 			</build>
 		</profile>
 		<profile>
-			<id>coverage</id>
-			<activation>
-				<property>
-					<name>coverage</name>
-				</property>
-			</activation>
-			<properties>
-				<emma.session.out.file>${project.build.directory}/emma/coverage.es
-				</emma.session.out.file>
-				<emma.filter />
-				<emma.instrument.bundles />
-			</properties>
-			<build>
-				<plugins>
-					<!-- plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> 
-						<executions> <execution> <id>attach-artifacts</id> <phase>package</phase> 
-						<goals> <goal>attach-artifact</goal> </goals> <configuration> <artifacts> 
-						<artifact> <file>${emma.session.out.file}</file> <type>es</type> </artifact> 
-						</artifacts> </configuration> </execution> </executions> </plugin -->
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-install-plugin</artifactId>
-						<version>2.3.1</version>
-						<configuration>
-							<file></file>
-							<groupId></groupId>
-							<artifactId></artifactId>
-							<version></version>
-							<packaging></packaging>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-surefire-plugin</artifactId>
-						<version>${tychoVersion}</version>
-						<configuration>
-							<systemProperties combine.children="append">
-								<emma.session.out.file>${emma.session.out.file}
-								</emma.session.out.file>
-								<emma.filter>${emma.filter}</emma.filter>
-								<eclemma.instrument.bundles>${emma.instrument.bundles}
-								</eclemma.instrument.bundles>
-							</systemProperties>
-							<frameworkExtensions>
-								<frameworkExtension>
-									<groupId>org.eclemma.runtime.equinox</groupId>
-									<artifactId>org.eclemma.runtime.equinox</artifactId>
-									<version>1.1.0.200908261008</version>
-								</frameworkExtension>
-							</frameworkExtensions>
-							<application>org.eclipse.ui.ide.workbench</application>
-							<dependencies>
-								<dependency>
-									<type>p2-installable-unit</type>
-									<artifactId>org.eclipse.platform.ide</artifactId>
-									<version>0.0.0</version>
-								</dependency>
-							</dependencies>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<version>${maven.antrun.plugin.version}</version>
-						<dependencies>
-							<dependency>
-								<groupId>emma</groupId>
-								<artifactId>emma_ant</artifactId>
-								<version>2.0.5312</version>
-							</dependency>
-							<dependency>
-								<groupId>emma</groupId>
-								<artifactId>emma</artifactId>
-								<version>2.0.5312</version>
-							</dependency>
-							<dependency>
-								<groupId>ant-contrib</groupId>
-								<artifactId>ant-contrib</artifactId>
-								<version>1.0b3</version>
-								<exclusions>
-									<exclusion>
-										<groupId>ant</groupId>
-										<artifactId>ant</artifactId>
-									</exclusion>
-								</exclusions>
-							</dependency>
-						</dependencies>
-						<executions>
-							<execution>
-								<id>emma-report</id>
-								<phase>post-integration-test</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<tasks>
-										<taskdef resource="emma_ant.properties" />
-										<taskdef resource="net/sf/antcontrib/antlib.xml" />
-										<if>
-											<available file="${project.build.directory}/emma"
-												type="dir" />
-											<then>
-												<echo>Process emma report...</echo>
-												<for list="${emma.instrument.bundles}" param="bundle">
-													<sequential>
-														<property name="@{bundle}-classes"
-															location="${project.build.directory}/../../../plugins/@{bundle}" />
-														<echo>instruments ${@{bundle}-classes}</echo>
-														<emma enabled="true">
-															<instr metadatafile="${project.build.directory}/emma/@{bundle}-coverage.em"
-																mode="copy" outdir="${project.build.directory}/instrumented-classes/@{bundle}">
-																<instrpath>
-																	<fileset dir="${@{bundle}-classes}" includes="*.jar" />
-																	<fileset dir="${@{bundle}-classes}/target" includes="*.jar" />
-																</instrpath>
-															</instr>
-														</emma>
-													</sequential>
-												</for>
-												<emma enabled="true">
-													<report>
-														<infileset dir="${project.build.directory}/emma"
-															includes="*.es,*.em" />
-														<txt outfile="${project.build.directory}/emma/coverage.txt" />
-														<xml outfile="${project.build.directory}/emma/coverage.xml" />
-														<html outfile="${project.build.directory}/emma/coverage.html" />
-													</report>
-												</emma>
-												<loadfile property="emma.txt"
-													srcFile="${project.build.directory}/emma/coverage.txt"
-													failonerror="false" />
-												<echo>${emma.txt}</echo>
-											</then>
-										</if>
-									</tasks>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
 			<id>requirements</id>
 			<activation>
 				<file>
Index: build/pom-soa-tooling.xml
===================================================================
--- build/pom-soa-tooling.xml	(revision 37360)
+++ build/pom-soa-tooling.xml	(working copy)
@@ -27,16 +27,6 @@
 		</profile>
 
 		<profile>
-			<id>libs</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<modules>
-				<module>libs</module>
-			</modules>
-		</profile>
-
-		<profile>
 			<id>tests</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
@@ -265,15 +255,6 @@
 			</modules>
 		</profile>
 
-		<profile>
-			<id>aggregate-coverage</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<modules>
-				<module>reports/emma-coverage</module>
-			</modules>
-		</profile>
 	</profiles>
 
 </project>
Index: bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml
===================================================================
--- bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml	(revision 37360)
+++ bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	
 	<properties>
 		<!--  TODO: re-enable this as per JBDS-1876
-		<emma.filter>org.eclipse.bpel*</emma.filter>
-		<emma.instrument.bundles>org.eclipse.bpel.ui,org.eclipse.bpel.common.ui,org.eclipse.bpel.common.model,org.eclipse.bpel.model</emma.instrument.bundles>
+		<coverage.filter>org.eclipse.bpel*</coverage.filter>
 		-->
 	</properties>
 	
Index: usage/tests/org.jboss.tools.usage.test/pom.xml
===================================================================
--- usage/tests/org.jboss.tools.usage.test/pom.xml	(revision 37360)
+++ usage/tests/org.jboss.tools.usage.test/pom.xml	(working copy)
@@ -11,8 +11,4 @@
 	<artifactId>org.jboss.tools.usage.test</artifactId>
 	
 	<packaging>eclipse-test-plugin</packaging>
-	<properties>
-		<emma.filter />
-		<emma.instrument.bundles />
-	</properties>
 </project>
\ No newline at end of file
Index: usage/plugins/org.jboss.tools.usage/pom.xml
===================================================================
--- usage/plugins/org.jboss.tools.usage/pom.xml	(revision 37360)
+++ usage/plugins/org.jboss.tools.usage/pom.xml	(working copy)
@@ -12,7 +12,6 @@
 	
 	<packaging>eclipse-plugin</packaging>
 	<properties>
-		<emma.filter>org.jboss.tools.usage*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.usage</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.usage*</coverage.filter>
 	</properties>
 </project>
\ No newline at end of file
Index: portlet/tests/org.jboss.tools.portlet.core.test/pom.xml
===================================================================
--- portlet/tests/org.jboss.tools.portlet.core.test/pom.xml	(revision 37360)
+++ portlet/tests/org.jboss.tools.portlet.core.test/pom.xml	(working copy)
@@ -14,8 +14,7 @@
 
 	<properties>
 		<emma.session.out.file>${project.build.directory}/emma/coverage.es</emma.session.out.file>
-		<emma.filter>org.jboss.tools.portlet.core*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.portlet.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.portlet.core*</coverage.filter>
 	</properties>
 
 </project>
\ No newline at end of file
Index: smooks/tests/org.jboss.tools.smooks.core.test/pom.xml
===================================================================
--- smooks/tests/org.jboss.tools.smooks.core.test/pom.xml	(revision 37360)
+++ smooks/tests/org.jboss.tools.smooks.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.smooks*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.smooks.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.smooks*</coverage.filter>
 	</properties>
 
 </project>
\ No newline at end of file
Index: smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml
===================================================================
--- smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml	(revision 37360)
+++ smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml	(working copy)
@@ -13,7 +13,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.smooks.templating*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.smooks.templating</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.smooks.templating*</coverage.filter>
 	</properties>
 </project>
\ No newline at end of file
Index: smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
===================================================================
--- smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml	(revision 37360)
+++ smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.smooks.*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.smooks.ui,org.jboss.tools.smooks.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.smooks.*</coverage.filter>
 		<systemProperties>-Djbosstools.test.smooks.1.2.4=${requirement.build.root}/smooks-1.2.4</systemProperties>
 	</properties>
 
Index: smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml
===================================================================
--- smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml	(revision 37360)
+++ smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.smooks.*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.smooks.ui,org.jboss.tools.smooks.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.smooks.*</coverage.filter>
 	</properties>
 
 	<build>
Index: ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
===================================================================
--- ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml	(revision 37360)
+++ ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml	(working copy)
@@ -14,8 +14,7 @@
 
 	<properties>
 		<systemProperties>-Djbosstools.test.jre.6=${jbosstools.test.jre.6} -Djbosstools.test.jre.5=${jbosstools.test.jre.5} -Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA</systemProperties>
-		<emma.filter>org.jboss.tools.ws.creation.core*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.ws.creation.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.ws.creation.core*</coverage.filter>
 	</properties>
 
 	<build>
Index: ws/tests/org.jboss.tools.ws.core.test/pom.xml
===================================================================
--- ws/tests/org.jboss.tools.ws.core.test/pom.xml	(revision 37360)
+++ ws/tests/org.jboss.tools.ws.core.test/pom.xml	(working copy)
@@ -13,7 +13,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.ws.core*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.ws.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.ws.core*</coverage.filter>
 	</properties>
 </project>
\ No newline at end of file
Index: ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml
===================================================================
--- ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml	(revision 37360)
+++ ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml	(working copy)
@@ -13,8 +13,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.ws.creation.core*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.ws.creation.core</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.ws.creation.core*</coverage.filter>
 	</properties>
 
 	<build>
Index: ws/tests/org.jboss.tools.ws.ui.test/pom.xml
===================================================================
--- ws/tests/org.jboss.tools.ws.ui.test/pom.xml	(revision 37360)
+++ ws/tests/org.jboss.tools.ws.ui.test/pom.xml	(working copy)
@@ -13,7 +13,6 @@
 	<packaging>eclipse-test-plugin</packaging>
 
 	<properties>
-		<emma.filter>org.jboss.tools.ws.core*,org.jboss.tools.ws.ui*</emma.filter>
-		<emma.instrument.bundles>org.jboss.tools.ws.core,org.jboss.tools.ws.ui</emma.instrument.bundles>
+		<coverage.filter>org.jboss.tools.ws.core*,org.jboss.tools.ws.ui*</coverage.filter>
 	</properties>
 </project>
\ No newline at end of file
