[jboss-svn-commits] JBL Code SVN: r36695 - in labs/jbosstm/trunk: ArjunaCore/txoj and 12 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 24 10:24:58 EST 2011
Author: tomjenkinson
Date: 2011-02-24 10:24:57 -0500 (Thu, 24 Feb 2011)
New Revision: 36695
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml
labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml
labs/jbosstm/trunk/ArjunaJTA/jdbc/pom.xml
labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml
labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml
labs/jbosstm/trunk/ArjunaJTS/docs/pom.xml
labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml
labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml
labs/jbosstm/trunk/ArjunaJTS/pom.xml
labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml
labs/jbosstm/trunk/common/pom.xml
labs/jbosstm/trunk/narayana-build-common/pom.xml
Log:
JBTM-574 updated to move the common test configuration into the parent module
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -70,14 +70,7 @@
<additionalClasspathElements>
<additionalClasspathElement>${env.JAVA_HOME}/lib/tools.jar</additionalClasspathElement>
</additionalClasspathElements>
- <workingDirectory>${basedir}/target/test-classes</workingDirectory>
- <runOrder>alphabetical</runOrder>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <forkMode>pertest</forkMode>
<useManifestOnlyJar>false</useManifestOnlyJar>
- <includes>
- <include>**/*.java</include>
- </includes>
<excludes>
<!-- Dont run the common tests -->
<exclude>com/arjuna/common/tests/**</exclude>
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -63,13 +63,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7</version>
<configuration>
- <workingDirectory>${basedir}/target</workingDirectory>
- <runOrder>alphabetical</runOrder>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <forkMode>pertest</forkMode>
- <includes>
- <include>**/*.java</include>
- </includes>
<excludes>
<!-- Were refactored to true classes as used in multiple places -->
<exclude>**/AbortObject.java</exclude>
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -50,14 +50,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7</version>
<configuration>
-
- <workingDirectory>${basedir}/target/test-classes</workingDirectory>
- <runOrder>alphabetical</runOrder>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <forkMode>pertest</forkMode>
- <includes>
- <include>**/*.java</include>
- </includes>
<excludes>
<exclude>**/utils/plugins/**</exclude>
<exclude>**/DBPlugin.java</exclude>
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -70,14 +70,7 @@
<additionalClasspathElements>
<additionalClasspathElement>${env.JAVA_HOME}/lib/tools.jar</additionalClasspathElement>
</additionalClasspathElements>
- <workingDirectory>${basedir}/target/test-classes</workingDirectory>
- <runOrder>alphabetical</runOrder>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <forkMode>pertest</forkMode>
<useManifestOnlyJar>false</useManifestOnlyJar>
- <includes>
- <include>**/*.java</include>
- </includes>
<excludes>
<!-- exclude tests which were run above using byteman scripts -->
<exclude>**/recovery/CrashRecovery.java</exclude>
Modified: labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -25,7 +25,7 @@
<groupId>org.jboss.jbossts</groupId>
<artifactId>jbossts-full</artifactId>
<packaging>pom</packaging>
- <name>JBossJTA distribution</name>
+ <name>JBossJTS distribution</name>
<build>
<plugins>
Modified: labs/jbosstm/trunk/ArjunaJTS/docs/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/docs/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/ArjunaJTS/docs/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -25,7 +25,7 @@
<groupId>org.jboss.jbossts</groupId>
<artifactId>jbossjts-docs</artifactId>
<packaging>pom</packaging>
- <name>JBossTS Documentation</name>
+ <name>JBossJTS Documentation</name>
<modules>
<module>ArjunaJTS_Development_Guide</module>
Modified: labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jbossjts-integration</artifactId>
- <name>JBossJTA ATX module</name>
+ <name>JBossJTS ATX module</name>
<packaging>jar</packaging>
<build>
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jtax</artifactId>
- <name>JTAX</name>
+ <name>JBossJTS jtax module</name>
<packaging>jar</packaging>
<build>
@@ -92,13 +92,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7</version>
<configuration>
- <workingDirectory>${basedir}/target/test-classes</workingDirectory>
- <runOrder>alphabetical</runOrder>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <forkMode>pertest</forkMode>
- <includes>
- <include>**/*.java</include>
- </includes>
<excludes>
<exclude>**/common/**</exclude>
<exclude>**/ExampleXAResource.java</exclude>
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -134,13 +134,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7</version>
<configuration>
- <workingDirectory>${basedir}/target/test-classes</workingDirectory>
- <runOrder>alphabetical</runOrder>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <forkMode>pertest</forkMode>
- <includes>
- <include>**/*.java</include>
- </includes>
<excludes>
<!-- exclude tests which we don't want to run -->
<exclude>**/common/**</exclude>
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>orbportability</artifactId>
- <name>ORB portability</name>
+ <name>JBossJTS orb portability</name>
<packaging>jar</packaging>
<build>
@@ -103,13 +103,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7</version>
<configuration>
- <workingDirectory>${basedir}/target/test-classes</workingDirectory>
- <runOrder>alphabetical</runOrder>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <forkMode>pertest</forkMode>
- <includes>
- <include>**/*.java</include>
- </includes>
<excludes>
<!-- exclude tests which we don't want to run -->
<exclude>**/common/**</exclude>
Modified: labs/jbosstm/trunk/ArjunaJTS/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/ArjunaJTS/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -20,7 +20,7 @@
<artifactId>jbossjts-all</artifactId>
<version>4.15.0.M1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBossJTA everything</name>
+ <name>JBossJTS everything</name>
<build>
<plugins>
Modified: labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -25,7 +25,7 @@
<groupId>org.jboss.jbossts</groupId>
<artifactId>trailmap</artifactId>
<packaging>pom</packaging>
- <name>Trailmap</name>
+ <name>JBossJTS Trailmap documentation</name>
<build>
<plugins>
Modified: labs/jbosstm/trunk/common/pom.xml
===================================================================
--- labs/jbosstm/trunk/common/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/common/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -45,6 +45,17 @@
</archive>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <excludes>
+ <exclude>**/DummyProperties.java</exclude>
+ <exclude>**/DummyEnvironmentBean.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: labs/jbosstm/trunk/narayana-build-common/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-build-common/pom.xml 2011-02-24 15:23:56 UTC (rev 36694)
+++ labs/jbosstm/trunk/narayana-build-common/pom.xml 2011-02-24 15:24:57 UTC (rev 36695)
@@ -168,6 +168,34 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>emma-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <inherited>true</inherited>
+ <configuration>
+ <metadataFile>${project.build.directory}/test-classes/coverage.em</metadataFile>
+ <metrics>method:70,block:70,line:80,class:100</metrics>
+ <dataFiles>
+ <dataFile>${project.build.directory}/test-classes/coverage.em</dataFile>
+ <dataFile>${project.build.directory}/test-classes/coverage.ec</dataFile>
+ </dataFiles>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <workingDirectory>target/test-classes</workingDirectory>
+ <runOrder>alphabetical</runOrder>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <inherited>true</inherited>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
</plugins>
</build>
More information about the jboss-svn-commits
mailing list