[jboss-svn-commits] JBL Code SVN: r36661 - in labs/jbosstm/trunk: ArjunaJTS/jtax and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 22 12:26:40 EST 2011
Author: tomjenkinson
Date: 2011-02-22 12:26:39 -0500 (Tue, 22 Feb 2011)
New Revision: 36661
Added:
labs/jbosstm/trunk/ArjunaJTS/jtax/src/
Modified:
labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml
labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
labs/jbosstm/trunk/narayana-build-common/pom.xml
Log:
JBTM-574 updated to run the jtax as part of the build
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml 2011-02-22 16:59:35 UTC (rev 36660)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml 2011-02-22 17:26:39 UTC (rev 36661)
@@ -93,19 +93,6 @@
</plugins>
</build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <!-- https://repository.jboss.org/nexus/service/local/repositories/releases/content/org/jboss/jbossas/jboss-as-component-matrix/ -->
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-component-matrix</artifactId>
- <version>6.0.0.20101110-CR1</version>
- <!--<version>6.0.0-SNAPSHOT</version> -->
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml 2011-02-22 16:59:35 UTC (rev 36660)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml 2011-02-22 17:26:39 UTC (rev 36661)
@@ -1,53 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- JBoss, Home of Professional Open Source Copyright 2008, Red Hat
- Middleware LLC, and others contributors as indicated by the @authors
- tag. All rights reserved. See the copyright.txt in the distribution
- for a full listing of individual contributors. This copyrighted
- material is made available to anyone wishing to use, modify, copy, or
- redistribute it subject to the terms and conditions of the GNU Lesser
- General Public License, v. 2.1. This program is distributed in the
- hope that it will be useful, but WITHOUT A WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the GNU Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License, v.2.1 along with this distribution; if not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.
- -->
+<!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
+ LLC, and others contributors as indicated by the @authors tag. All rights
+ reserved. See the copyright.txt in the distribution for a full listing of
+ individual contributors. This copyrighted material is made available to anyone
+ wishing to use, modify, copy, or redistribute it subject to the terms and
+ conditions of the GNU Lesser General Public License, v. 2.1. This program
+ is distributed in the hope that it will be useful, but WITHOUT A WARRANTY;
+ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU Lesser General Public License for more details. You
+ should have received a copy of the GNU Lesser General Public License, v.2.1
+ along with this distribution; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
<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/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>narayana-build-common</artifactId>
+ <version>5.0.0.M1-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.narayana</groupId>
<artifactId>jtax</artifactId>
<name>JTAX</name>
- <version>5.0.0.M1-SNAPSHOT</version>
<packaging>jar</packaging>
- <developers>
- <developer>
- <id>tomjenkinson</id>
- <name>Thomas Jenkinson</name>
- <email>tom.jenkinson at redhat.com</email>
- <organization>JBoss</organization>
- <organizationUrl>http://www.jboss.org/</organizationUrl>
- <roles>
- <role>Project Lead</role>
- </roles>
- <timezone>0</timezone>
- </developer>
- </developers>
-
- <licenses>
- <license>
- <name>LGPL 2.1</name>
- <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
- </license>
- </licenses>
-
<build>
+ <sourceDirectory>classes</sourceDirectory>
+ <testSourceDirectory>tests/classes</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -71,12 +51,12 @@
<sourceDirectory>tests/idl/</sourceDirectory>
<sources>
<source>
- <includes>
+ <includes>
<include>test.idl</include>
</includes>
<additionalArguments>
<additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
- <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
+ <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
</additionalArguments>
</source>
</sources>
@@ -87,14 +67,84 @@
</includeDirs>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
+ <source>${basedir}/../../ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/subordinate</source>
+ <source>${basedir}/../../ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/common</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <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>
+ <exclude>**/JTSTestCase.java</exclude>
+ <exclude>**/LastOnePhaseResource.java</exclude>
+
+ <exclude>**/implicit/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
<dependency>
- <groupId>org.jboss.narayana</groupId>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>jta</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
<artifactId>jts</artifactId>
- <version>5.0.0.M1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.resource</groupId>
+ <artifactId>jboss-connector-api_1.5_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jacorb</groupId>
+ <artifactId>jacorb</artifactId>
+ <version>2.3.1jboss.patch01-brew</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.slf4j</groupId>
+ <artifactId>slf4j-jboss-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/narayana-build-common/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-build-common/pom.xml 2011-02-22 16:59:35 UTC (rev 36660)
+++ labs/jbosstm/trunk/narayana-build-common/pom.xml 2011-02-22 17:26:39 UTC (rev 36661)
@@ -194,7 +194,8 @@
<manifestEntries>
<arjuna-scm-revision>${buildScmBranch} (revision: ${buildNumber})</arjuna-scm-revision>
<arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
- <arjuna-builder>JBoss Inc. [${user.name}] ${os.name} ${os.version} ${buildproperty.date}</arjuna-builder>
+ <arjuna-builder>JBoss Inc. [${user.name}] ${os.name}
+ ${os.version} ${buildproperty.date}</arjuna-builder>
</manifestEntries>
</archive>
</configuration>
@@ -205,6 +206,15 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <!-- https://repository.jboss.org/nexus/service/local/repositories/releases/content/org/jboss/jbossas/jboss-as-component-matrix/ -->
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-component-matrix</artifactId>
+ <version>6.0.0.20101110-CR1</version>
+ <!--<version>6.0.0-SNAPSHOT</version> -->
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossts</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
More information about the jboss-svn-commits
mailing list