4:04 a.m.
Author: mgencur(a)redhat.com
Date: 2010-08-10 05:04:12 -0400 (Tue, 10 Aug 2010)
New Revision: 13589
Removed:
modules/jms/trunk/impl/src/test/resources-jbossas/arquillian.xml
Modified:
modules/jms/trunk/impl/pom.xml
modules/jms/trunk/pom.xml
Log:
reverting changes to code-coverage profile - didn't run in hudson for some strange
reason, will look at it later
Modified: modules/jms/trunk/impl/pom.xml
===================================================================
--- modules/jms/trunk/impl/pom.xml 2010-08-10 08:51:38 UTC (rev 13588)
+++ modules/jms/trunk/impl/pom.xml 2010-08-10 09:04:12 UTC (rev 13589)
@@ -76,6 +76,10 @@
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
Deleted: modules/jms/trunk/impl/src/test/resources-jbossas/arquillian.xml
===================================================================
--- modules/jms/trunk/impl/src/test/resources-jbossas/arquillian.xml 2010-08-10 08:51:38
UTC (rev 13588)
+++ modules/jms/trunk/impl/src/test/resources-jbossas/arquillian.xml 2010-08-10 09:04:12
UTC (rev 13589)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<arquillian xmlns="http://jboss.com/arquillian"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:jboss="urn:arq:org.jboss.arquillian.container.jbossas.managed_6">
-
- <engine>
- <maxDeploymentsBeforeRestart>20</maxDeploymentsBeforeRestart>
- </engine>
-
- <jboss:container>
-<!-- <jboss:jbossHome>/home/aslak/dev/servers/jboss-6.0.0.M3/</jboss:jbossHome>
--> <!-- default %JBOSS_HOME% -->
-<!-- <jboss:javaHome>/usr/lib/jvm/java-6-openjdk</jboss:javaHome> -->
<!-- default %JAVA_HOME% -->
- <!-- Increase the permgen space by default, heap space is default -->
- <jboss:javaVmArguments>-Xmx512m
-XX:MaxPermSize=256m</jboss:javaVmArguments>
- </jboss:container>
-
-</arquillian>
Modified: modules/jms/trunk/pom.xml
===================================================================
--- modules/jms/trunk/pom.xml 2010-08-10 08:51:38 UTC (rev 13588)
+++ modules/jms/trunk/pom.xml 2010-08-10 09:04:12 UTC (rev 13589)
@@ -78,7 +78,48 @@
<build>
<pluginManagement>
<plugins>
+
+ <!-- Specify this locally. Arquillian will support this properly
soon -->
<plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <id>start-container</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-container</id>
+ <phase>test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <wait>false</wait>
+ <container>
+ <containerId>jboss6x</containerId>
+ <home>${env.JBOSS_HOME}</home>
+ <timeout>300000</timeout> <!-- 5 minutes
-->
+ </container>
+ <configuration>
+ <type>existing</type>
+ <home>${env.JBOSS_HOME}/server/default</home>
+ <properties>
+
<cargo.jboss.configuration>default</cargo.jboss.configuration>
+ <cargo.rmi.port>1090</cargo.rmi.port>
+ </properties>
+ </configuration>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -90,7 +131,8 @@
</goals>
<configuration>
<tasks>
- <echo message="Deploying emma jar to server lib
directory" />
+ <echo
+ message="Deploying emma jar to server lib
directory" />
<copy file="${emma.jar.file}"
todir="${env.JBOSS_HOME}/server/default/lib"
overwrite="true" />
@@ -105,7 +147,15 @@
</goals>
<configuration>
<tasks>
- <move
file="${env.JBOSS_HOME}/bin/coverage.ec"
+ <echo
+ message="Moving coverage.ec file to current
modele from parent module" />
+ <property name="coverage.file"
+ value="${basedir}/../coverage.ec" />
+ <waitfor maxwait="30"
+ maxwaitunit="second">
+ <available file="${coverage.file}"
/>
+ </waitfor>
+ <move file="${coverage.file}"
todir="${basedir}"
failonerror="false" />
<delete file="${basedir}/transaction.log"
failonerror="false" />
@@ -114,6 +164,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
</pluginManagement>
</build>