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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Feb 23 06:25:31 EST 2011


Author: tomjenkinson
Date: 2011-02-23 06:25:30 -0500 (Wed, 23 Feb 2011)
New Revision: 36662

Added:
   labs/jbosstm/trunk/ArjunaJTS/jbossjts/
   labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/tsmx-sar/
Removed:
   labs/jbosstm/trunk/ArjunaJTA/tsmx-sar/
Modified:
   labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/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/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/tsmx-sar/pom.xml
Log:
JBTM-574 the sar is only released in the full build

Modified: labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml	2011-02-22 17:26:39 UTC (rev 36661)
+++ labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml	2011-02-23 11:25:30 UTC (rev 36662)
@@ -23,7 +23,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>jbossjta-dist</artifactId>
+	<artifactId>jbossts-jta</artifactId>
 	<packaging>pom</packaging>
 	<name>JBossJTA distribution</name>
 

Modified: labs/jbosstm/trunk/ArjunaJTA/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/pom.xml	2011-02-22 17:26:39 UTC (rev 36661)
+++ labs/jbosstm/trunk/ArjunaJTA/pom.xml	2011-02-23 11:25:30 UTC (rev 36662)
@@ -53,7 +53,6 @@
 		<module>jta</module>
 		<module>jdbc</module>
 		<module>tsmx</module>
-		<module>tsmx-sar</module>
 		<module>jbossjta</module>
 		<module>docs</module>
 		<module>integration</module>

Modified: labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml	2011-02-22 17:26:39 UTC (rev 36661)
+++ labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml	2011-02-23 11:25:30 UTC (rev 36662)
@@ -27,28 +27,35 @@
 
 	<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.jbossts</groupId>
+			<artifactId>jts</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>jtax</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>orbportability</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>org.jboss.integration</groupId>
 			<artifactId>jboss-integration</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>jacorb</groupId>
+			<artifactId>jacorb</artifactId>
+			<version>2.3.1jboss.patch01-brew</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 </project>

Added: labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml	                        (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml	2011-02-23 11:25:30 UTC (rev 36662)
@@ -0,0 +1,179 @@
+<?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</artifactId>
+	<name>JBossJTS packaged module</name>
+	<packaging>jar</packaging>
+
+
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<excludePackageNames>*.internal.*</excludePackageNames>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>add-source</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>../../common/classes</source>
+								<source>../../ArjunaCore/arjuna/classes</source>
+								<source>../../ArjunaCore/txoj/classes</source>
+								<source>../../ArjunaCore/tsmx/classes</source>
+								<source>../../ArjunaCore/tsmx/bin</source>
+								<source>../../ArjunaJTA/jta/classes</source>
+								<source>../../ArjunaJTA/jdbc/classes</source>
+								<source>../orbportability/classes</source>
+								<source>../jts/classes</source>
+								<source>../jtax/bin</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>**/*.*</exclude>
+					</excludes>
+				</configuration>
+				<executions>
+					<execution>
+						<id>comp</id>
+						<phase>compile</phase>
+						<goals></goals>
+						<configuration>
+							<excludes>
+								<exclude>**/*.*</exclude>
+							</excludes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>1.4</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<artifactSet>
+								<includes>
+									<include>org.jboss.jbossts:common</include>
+									<include>org.jboss.jbossts:arjuna</include>
+									<include>org.jboss.jbossts:tsmx-tools</include>
+									<include>org.jboss.jbossts:tsmx-jmxbrowser</include>
+									<include>org.jboss.jbossts:osbv-defaults</include>
+									<include>org.jboss.jbossts:tsmx-perfgraph</include>
+									<include>org.jboss.jbossts:txoj</include>
+									<include>org.jboss.jbossts:jta</include>
+									<include>org.jboss.jbossts:jdbc</include>
+									<include>org.jboss.jbossts:orbportability</include>
+									<include>org.jboss.jbossts:jts</include>
+									<include>org.jboss.jbossts:jtax</include>
+								</includes>
+							</artifactSet>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>arjuna</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>tsmx-tools</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>tsmx-jmxbrowser</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>osbv-defaults</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>tsmx-perfgraph</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>txoj</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>jta</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>orbportability</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>jts</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossts</groupId>
+			<artifactId>jtax</artifactId>
+		</dependency>
+	</dependencies>
+
+</project>

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml	2011-02-22 17:26:39 UTC (rev 36661)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml	2011-02-23 11:25:30 UTC (rev 36662)
@@ -42,7 +42,7 @@
 				<executions>
 					<execution>
 						<goals>
-							<goal>generate</goal>
+							<goal>generate-test</goal>
 						</goals>
 					</execution>
 				</executions>

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml	2011-02-22 17:26:39 UTC (rev 36661)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml	2011-02-23 11:25:30 UTC (rev 36662)
@@ -84,7 +84,7 @@
 						<id>generate-test-sources</id>
 						<phase>generate-test-sources</phase>
 						<goals>
-							<goal>generate</goal>
+							<goal>generate-test</goal>
 						</goals>
 						<configuration>
 							<compiler>jacorb</compiler>

Modified: labs/jbosstm/trunk/ArjunaJTS/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/pom.xml	2011-02-22 17:26:39 UTC (rev 36661)
+++ labs/jbosstm/trunk/ArjunaJTS/pom.xml	2011-02-23 11:25:30 UTC (rev 36662)
@@ -50,12 +50,14 @@
 		<module>../ArjunaCore/arjuna</module>
 		<module>../ArjunaCore/txoj</module>
 		<module>../ArjunaCore/tsmx</module>
+		<module>../ArjunaCore/arjuna/services</module>
 		<module>../ArjunaJTA/jta</module>
 		<module>../ArjunaJTA/jdbc</module>
 		<module>orbportability</module>
 		<module>jts</module>
 		<module>jtax</module>
 		<module>tsmx</module>
+		<module>tsmx-sar</module>
 		<module>jbossjts</module>
 		<module>integration</module>
 		<module>trailmap</module>

Modified: labs/jbosstm/trunk/ArjunaJTS/tsmx-sar/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx-sar/pom.xml	2011-02-22 16:33:31 UTC (rev 36656)
+++ labs/jbosstm/trunk/ArjunaJTS/tsmx-sar/pom.xml	2011-02-23 11:25:30 UTC (rev 36662)
@@ -21,7 +21,7 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>tsmx-jta-sar</artifactId>
+	<artifactId>tsmx-tools-sar</artifactId>
 	<name>ArjunaJTA tsmx-tools sar</name>
 	<packaging>jar</packaging>
 



More information about the jboss-svn-commits mailing list