[jbosstools-commits] JBoss Tools SVN: r41508 - in trunk/build: emma and 2 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Tue May 29 05:32:53 EDT 2012 

Author: mickael_istria
Date: 2012-05-29 05:32:51 -0400 (Tue, 29 May 2012)
New Revision: 41508

Added:
   trunk/build/emma/
   trunk/build/emma/lib/
   trunk/build/emma/lib/org.eclemma.runtime.equinox-1.1.0.200908261008.jar
   trunk/build/emma/lib/pom.xml
   trunk/build/emma/reports/
   trunk/build/emma/reports/pom.xml
Removed:
   trunk/build/libs/
   trunk/build/reports/
Modified:
   trunk/build/pom.xml
Log:
JBIDE-11318 Factorized emma lib and reports in same folder

Copied: trunk/build/emma/lib/org.eclemma.runtime.equinox-1.1.0.200908261008.jar (from rev 41506, trunk/build/libs/org.eclemma.runtime.equinox-1.1.0.200908261008.jar)
===================================================================
(Binary files differ)


Property changes on: trunk/build/emma/lib/org.eclemma.runtime.equinox-1.1.0.200908261008.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Copied: trunk/build/emma/lib/pom.xml (from rev 41506, trunk/build/libs/pom.xml)
===================================================================
--- trunk/build/emma/lib/pom.xml	                        (rev 0)
+++ trunk/build/emma/lib/pom.xml	2012-05-29 09:32:51 UTC (rev 41508)
@@ -0,0 +1,44 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+<groupId>org.jboss.tools.build</groupId>
+<artifactId>org.jboss.tools.build.libs</artifactId>
+<version>1.0.0-SNAPSHOT</version>
+<packaging>pom</packaging>
+<profiles>
+	<profile>
+		<id>coverage</id>
+		<activation>
+			<property>
+				<name>coverage</name>
+			</property>
+		</activation>
+		<build>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-install-plugin</artifactId>
+					<version>2.3.1</version>
+					  <executions>
+					    <execution>
+					      <id>eclemma-install</id>
+					      <goals>
+						<goal>install-file</goal>
+					      </goals>
+					      <phase>package</phase>
+					      <configuration>
+						<file>org.eclemma.runtime.equinox-1.1.0.200908261008.jar</file>
+						<groupId>org.eclemma.runtime.equinox</groupId>
+						<artifactId>org.eclemma.runtime.equinox</artifactId>
+						<version>1.1.0.200908261008</version>
+						<packaging>jar</packaging>
+	   				      </configuration>
+					  </execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</build>
+	</profile>
+
+</profiles>
+</project>

Copied: trunk/build/emma/reports/pom.xml (from rev 41506, trunk/build/reports/emma-coverage/pom.xml)
===================================================================
--- trunk/build/emma/reports/pom.xml	                        (rev 0)
+++ trunk/build/emma/reports/pom.xml	2012-05-29 09:32:51 UTC (rev 41508)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.jboss.tools.build.reports</groupId>
+	<artifactId>emma-coverage</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<build>
+	<plugins>
+		<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-antrun-plugin</artifactId>
+			<version>1.3</version>
+			<dependencies>
+				<dependency>
+					<groupId>emma</groupId>
+					<artifactId>emma_ant</artifactId>
+					<version>2.0.5312</version>
+				</dependency>
+				<dependency>
+					<groupId>emma</groupId>
+					<artifactId>emma</artifactId>
+					<version>2.0.5312</version>
+				</dependency>
+				<dependency>
+					<groupId>ant-contrib</groupId>
+					<artifactId>ant-contrib</artifactId>
+					<version>1.0b3</version>
+				</dependency>
+			</dependencies>
+			<executions>
+				<execution>
+					<id>emma-report</id>
+					<phase>post-integration-test</phase>
+					<goals>
+						<goal>run</goal>
+					</goals>
+					<configuration>
+						<tasks>
+							<taskdef resource="emma_ant.properties" />
+							<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+							<move todir="${project.build.directory}/emma">
+								<fileset dir="${basedir}/../../..">
+									<include name="*/tests/*/target/emma/*.es" />
+									<include name="*/tests/*/target/emma/*.em" />
+								</fileset>
+							</move>
+							<if>
+								<and>
+									<not>
+										<isset property="maven.test.skip"/>
+									</not>
+									<available type="dir" file="${project.build.directory}/emma" />
+								</and>
+								<then>
+									<echo>Process emma report...</echo>
+									<emma enabled="true">
+										<report>
+											<infileset dir="${project.build.directory}/emma" includes="*/tests/*/target/emma/*.es,*/tests/*/target/emma/*.em" />
+											<txt outfile="${project.build.directory}/coverage.txt" />
+											<xml outfile="${project.build.directory}/coverage.xml" />
+											<html outfile="${project.build.directory}/coverage.html" />
+										</report>
+									</emma>
+									<loadfile property="emma.txt"
+										srcFile="${project.build.directory}/coverage.txt"
+										failonerror="false" />
+									<echo>${emma.txt}</echo>
+								</then>
+								<else>
+									<echo>No emma session files were found</echo>
+								</else>
+							</if>
+						</tasks>
+					</configuration>
+				</execution>
+			</executions>
+		</plugin>
+	</plugins>
+	</build>
+	
+</project>
+

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2012-05-29 08:37:47 UTC (rev 41507)
+++ trunk/build/pom.xml	2012-05-29 09:32:51 UTC (rev 41508)
@@ -18,7 +18,7 @@
 		<!-- for bootstrapping the parent and target-platform poms via Mead, we need to be able to fetch from this folder and run 
 			this profile (excluding all others); currently parent pom includes target-platform build too, so only need to build the parent
 			 
-			mvn clean install -P parent,\!libs,\!tests,\!jmx,\!archives,\!as,\!common,\!jst,\!xulrunner,\!vpe \
+			mvn clean install -P parent,\!emma/lib,\!tests,\!jmx,\!archives,\!as,\!common,\!jst,\!xulrunner,\!vpe \
 			-P \!jsf,\!freemarker,\!hibernatetools,\!portlet,\!struts,\!cdi,\!birt,\!seam,\!examples \
 			-P \!maven,\!ws,\!gwt,\!deltacloud,\!runtime,\!usage,\!central,\!aggregate-coverage
 			
@@ -34,7 +34,7 @@
 		</profile>
 
 		<profile>
-			<id>libs</id>
+			<id>emma/lib</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 				<property>
@@ -42,7 +42,7 @@
 				</property>
 			</activation>
 			<modules>
-				<module>libs</module>
+				<module>emma/lib</module>
 			</modules>
 		</profile>
 
@@ -362,9 +362,9 @@
 		<profile>
 			<id>cdi-tests</id>
 			<modules>
-				<module>libs</module>
+				<module>emma/lib</module>
 				<module>../cdi/tests</module>
-				<module>reports/emma-coverage</module>
+				<module>emma/reports</module>
 			</modules>
 		</profile>
 
@@ -656,7 +656,7 @@
 				</property>
 			</activation>
 			<modules>
-				<module>reports/emma-coverage</module>
+				<module>emma/reports</module>
 			</modules>
 		</profile>
 	</profiles>

More information about the jbosstools-commits mailing list