Author: dgolovin Date: 2010-06-29 12:57:48 -0400 (Tue, 29 Jun 2010) New Revision: 23092 Modified: trunk/jmx/features/org.jboss.tools.jmx.feature/pom.xml trunk/jmx/features/org.jboss.tools.jmx.tests.feature/pom.xml trunk/jmx/features/pom.xml trunk/jmx/plugins/org.jboss.tools.jmx.core/pom.xml trunk/jmx/plugins/org.jboss.tools.jmx.ui/pom.xml trunk/jmx/plugins/pom.xml trunk/jmx/pom.xml trunk/jmx/site/pom.xml trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml trunk/jmx/tests/pom.xml trunk/parent-pom.xml Log: 1. code coverage enabled for jmx 2. artefacts groups and ids updated to have folder structure in maven repo similar to repository like: jmx features plugins site tests 3. parent references removed from aggregator projects jmx.all, jmx.tests, jmx.features and jmx.plugins because it is not needed here Modified: trunk/jmx/features/org.jboss.tools.jmx.feature/pom.xml =================================================================== --- trunk/jmx/features/org.jboss.tools.jmx.feature/pom.xml 2010-06-29 16:51:18 UTC (rev 23091) +++ trunk/jmx/features/org.jboss.tools.jmx.feature/pom.xml 2010-06-29 16:57:48 UTC (rev 23092) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.jmx.features</groupId> <artifactId>org.jboss.tools.jmx.feature</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> Modified: trunk/jmx/features/org.jboss.tools.jmx.tests.feature/pom.xml =================================================================== --- trunk/jmx/features/org.jboss.tools.jmx.tests.feature/pom.xml 2010-06-29 16:51:18 UTC (rev 23091) +++ trunk/jmx/features/org.jboss.tools.jmx.tests.feature/pom.xml 2010-06-29 16:57:48 UTC (rev 23092) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.jmx.features</groupId> <artifactId>org.jboss.tools.jmx.tests.feature</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> Modified: trunk/jmx/features/pom.xml =================================================================== --- trunk/jmx/features/pom.xml 2010-06-29 16:51:18 UTC (rev 23091) +++ trunk/jmx/features/pom.xml 2010-06-29 16:57:48 UTC (rev 23092) @@ -1,15 +1,10 @@ <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> - <parent> - <relativePath>../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>jmx.features</artifactId> + <groupId>org.jboss.tools.jmx</groupId> + <artifactId>features</artifactId> <version>0.0.1-SNAPSHOT</version> + <name>jmx.features</name> <packaging>pom</packaging> <modules> <module>org.jboss.tools.jmx.feature</module> Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/pom.xml =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.core/pom.xml 2010-06-29 16:51:18 UTC (rev 23091) +++ trunk/jmx/plugins/org.jboss.tools.jmx.core/pom.xml 2010-06-29 16:57:48 UTC (rev 23092) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.jmx.plugins</groupId> <artifactId>org.jboss.tools.jmx.core</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/pom.xml =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/pom.xml 2010-06-29 16:51:18 UTC (rev 23091) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/pom.xml 2010-06-29 16:57:48 UTC (rev 23092) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.jmx.plugins</groupId> <artifactId>org.jboss.tools.jmx.ui</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/jmx/plugins/pom.xml =================================================================== --- trunk/jmx/plugins/pom.xml 2010-06-29 16:51:18 UTC (rev 23091) +++ trunk/jmx/plugins/pom.xml 2010-06-29 16:57:48 UTC (rev 23092) @@ -1,15 +1,10 @@ <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> - <parent> - <relativePath>../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>jmx.plugins</artifactId> + <groupId>org.jboss.tools.jmx</groupId> + <artifactId>plugins</artifactId> <version>0.0.1-SNAPSHOT</version> + <name>jmx.plugins</name> <packaging>pom</packaging> <modules> <module>org.jboss.tools.jmx.core</module> Modified: trunk/jmx/pom.xml =================================================================== --- trunk/jmx/pom.xml 2010-06-29 16:51:18 UTC (rev 23091) +++ trunk/jmx/pom.xml 2010-06-29 16:57:48 UTC (rev 23092) @@ -1,15 +1,10 @@ <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> - <parent> - <relativePath>../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> <groupId>org.jboss.tools</groupId> - <artifactId>jmx.all</artifactId> + <artifactId>jmx</artifactId> <version>0.0.1-SNAPSHOT</version> + <name>jmx.all</name> <packaging>pom</packaging> <modules> <module>features</module> Modified: trunk/jmx/site/pom.xml =================================================================== --- trunk/jmx/site/pom.xml 2010-06-29 16:51:18 UTC (rev 23091) +++ trunk/jmx/site/pom.xml 2010-06-29 16:57:48 UTC (rev 23092) @@ -6,8 +6,9 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>jmx.site</artifactId> + <groupId>org.jboss.tools.jmx</groupId> + <artifactId>site</artifactId> + <name>jmx.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> </project> Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml =================================================================== --- trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml 2010-06-29 16:51:18 UTC (rev 23091) +++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml 2010-06-29 16:57:48 UTC (rev 23092) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.jmx.tests</groupId> <artifactId>org.jboss.tools.jmx.core.test</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> Modified: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml =================================================================== --- trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml 2010-06-29 16:51:18 UTC (rev 23091) +++ trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml 2010-06-29 16:57:48 UTC (rev 23092) @@ -7,8 +7,12 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools</groupId> + <groupId>org.jboss.tools.jmx.tests</groupId> <artifactId>org.jboss.tools.jmx.ui.test</artifactId> <version>1.1.0-SNAPSHOT</version> <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> Modified: trunk/jmx/tests/pom.xml =================================================================== --- trunk/jmx/tests/pom.xml 2010-06-29 16:51:18 UTC (rev 23091) +++ trunk/jmx/tests/pom.xml 2010-06-29 16:57:48 UTC (rev 23092) @@ -1,14 +1,9 @@ <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> - <parent> - <relativePath>../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.tools</groupId> - <artifactId>jmx.tests</artifactId> + <groupId>org.jboss.tools.jmx</groupId> + <artifactId>tests</artifactId> + <name>jmx.tests</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> Modified: trunk/parent-pom.xml =================================================================== --- trunk/parent-pom.xml 2010-06-29 16:51:18 UTC (rev 23091) +++ trunk/parent-pom.xml 2010-06-29 16:57:48 UTC (rev 23092) @@ -475,7 +475,7 @@ </properties> <build> <plugins> - <plugin> + <!-- plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> @@ -495,7 +495,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin--> <plugin> <groupId>org.sonatype.tycho</groupId> @@ -538,6 +538,11 @@ <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> @@ -549,22 +554,27 @@ <configuration> <tasks> <taskdef resource="emma_ant.properties" /> - <echo>Process emma report...</echo> - <!--emma enabled="true"> - <instr metadatafile="${project.build.directory}/emma/coverage.em" mode="overwrite" instrpath="${project.build.directory}/../../../plugins/${emma.instrument.bundles}/target/classes" /> - </emma--> - <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" /> - <!-- Could also generate an HTML report, if you want... --> - </report> - </emma> - <loadfile property="emma.txt" - srcFile="${project.build.directory}/emma/coverage.txt" - failonerror="false" /> - <echo>${emma.txt}</echo> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> + <if> + <available file="${project.build.directory}/emma" type="dir" /> + <then> + <echo>Process emma report...</echo> + <!-- emma enabled="true"> + <instr metadatafile="${project.build.directory}/coverage.em" mode="overwrite" instrpath="${project.build.directory}/../../../plugins/${emma.instrument.bundles}/target/classes" /> + </emma--> + <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" /> + </report> + </emma> + <loadfile property="emma.txt" + srcFile="${project.build.directory}/emma/coverage.txt" + failonerror="false" /> + <echo>${emma.txt}</echo> + </then> + </if> </tasks> </configuration> </execution>