code-coverage/pom.xml
| 209 ++++++++
etc/apt/pom.xml
| 4
etc/guiperftests/pom.xml
| 2
modules/core/arquillian-integration/container/pom.xml
| 4
modules/core/native-system/pom.xml
| 4
modules/core/plugin-container/pom.xml
| 4
modules/enterprise/binding/pom.xml
| 4
modules/enterprise/comm/pom.xml
| 2
modules/enterprise/remoting/cli/pom.xml
| 2
modules/enterprise/remoting/webservices/pom.xml
| 2
modules/enterprise/scripting/javascript/pom.xml
| 2
modules/enterprise/scripting/python/pom.xml
| 2
modules/enterprise/scripting/python/src/test/java/org/rhq/scripting/python/PythonScriptEngineInitializerTest.java
| 7
modules/enterprise/server/itests/pom.xml
| 2
modules/enterprise/server/plugins/alert-cli/pom.xml
| 2
modules/enterprise/server/plugins/alert-email/pom.xml
| 2
modules/enterprise/server/plugins/alert-irc/pom.xml
| 2
modules/enterprise/server/plugins/alert-log4j/pom.xml
| 2
modules/enterprise/server/plugins/alert-microblog/pom.xml
| 2
modules/enterprise/server/plugins/alert-mobicents/pom.xml
| 2
modules/enterprise/server/plugins/alert-operations/pom.xml
| 2
modules/enterprise/server/plugins/alert-roles/pom.xml
| 2
modules/enterprise/server/plugins/alert-sms/pom.xml
| 2
modules/enterprise/server/plugins/alert-snmp/pom.xml
| 2
modules/enterprise/server/plugins/alert-subject/pom.xml
| 2
modules/enterprise/server/plugins/ant-bundle/pom.xml
| 2
modules/enterprise/server/plugins/cloud/pom.xml
| 2
modules/enterprise/server/plugins/cobbler/pom.xml
| 2
modules/enterprise/server/plugins/disk/pom.xml
| 4
modules/enterprise/server/plugins/drift-mongodb/pom.xml
| 2
modules/enterprise/server/plugins/drift-rhq/pom.xml
| 2
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
| 2
modules/enterprise/server/plugins/groovy-script/pom.xml
| 2
modules/enterprise/server/plugins/jboss-software/pom.xml
| 2
modules/enterprise/server/plugins/packagetype-cli/pom.xml
| 2
modules/enterprise/server/plugins/url/pom.xml
| 4
modules/enterprise/server/plugins/yum/pom.xml
| 4
modules/integration-tests/apache-plugin-test/pom.xml
| 2
modules/integration-tests/jndi-access/jndi-access-test/pom.xml
| 2
modules/integration-tests/mod_cluster-plugin-test/pom.xml
| 2
modules/plugins/aliases/pom.xml
| 2
modules/plugins/ant-bundle/pom.xml
| 4
modules/plugins/apache/pom.xml
| 2
modules/plugins/byteman/pom.xml
| 4
modules/plugins/cobbler/pom.xml
| 2
modules/plugins/cron/pom.xml
| 2
modules/plugins/filetemplate-bundle/pom.xml
| 4
modules/plugins/grub/pom.xml
| 2
modules/plugins/hibernate/pom.xml
| 4
modules/plugins/hosts/pom.xml
| 2
modules/plugins/iis/pom.xml
| 4
modules/plugins/iptables/pom.xml
| 4
modules/plugins/jboss-as-5/pom.xml
| 4
modules/plugins/jboss-as-7/pom.xml
| 5
modules/plugins/jboss-as/pom.xml
| 4
modules/plugins/jboss-cache-v3/pom.xml
| 4
modules/plugins/jboss-cache/pom.xml
| 4
modules/plugins/jdbctrace/pom.xml
| 4
modules/plugins/jira/pom.xml
| 4
modules/plugins/jmx/pom.xml
| 4
modules/plugins/lsof/pom.xml
| 4
modules/plugins/mod-cluster/pom.xml
| 2
modules/plugins/mysql/pom.xml
| 4
modules/plugins/netservices/pom.xml
| 4
modules/plugins/perftest/pom.xml
| 4
modules/plugins/platform/pom.xml
| 4
modules/plugins/postfix/pom.xml
| 2
modules/plugins/postgres/pom.xml
| 4
modules/plugins/rhq-agent/pom.xml
| 2
modules/plugins/rhq-server/pom.xml
| 2
modules/plugins/samba/pom.xml
| 2
modules/plugins/script/pom.xml
| 4
modules/plugins/sshd/pom.xml
| 2
modules/plugins/sudoers/pom.xml
| 2
modules/plugins/tomcat/pom.xml
| 4
modules/plugins/virt/pom.xml
| 4
pom.xml
| 237 ++++++++--
77 files changed, 531 insertions(+), 133 deletions(-)
New commits:
commit 1f005f8ed4d286f8c325ca9b54628fc0925831f6
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Oct 30 12:31:27 2012 +0100
Changed the code-coverage provider to JaCoCo.
We now generate a separate coverage report for unit tests and integration tests.
We also generate one overall report per project.
Additionally an overall report including the results of all unit and integration
tests is generated in a new top-level module called "code-coverage".
diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml
new file mode 100644
index 0000000..a638858
--- /dev/null
+++ b/code-coverage/pom.xml
@@ -0,0 +1,209 @@
+<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>
+ <parent>
+ <artifactId>rhq-parent</artifactId>
+ <groupId>org.rhq</groupId>
+ <version>4.6.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>rhq-code-coverage</artifactId>
+
+ <name>RHQ Code Coverage</name>
+ <description>A module gathering the code coverage info from the test runs of all
the RHQ modules</description>
+
+ <properties>
+ <rhq.internal>false</rhq.internal>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>code-coverage</id>
+ <activation>
+ <property>
+ <name>code-coverage</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- Do NOT run code coverage on this module... -->
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <!-- Do NOT run tests in this module... -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <!-- NOT even the integration tests... -->
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <!-- Copy the ant tasks jar. Needed for ts.jacoco.report-ant .
-->
+ <execution>
+ <id>jacoco-dependency-ant</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>process-test-resources</phase>
+ <inherited>false</inherited>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.ant</artifactId>
+ <version>${jacoco.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <stripVersion>true</stripVersion>
+
<outputDirectory>${project.build.directory}/jacoco-jars</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>overall-chart-creation</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- Execute an ant task within maven -->
+ <echo message="Generating JaCoCo Reports"
/>
+ <taskdef name="report"
classname="org.jacoco.ant.ReportTask">
+ <classpath
path="${project.build.directory}/jacoco-jars/org.jacoco.ant.jar" />
+ </taskdef>
+ <mkdir
dir="${project.reporting.outputDirectory}/coverage-report/overall" />
+ <report>
+ <executiondata>
+ <fileset
dir="${basedir}/../modules">
+ <include
name="**/target/jacoco-unit-test.exec" />
+ <include
name="**/target/jacoco-integration-test.exec" />
+ </fileset>
+ </executiondata>
+ <structure name="RHQ Overall Code Coverage
Report (including unit and integration tests)">
+ <group name="Plugins">
+ <classfiles>
+ <fileset
dir="${basedir}/../modules">
+ <include
name="plugins/**/target/classes/org/rhq/**" />
+ <include
name="plugins/**/target/generated-classes/*/org/rhq/**" />
+ <include
name="integration-tests/**/target/classes/org/rhq/**" />
+ <include
name="integration-tests/**/target/generated-classes/org/rhq/**" />
+ </fileset>
+ </classfiles>
+ <sourcefiles>
+ <dirset
dir="${basedir}/../modules/">
+ <include
name="**/src/main/java" />
+ <include
name="**/target/generated-sources/*" />
+ </dirset>
+ </sourcefiles>
+ </group>
+ <group name="Core">
+ <classfiles>
+ <fileset
dir="${basedir}/../modules">
+ <include
name="core/**/target/classes/org/rhq/**" />
+ <include
name="core/**/target/generated-classes/org/rhq/**" />
+ <include
name="integration-tests/**/target/classes/org/rhq/**" />
+ <include
name="integration-tests/**/target/generated-classes/org/rhq/**" />
+ </fileset>
+ </classfiles>
+ <sourcefiles>
+ <dirset
dir="${basedir}/../modules/">
+ <include
name="**/src/main/java" />
+ <include
name="**/target/generated-sources/*" />
+ </dirset>
+ </sourcefiles>
+ </group>
+ <group name="Enterprise">
+ <classfiles>
+ <fileset
dir="${basedir}/../modules">
+ <include
name="enterprise/**/target/classes/org/rhq/**" />
+ <include
name="enterprise/**/target/generated-classes/org/rhq/**" />
+ <include
name="integration-tests/**/target/classes/org/rhq/**" />
+ <include
name="integration-tests/**/target/generated-classes/org/rhq/**" />
+ <exclude
name="enterprise/gui/**" />
+ </fileset>
+ </classfiles>
+ <sourcefiles>
+ <dirset
dir="${basedir}/../modules/">
+ <include
name="**/src/main/java" />
+ <include
name="**/target/generated-sources/*" />
+ </dirset>
+ </sourcefiles>
+ </group>
+ <group name="GUI">
+ <classfiles>
+ <fileset
dir="${basedir}/../modules">
+ <include
name="enterprise/gui/**/target/classes/org/rhq/**" />
+ <include
name="enterprise/gui/**/target/generated-classes/org/rhq/**" />
+ <include
name="integration-tests/**/target/classes/org/rhq/**" />
+ <include
name="integration-tests/**/target/generated-classes/org/rhq/**" />
+ </fileset>
+ </classfiles>
+ <sourcefiles>
+ <dirset
dir="${basedir}/../modules/">
+ <include
name="**/src/main/java" />
+ <include
name="**/target/generated-sources/*" />
+ </dirset>
+ </sourcefiles>
+ </group>
+ <group name="Miscellaneous">
+ <classfiles>
+ <fileset
dir="${basedir}/../modules">
+ <include
name="**/target/classes/org/rhq/**" />
+ <include
name="**/target/generated-classes/org/rhq/**" />
+ <exclude
name="plugins/**/target/classes/org/rhq/**" />
+ <exclude
name="plugins/**/target/generated-classes/*/org/rhq/**" />
+ <exclude
name="core/**/target/classes/org/rhq/**" />
+ <exclude
name="core/**/target/generated-classes/org/rhq/**" />
+ <exclude
name="enterprise/**/target/classes/org/rhq/**" />
+ <exclude
name="enterprise/**/target/generated-classes/org/rhq/**" />
+ </fileset>
+ </classfiles>
+ <sourcefiles>
+ <dirset
dir="${basedir}/../modules/">
+ <include
name="**/src/main/java" />
+ <include
name="**/target/generated-sources/*" />
+ </dirset>
+ </sourcefiles>
+ </group>
+ </structure>
+ <html
destdir="${project.reporting.outputDirectory}/coverage-report/overall" />
+ <xml
destfile="${project.reporting.outputDirectory}/coverage-report/overall/coverage-report.xml"
/>
+ <csv
destfile="${project.reporting.outputDirectory}/coverage-report/overall/coverage-report.csv"
/>
+ </report>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.ant</artifactId>
+ <version>${jacoco.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
+
\ No newline at end of file
diff --git a/etc/apt/pom.xml b/etc/apt/pom.xml
index 882bdee..215ebd9 100644
--- a/etc/apt/pom.xml
+++ b/etc/apt/pom.xml
@@ -107,8 +107,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/etc/guiperftests/pom.xml b/etc/guiperftests/pom.xml
index 4ef1107..07d6d1d 100644
--- a/etc/guiperftests/pom.xml
+++ b/etc/guiperftests/pom.xml
@@ -70,7 +70,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.6</version>
<configuration>
- <argLine>-Xms16M -Xmx256M</argLine>
+ <argLine>${jacoco.unit-test.args} -Xms16M -Xmx256M</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/modules/core/arquillian-integration/container/pom.xml
b/modules/core/arquillian-integration/container/pom.xml
index 590a475..19b4d35 100644
--- a/modules/core/arquillian-integration/container/pom.xml
+++ b/modules/core/arquillian-integration/container/pom.xml
@@ -83,8 +83,10 @@
<!-- 3rd party -->
+ <!-- Yes, this is meant to be org.javassist:javassist, and NOT
+ javassist:javassist - which is an older impl -->
<dependency>
- <groupId>javassist</groupId>
+ <groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index 217830c..d7e1500 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -92,9 +92,9 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!-- need to point the library path to the location of the native libraries
-->
-
<argLine>-Dorg.hyperic.sigar.path=${project.build.directory}/jboss-sigar</argLine>
+ <argLine>${jacoco.unit-test.args}
-Dorg.hyperic.sigar.path=${project.build.directory}/jboss-sigar</argLine>
<!--
- <argLine>-Dorg.hyperic.sigar.path=${project.build.directory}/jboss-sigar
-Dsigar.nativeLogging=true -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args}
-Dorg.hyperic.sigar.path=${project.build.directory}/jboss-sigar -Dsigar.nativeLogging=true
-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/core/plugin-container/pom.xml
b/modules/core/plugin-container/pom.xml
index 04c6f92..b3fcf49 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -364,9 +364,9 @@
<excludedGroups>arquillian,${rhq.testng.excludedGroups}</excludedGroups>
<!-- need to point the library path to the location of the native
libraries -->
-
<argLine>-Dorg.hyperic.sigar.path=${project.build.directory}/jboss-sigar</argLine>
+ <argLine>${jacoco.unit-test.args}
-Dorg.hyperic.sigar.path=${project.build.directory}/jboss-sigar</argLine>
<!--
-
<argLine>-Dorg.hyperic.sigar.path=${project.build.directory}/jboss-sigar
-Dsigar.nativeLogging=true</argLine>
+ <argLine>${jacoco.unit-test.args}
-Dorg.hyperic.sigar.path=${project.build.directory}/jboss-sigar
-Dsigar.nativeLogging=true</argLine>
-->
</configuration>
</execution>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 016f36c..0b290d3 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -240,9 +240,9 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <!-- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
+ <!-- <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine> -->
- <argLine>-Djava.security.manager
-Djava.security.policy==${project.build.testOutputDirectory}/allow-all.policy</argLine>
+ <argLine>${jacoco.unit-test.args} -Djava.security.manager
-Djava.security.policy==${project.build.testOutputDirectory}/allow-all.policy</argLine>
<!-- This is important, because some of the tests try to exit the
JVM. -->
<failIfNoTests>true</failIfNoTests>
</configuration>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index b14937b..6214f5e 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -144,7 +144,7 @@
<skip>false</skip>
-->
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
<systemPropertyVariables combine.children="append">
<rhq.comm.test.connectorBindPort>${rhq.comm.test.connectorBindPort}</rhq.comm.test.connectorBindPort>
diff --git a/modules/enterprise/remoting/cli/pom.xml
b/modules/enterprise/remoting/cli/pom.xml
index 6669e43..e069d89 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -200,7 +200,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups},ws</excludedGroups>
<forkMode>pertest</forkMode>
- <argLine>-Xmx512m -Xms128m</argLine>
+ <argLine>${jacoco.unit-test.args} -Xmx512m
-Xms128m</argLine>
<additionalClasspathElements>
-->
<!-- The below is required for WS Java Client support -->
diff --git a/modules/enterprise/remoting/webservices/pom.xml
b/modules/enterprise/remoting/webservices/pom.xml
index e2a48c4..33c1952 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -207,7 +207,7 @@
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<groups>ws</groups>
<forkMode>pertest</forkMode>
- <argLine>-Xmx512m -Xms128m</argLine>
+ <argLine>${jacoco.unit-test.args} -Xmx512m
-Xms128m</argLine>
<systemProperties>
<property>
<name>deploymentDirectory</name>
diff --git a/modules/enterprise/scripting/javascript/pom.xml
b/modules/enterprise/scripting/javascript/pom.xml
index 7788fd6..ab35acb 100644
--- a/modules/enterprise/scripting/javascript/pom.xml
+++ b/modules/enterprise/scripting/javascript/pom.xml
@@ -57,7 +57,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <argLine>-Djava.security.manager
+ <argLine>${jacoco.unit-test.args} -Djava.security.manager
-Djava.security.policy==${project.build.testOutputDirectory}/allow-all.policy</argLine>
<!-- This is important, because some of the tests try to exit
the JVM. -->
diff --git a/modules/enterprise/scripting/python/pom.xml
b/modules/enterprise/scripting/python/pom.xml
index 9355be6..e4b3cfb 100644
--- a/modules/enterprise/scripting/python/pom.xml
+++ b/modules/enterprise/scripting/python/pom.xml
@@ -56,7 +56,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <argLine>-Djava.security.manager
+ <argLine>${jacoco.unit-test.args} -Djava.security.manager
-Djava.security.policy==${project.build.testOutputDirectory}/allow-all.policy</argLine>
<!-- This is important, because some of the tests try to exit
the JVM. -->
diff --git
a/modules/enterprise/scripting/python/src/test/java/org/rhq/scripting/python/PythonScriptEngineInitializerTest.java
b/modules/enterprise/scripting/python/src/test/java/org/rhq/scripting/python/PythonScriptEngineInitializerTest.java
index b1d4a65..e3b1355 100644
---
a/modules/enterprise/scripting/python/src/test/java/org/rhq/scripting/python/PythonScriptEngineInitializerTest.java
+++
b/modules/enterprise/scripting/python/src/test/java/org/rhq/scripting/python/PythonScriptEngineInitializerTest.java
@@ -25,6 +25,7 @@ import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.net.URI;
import java.security.AccessControlException;
import java.security.Permissions;
@@ -164,6 +165,12 @@ public class PythonScriptEngineInitializerTest {
Map<String, Set<Method>> ret = new HashMap<String,
Set<Method>>();
for (Method m : cls.getDeclaredMethods()) {
+ int mods = m.getModifiers();
+
+ if (Modifier.isStatic(mods) || !Modifier.isPublic(mods)) {
+ continue;
+ }
+
Set<Method> methods = ret.get(m.getName());
if (methods == null) {
methods = new HashSet<Method>();
diff --git a/modules/enterprise/server/itests/pom.xml
b/modules/enterprise/server/itests/pom.xml
index 337f003..0ec6a6a 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -369,7 +369,7 @@
<value>${project.version}</value>
</property>
</systemProperties>
- <argLine>-Djava.security.manager
-Djava.security.policy==${basedir}/target/test-classes/security.policy</argLine>
+ <argLine>${jacoco.unit-test.args} -Djava.security.manager
-Djava.security.policy==${basedir}/target/test-classes/security.policy</argLine>
<additionalClasspathElements>
<!-- The below is required for tests to run against Oracle.
-->
<additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml
b/modules/enterprise/server/plugins/alert-cli/pom.xml
index ba3d9e7..5beb580 100644
--- a/modules/enterprise/server/plugins/alert-cli/pom.xml
+++ b/modules/enterprise/server/plugins/alert-cli/pom.xml
@@ -28,7 +28,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <!-- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
+ <!-- <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine> -->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml
b/modules/enterprise/server/plugins/alert-email/pom.xml
index 4ef23f6..42e8f66 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -34,7 +34,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml
b/modules/enterprise/server/plugins/alert-irc/pom.xml
index 23835a6..03db452 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -31,7 +31,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml
b/modules/enterprise/server/plugins/alert-log4j/pom.xml
index 2348550..01ad691 100644
--- a/modules/enterprise/server/plugins/alert-log4j/pom.xml
+++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml
@@ -21,7 +21,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml
b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index ff263a3..e7359c1 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -29,7 +29,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index 7e492cb..66b5993 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -21,7 +21,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml
b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 9dc3ad5..a5f809f 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -21,7 +21,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml
b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 248675d..e561d51 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -32,7 +32,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/alert-sms/pom.xml
b/modules/enterprise/server/plugins/alert-sms/pom.xml
index b0c88c9..72a6b15 100644
--- a/modules/enterprise/server/plugins/alert-sms/pom.xml
+++ b/modules/enterprise/server/plugins/alert-sms/pom.xml
@@ -64,7 +64,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml
b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index 5561091..3619956 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -29,7 +29,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml
b/modules/enterprise/server/plugins/alert-subject/pom.xml
index e3394ab..ca4c079 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -21,7 +21,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml
b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index b4f59b0..e896df6 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -66,7 +66,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/cloud/pom.xml
b/modules/enterprise/server/plugins/cloud/pom.xml
index 6ed8c41..bf2f8d5 100644
--- a/modules/enterprise/server/plugins/cloud/pom.xml
+++ b/modules/enterprise/server/plugins/cloud/pom.xml
@@ -49,7 +49,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml
b/modules/enterprise/server/plugins/cobbler/pom.xml
index d91220a..af648f1 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -73,7 +73,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml
b/modules/enterprise/server/plugins/disk/pom.xml
index af75452..f6f4172 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -48,8 +48,8 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
- -->
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ -->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/drift-mongodb/pom.xml
b/modules/enterprise/server/plugins/drift-mongodb/pom.xml
index 1c65111..ccc7edd 100644
--- a/modules/enterprise/server/plugins/drift-mongodb/pom.xml
+++ b/modules/enterprise/server/plugins/drift-mongodb/pom.xml
@@ -88,7 +88,7 @@
<skipTests>${skip.mongodb.tests}</skipTests>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml
b/modules/enterprise/server/plugins/drift-rhq/pom.xml
index ad0fc4f..ec4f8d3 100644
--- a/modules/enterprise/server/plugins/drift-rhq/pom.xml
+++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml
@@ -62,7 +62,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index 7f4dfac..96458e2 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -68,7 +68,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml
b/modules/enterprise/server/plugins/groovy-script/pom.xml
index b306249..d8ea7f7 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -125,7 +125,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml
b/modules/enterprise/server/plugins/jboss-software/pom.xml
index cbb2a54..c2e0b73 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -53,7 +53,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <!--<argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
index 5a7da8e..bb5ef4d 100644
--- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
+++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
@@ -21,7 +21,7 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/url/pom.xml
b/modules/enterprise/server/plugins/url/pom.xml
index 471153b..338e489 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -57,8 +57,8 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
- -->
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ -->
</configuration>
</plugin>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml
b/modules/enterprise/server/plugins/yum/pom.xml
index c07a573..2d0ed5e 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -42,8 +42,8 @@
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<!--
- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
- -->
+ <argLine>${jacoco.unit-test.args} -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ -->
</configuration>
</plugin>
diff --git a/modules/integration-tests/apache-plugin-test/pom.xml
b/modules/integration-tests/apache-plugin-test/pom.xml
index 4f57361..390c772 100644
--- a/modules/integration-tests/apache-plugin-test/pom.xml
+++ b/modules/integration-tests/apache-plugin-test/pom.xml
@@ -270,7 +270,7 @@
<additionalClasspathElements>
<additionalClasspathElement>${env.JAVA_HOME}/lib/tools.jar</additionalClasspathElement>
</additionalClasspathElements>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib
-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine> -->
<environmentVariables>
<LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index 3533cff..aed285e 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -326,7 +326,7 @@
<jnp.port>${jnp.port}</jnp.port>
<jnp.rmiPort>${jnp.rmiPort}</jnp.rmiPort>
</systemPropertyVariables>
- <argLine>-Djava.security.manager
-Djava.security.policy==${basedir}/target/test-classes/security.policy</argLine>
+ <argLine>${jacoco.unit-test.args} -Djava.security.manager
-Djava.security.policy==${basedir}/target/test-classes/security.policy</argLine>
<additionalClasspathElements>
<!-- The below is required for tests to run against
Oracle. -->
diff --git a/modules/integration-tests/mod_cluster-plugin-test/pom.xml
b/modules/integration-tests/mod_cluster-plugin-test/pom.xml
index 63fb98d..0a30815 100644
--- a/modules/integration-tests/mod_cluster-plugin-test/pom.xml
+++ b/modules/integration-tests/mod_cluster-plugin-test/pom.xml
@@ -345,7 +345,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/testsetup/lib</argLine>
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/testsetup/lib</argLine>
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index aa455b8..7a84e11 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -163,7 +163,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<environmentVariables>
<LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH>
</environmentVariables>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 0427125..357d294 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -160,9 +160,9 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
<!--
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
<systemProperties>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 83070a3..2055075 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -225,7 +225,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<environmentVariables>
<LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH>
</environmentVariables>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 62e4127..b20128b 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -132,8 +132,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index d362d14..dd09ee4 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -168,7 +168,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<environmentVariables>
<LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH>
</environmentVariables>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 7a51dda..b657717 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -157,7 +157,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<environmentVariables>
<LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH>
</environmentVariables>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml
b/modules/plugins/filetemplate-bundle/pom.xml
index e635b21..5701fed 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -141,8 +141,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 866bbb9..5ede70d 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -154,7 +154,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<environmentVariables>
<LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH>
</environmentVariables>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 5240ed7..f959900 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -134,8 +134,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index d893686..a3526b1 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -164,7 +164,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<environmentVariables>
<LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH>
</environmentVariables>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 9e6f67f..76159e8 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -90,8 +90,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/iptables/pom.xml b/modules/plugins/iptables/pom.xml
index d6eeff3..6f76c32 100644
--- a/modules/plugins/iptables/pom.xml
+++ b/modules/plugins/iptables/pom.xml
@@ -106,8 +106,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 283b840..40783dd 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -344,8 +344,8 @@
<useSystemClassLoader>true</useSystemClassLoader>
<excludes><exclude>org/rhq/plugins/jbossas5/itest/**</exclude></excludes>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<additionalClasspathElements>
<additionalClasspathElement>
${project.build.testSourceDirectory}/../jars/ejb2-test.jar
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index 10b0ad2..61677c1 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -88,7 +88,6 @@
<artifactId>postgresql</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
@@ -307,7 +306,8 @@
<delete file="${as7.zipfile}"/>
<get src="${as7.url}" dest="${as7.zipfile}"
usetimestamp="true" verbose="true"/>
<unzip src="${as7.zipfile}"
dest="${java.io.tmpdir}"/>
- <delete dir="${jboss7.home}"
verbose="true"/>
+ <!-- What was this supposed to do? Right now, it'd delete the
AS7 deployment we just unzipped. -->
+ <!-- <delete dir="${jboss7.home}"
verbose="true"/> -->
<move file="${java.io.tmpdir}/jboss-eap-6.0"
tofile="${jboss7.home}"
failonerror="false"/>
@@ -612,7 +612,6 @@
</build>
</profile>
-
</profiles>
</project>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index a7bb4b2..4f44560 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -265,8 +265,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml
b/modules/plugins/jboss-cache-v3/pom.xml
index 82e9ce7..d361412 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -384,8 +384,8 @@
<additionalClasspathElement>${project.build.testSourceDirectory}/../jars/TestCacheEJB.jar</additionalClasspathElement>
</additionalClasspathElements>
<excludedGroups>jbosscache3.test</excludedGroups>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index 3224e55..aa567d1 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -124,8 +124,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/jdbctrace/pom.xml b/modules/plugins/jdbctrace/pom.xml
index 3a3ea7c..5eb4cbf 100644
--- a/modules/plugins/jdbctrace/pom.xml
+++ b/modules/plugins/jdbctrace/pom.xml
@@ -162,8 +162,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/jira/pom.xml b/modules/plugins/jira/pom.xml
index d9f90ba..a0c584d 100644
--- a/modules/plugins/jira/pom.xml
+++ b/modules/plugins/jira/pom.xml
@@ -142,8 +142,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 36db1d4..6338a09 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -122,8 +122,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/lsof/pom.xml b/modules/plugins/lsof/pom.xml
index eca4983..a83c1e3 100644
--- a/modules/plugins/lsof/pom.xml
+++ b/modules/plugins/lsof/pom.xml
@@ -132,8 +132,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index 4a3493f..159ca2b 100644
--- a/modules/plugins/mod-cluster/pom.xml
+++ b/modules/plugins/mod-cluster/pom.xml
@@ -152,7 +152,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/testsetup/lib</argLine>
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/testsetup/lib</argLine>
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index 9d1d12f..2aca604 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -137,8 +137,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 1150274..5784707 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -142,8 +142,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 2e34f17..b5675b2 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -110,9 +110,9 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Djava.library.path=${basedir}/target/itest/lib</argLine>
+ <argLine>${jacoco.integration-test.args}
-Djava.library.path=${basedir}/target/itest/lib</argLine>
<!--
- <argLine>-Djava.library.path=${basedir}/target/itest/lib
-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ <argLine>${jacoco.integration-test.args}
-Djava.library.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
-->
<systemPropertyVariables>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 3ea1b6a..e97e499 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -90,8 +90,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 4e01e5d..1f09192 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -162,7 +162,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<environmentVariables>
<LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH>
</environmentVariables>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index a169747..8edd65b 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -136,8 +136,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index 78156ef..8e3a261 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -110,7 +110,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
<systemPropertyVariables
combine.children="append">
<project.artifactId>${project.artifactId}</project.artifactId>
<project.version>${project.version}</project.version>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 6fcebc8..e829cdd 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -135,7 +135,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 4bf3518..8eb30e5 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -162,7 +162,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<environmentVariables>
<LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH>
</environmentVariables>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 7dc360f..b0e846e 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -90,8 +90,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 0462ac0..d03c5c4 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -154,7 +154,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<environmentVariables>
<LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH>
</environmentVariables>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 095692b..c17112c 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -152,7 +152,7 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<environmentVariables>
<LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH>
</environmentVariables>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index e1b0c40..93092ea 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -117,8 +117,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>true</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index cf01db9..ad8efb4 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -111,8 +111,8 @@
<skip>${maven.test.skip}</skip>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<useSystemClassLoader>false</useSystemClassLoader>
-
<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
-
<!--<argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
+ <argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine>
+ <!--<argLine>${jacoco.integration-test.args}
-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib -Xdebug -Xnoagent
-Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>-->
<systemProperties>
<property>
<name>project.artifactId</name>
diff --git a/pom.xml b/pom.xml
index 53fa751..ea5af1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
<jboss-javassist.version>3.9.0.GA</jboss-javassist.version>
<jbossws-native-dist.version>3.1.1.GA</jbossws-native-dist.version>
<!-- End: JBoss AS Dependency Versions -->
-
+
<commons-logging.version>1.1.0.jboss</commons-logging.version>
<concurrent.version>1.3.4-jboss-update1</concurrent.version> <!--
oswego-concurrent compatible with 4.2.3.GA -->
<findbugs.version>2.3.2</findbugs.version>
@@ -109,10 +109,16 @@
<ant.contrib.version>1.0b3</ant.contrib.version>
<resteasy.version>2.3.4.Final</resteasy.version>
<freemarker.version>2.3.18</freemarker.version>
- <powermock.version>1.4.11</powermock.version>
+ <powermock.version>1.4.12</powermock.version>
<arquillian.version>1.0.1.Final</arquillian.version>
<xercesImpl.version>2.9.1-jbossas-2</xercesImpl.version> <!-- see
BZ-820629 and CVE-2009-2625 -->
+ <!-- Note that this is DIFFERENT from the jboss-javassist defined above.
+ This version is used for org.javassist:javassist artifact that is used in
+ Arquillian integration, and works with jacoco (as opposed to javassist 3.9.0,
+ which doesn't in some cases.) -->
+ <javassist.version>3.16.1-GA</javassist.version>
+
<rhq.db.admin.username>rhqadmin</rhq.db.admin.username>
<rhq.db.admin.password>rhqadmin</rhq.db.admin.password>
@@ -195,6 +201,8 @@
<!-- The name of the file in the module's root dir that contains the
intentional
api changes to be ignored by Clirr api checks -->
<intentional-api-changes-file>intentional-api-changes-since-${signature-check-base-version}.xml</intentional-api-changes-file>
+
+ <jacoco.version>0.6.0.201210061924</jacoco.version>
</properties>
@@ -496,6 +504,11 @@
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -594,18 +607,24 @@
</exclusion>
</exclusions>
</dependency>
-
- <!-- We must declare this here to workaround
-
http://jira.codehaus.org/browse/MANTRUN-51.
- Once we require Maven 3.0, this will no
- no longer needed. -->
- <dependency>
- <groupId>net.sourceforge.cobertura</groupId>
- <artifactId>cobertura</artifactId>
- <version>${cobertura.version}</version>
- </dependency>
</dependencies>
- </plugin>
+
+ <executions>
+ <execution>
+ <id>pre-create target/classes</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo>Pre-creating target/classes so that Jacoco can see it
even if there are no source files in the module.</echo>
+ <mkdir dir="${project.build.directory}/classes"
/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -645,7 +664,7 @@
http://jira.codehaus.org/browse/SUREFIRE-836. -->
<version>2.11</version>
<configuration>
- <argLine>-Xms32M -Xmx512M</argLine>
+ <argLine>${jacoco.integration-test.args} -Xms32M
-Xmx512M</argLine>
</configuration>
</plugin>
<plugin>
@@ -694,7 +713,7 @@
http://jira.codehaus.org/browse/SUREFIRE-836. -->
<version>2.11</version>
<configuration>
- <argLine>-Xms32M -Xmx512M</argLine>
+ <argLine>${jacoco.unit-test.args} -Xms32M -Xmx512M</argLine>
</configuration>
</plugin>
<plugin>
@@ -761,7 +780,13 @@
<artifactId>clirr-maven-plugin</artifactId>
<version>${clirr.version}</version>
</plugin>
- </plugins>
+
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ </plugin>
+ </plugins>
</pluginManagement>
@@ -1187,34 +1212,190 @@
<modules>
<module>modules</module>
+ <module>code-coverage</module>
</modules>
<profiles>
+ <!-- This profile is the "opposite" of the code coverage profile and
provides
+ default values for properties that are set in the code-coverage profile
+ to kick of jacoco java agent. -->
+ <profile>
+ <id>no-code-coverage</id>
+ <activation>
+ <property>
+ <name>!code-coverage</name>
+ </property>
+ </activation>
+
+ <properties>
+ <jacoco.unit-test.args></jacoco.unit-test.args>
+ <jacoco.integration-test.args></jacoco.integration-test.args>
+ </properties>
+ </profile>
+
<profile>
<id>code-coverage</id>
-
+ <activation>
+ <property>
+ <name>code-coverage</name>
+ </property>
+ </activation>
<build>
<plugins>
+ <!-- This definition creates the 2 independent coverage reports -
+ separately for unit tests and integration tests -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.2</version>
- <configuration>
- <formats>
- <format>xml</format>
- </formats>
- </configuration>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
- <phase>post-integration-test</phase>
+ <id>prepare-agent-for-unit-tests</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+
<destFile>${project.build.directory}/jacoco-unit-test.exec</destFile>
+ <propertyName>jacoco.unit-test.args</propertyName>
+ <includes>
+ <include>org.rhq.*</include>
+ </includes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>prepare-agent-for-integration-tests</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+
<destFile>${project.build.directory}/jacoco-integration-test.exec</destFile>
+
<propertyName>jacoco.integration-test.args</propertyName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>report-unit-tests</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+
<dataFile>${project.build.directory}/jacoco-unit-test.exec</dataFile>
+
<outputDirectory>${project.reporting.outputDirectory}/coverage-report/unit-tests</outputDirectory>
+ <includes>
+ <include>org/rhq/**</include>
+ </includes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>report-integration-tests</id>
+ <!-- Run this very late so that test, integration-test
+ have already been completed -->
+ <phase>verify</phase>
<goals>
- <goal>cobertura</goal>
+ <goal>report</goal>
</goals>
+ <configuration>
+
<dataFile>${project.build.directory}/jacoco-integration-test.exec</dataFile>
+
<outputDirectory>${project.reporting.outputDirectory}/coverage-report/integration-tests</outputDirectory>
+ <includes>
+ <include>org/rhq/**</include>
+ </includes>
+ </configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
+
+ <!-- The following insanity merges the two separate coverage reports
+ and produces an overall report - the total test coverage including
+ both unit and integration tests (defined in the same module).
+ If the integration test resides in a separate module, it is only
+ possible to deduce the coverage from report generated by the
+ top-level code-coverage module that merges all the coverage
+ reports in the whole build. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <!-- Copy the ant tasks jar. Needed for org.jacoco.ant.ReportTask .
-->
+ <execution>
+ <id>jacoco-dependency-ant</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>process-test-resources</phase>
+ <inherited>false</inherited>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.ant</artifactId>
+ <version>${jacoco.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <stripVersion>true</stripVersion>
+
<outputDirectory>${project.build.directory}/jacoco-jars</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>overall-chart-creation</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- Execute an ant task within maven -->
+ <echo message="Generating Overall JaCoCo Report"
/>
+ <taskdef name="report"
classname="org.jacoco.ant.ReportTask">
+ <classpath
path="${project.build.directory}/jacoco-jars/org.jacoco.ant.jar" />
+ </taskdef>
+ <mkdir
dir="${project.reporting.outputDirectory}/coverage-report/overall" />
+ <report>
+ <executiondata>
+ <fileset
dir="${project.build.directory}">
+ <include name="jacoco-unit-test.exec"
/>
+ <include
name="jacoco-integration-test.exec" />
+ </fileset>
+ </executiondata>
+ <structure name="Overall Code Coverage Report
(including unit and integration tests)">
+ <classfiles>
+ <fileset
dir="${project.build.directory}">
+ <include name="classes/org/rhq/**"
/>
+ <include
name="generated-classes/*/org/rhq/**" />
+ </fileset>
+ </classfiles>
+ <sourcefiles>
+ <dirset dir="${basedir}">
+ <include name="src/main/java" />
+ <include
name="target/generated-sources/*" />
+ </dirset>
+ </sourcefiles>
+ </structure>
+ <html
destdir="${project.reporting.outputDirectory}/coverage-report/overall" />
+ <xml
destfile="${project.reporting.outputDirectory}/coverage-report/overall/jacoco.xml"
/>
+ <csv
destfile="${project.reporting.outputDirectory}/coverage-report/overall/jacoco.csv"
/>
+ </report>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.ant</artifactId>
+ <version>${jacoco.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
</profile>