[jboss-svn-commits] JBL Code SVN: r36645 - in labs/jbosstm/trunk: ArjunaJTA and 7 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Feb 21 17:14:45 EST 2011


Author: tomjenkinson
Date: 2011-02-21 17:14:45 -0500 (Mon, 21 Feb 2011)
New Revision: 36645

Added:
   labs/jbosstm/trunk/ArjunaJTA/integration/
   labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/integration/
   labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
Modified:
   labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/jbossjta/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/pom.xml
   labs/jbosstm/trunk/common/pom.xml
   labs/jbosstm/trunk/narayana-build-common/pom.xml
Log:
JBTM-574 updated to build the integration module

Modified: labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml	2011-02-21 16:42:35 UTC (rev 36644)
+++ labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml	2011-02-21 22:14:45 UTC (rev 36645)
@@ -45,19 +45,6 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestEntries>
-							<arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
-							<arjuna-builder>JBoss Inc. [${user.name}] ${os.name}
-								${os.version} ${buildproperty.date}</arjuna-builder>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
 				<executions>

Modified: labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml	2011-02-21 16:42:35 UTC (rev 36644)
+++ labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml	2011-02-21 22:14:45 UTC (rev 36645)
@@ -25,7 +25,7 @@
 	<groupId>org.jboss.jbossts</groupId>
 	<artifactId>jbossjta-dist</artifactId>
 	<packaging>pom</packaging>
-	<name>JBossJTA</name>
+	<name>JBossJTA distribution</name>
 
 	<build>
 		<plugins>


Property changes on: labs/jbosstm/trunk/ArjunaJTA/integration
___________________________________________________________________
Added: svn:ignore
   + target
build
.project
.classpath
.settings


Added: labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml	                        (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml	2011-02-21 22:14:45 UTC (rev 36645)
@@ -0,0 +1,54 @@
+<?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. -->
+<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>
+	<artifactId>jbossjta-integration</artifactId>
+	<name>JBossJTA ATX module</name>
+	<packaging>jar</packaging>
+
+	<build>
+		<sourceDirectory>../../atsintegration</sourceDirectory>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>**/jts/**</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>jta</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.integration</groupId>
+			<artifactId>jboss-integration</artifactId>
+		</dependency>
+	</dependencies>
+
+</project>

Modified: labs/jbosstm/trunk/ArjunaJTA/jbossjta/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jbossjta/pom.xml	2011-02-21 16:42:35 UTC (rev 36644)
+++ labs/jbosstm/trunk/ArjunaJTA/jbossjta/pom.xml	2011-02-21 22:14:45 UTC (rev 36645)
@@ -45,19 +45,6 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestEntries>
-							<arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
-							<arjuna-builder>JBoss Inc. [${user.name}] ${os.name}
-								${os.version} ${buildproperty.date}</arjuna-builder>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
 				<executions>

Modified: labs/jbosstm/trunk/ArjunaJTA/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/pom.xml	2011-02-21 16:42:35 UTC (rev 36644)
+++ labs/jbosstm/trunk/ArjunaJTA/pom.xml	2011-02-21 22:14:45 UTC (rev 36645)
@@ -25,7 +25,7 @@
 	<groupId>org.jboss.jbossts</groupId>
 	<artifactId>jbossjta-all</artifactId>
 	<packaging>pom</packaging>
-	<name>JBossJTA</name>
+	<name>JBossJTA everything</name>
 
 	<build>
 		<plugins>
@@ -55,6 +55,7 @@
 		<module>tsmx</module>
 		<module>jbossjta</module>
 		<module>docs</module>
+		<module>integration</module>
 		<module>dist</module>
 	</modules>
 </project>


Property changes on: labs/jbosstm/trunk/ArjunaJTS/integration
___________________________________________________________________
Added: svn:ignore
   + target
build
.project
.classpath
.settings


Added: labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml	                        (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml	2011-02-21 22:14:45 UTC (rev 36645)
@@ -0,0 +1,54 @@
+<?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. -->
+<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>
+	<artifactId>jbossjts-integration</artifactId>
+	<name>JBossJTA ATX module</name>
+	<packaging>jar</packaging>
+
+	<build>
+		<sourceDirectory>../../atsintegration</sourceDirectory>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>**/jts/**</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>jta</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.integration</groupId>
+			<artifactId>jboss-integration</artifactId>
+		</dependency>
+	</dependencies>
+
+</project>

Modified: labs/jbosstm/trunk/common/pom.xml
===================================================================
--- labs/jbosstm/trunk/common/pom.xml	2011-02-21 16:42:35 UTC (rev 36644)
+++ labs/jbosstm/trunk/common/pom.xml	2011-02-21 22:14:45 UTC (rev 36645)
@@ -28,38 +28,6 @@
 	<build>
 		<sourceDirectory>classes</sourceDirectory>
 		<testSourceDirectory>tests</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0-beta-4</version>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>create</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<doCheck>true</doCheck>
-					<doUpdate>true</doUpdate>
-					<scmBranchPropertyName>buildScmBranch</scmBranchPropertyName>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-						<manifestEntries>
-							<arjuna-scm-revision>${buildScmBranch} (revision: ${buildNumber})</arjuna-scm-revision>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-		</plugins>
 	</build>
 	<dependencies>
 		<!-- START TEST -->

Modified: labs/jbosstm/trunk/narayana-build-common/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-build-common/pom.xml	2011-02-21 16:42:35 UTC (rev 36644)
+++ labs/jbosstm/trunk/narayana-build-common/pom.xml	2011-02-21 22:14:45 UTC (rev 36645)
@@ -168,11 +168,40 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
+				<version>1.0-beta-4</version>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<doCheck>true</doCheck>
+					<doUpdate>false</doUpdate>
+					<scmBranchPropertyName>buildScmBranch</scmBranchPropertyName>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<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>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
-
-
 	<dependencyManagement>
 		<dependencies>
 			<dependency>



More information about the jboss-svn-commits mailing list