[jboss-svn-commits] JBL Code SVN: r36849 - in labs/jbosstm/trunk/XTS: WSAS and 3 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Mar 18 13:00:26 EDT 2011


Author: tomjenkinson
Date: 2011-03-18 13:00:25 -0400 (Fri, 18 Mar 2011)
New Revision: 36849

Added:
   labs/jbosstm/trunk/XTS/WSAS/pom.xml
Modified:
   labs/jbosstm/trunk/XTS/dist/pom.xml
   labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml
   labs/jbosstm/trunk/XTS/docs/pom.xml
   labs/jbosstm/trunk/XTS/pom.xml
Log:
JBTM-574 include files by name rather than by wildcard ready for merge to JTS dist

Added: labs/jbosstm/trunk/XTS/WSAS/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/pom.xml	                        (rev 0)
+++ labs/jbosstm/trunk/XTS/WSAS/pom.xml	2011-03-18 17:00:25 UTC (rev 36849)
@@ -0,0 +1,27 @@
+<?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-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wsas-all</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>wsas</module>
+        <module>xts-test-servlet</module>
+    </modules>
+</project>

Modified: labs/jbosstm/trunk/XTS/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/dist/pom.xml	2011-03-18 16:32:17 UTC (rev 36848)
+++ labs/jbosstm/trunk/XTS/dist/pom.xml	2011-03-18 17:00:25 UTC (rev 36849)
@@ -220,6 +220,10 @@
             <groupId>org.jboss.jbossts</groupId>
             <artifactId>localjunit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>xts-test-servlet</artifactId>
+        </dependency>
     </dependencies>
     <properties>
         <PRODUCT_NAME>xts</PRODUCT_NAME>

Modified: labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml	2011-03-18 16:32:17 UTC (rev 36848)
+++ labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml	2011-03-18 17:00:25 UTC (rev 36849)
@@ -28,7 +28,7 @@
 		</dependencySet>
 		<dependencySet>
 			<includes>
-				<include>*:javadoc</include>
+				<include>org.jboss.jbossts:jbossxts-api*javadoc*</include>
 			</includes>
 			<outputDirectory>docs/api</outputDirectory>
 			<useProjectAttachments>true</useProjectAttachments>
@@ -57,8 +57,26 @@
 		</dependencySet>
 		<dependencySet>
 			<includes>
-				<include>*:api</include>
+				<include>org.jboss.jbossts:xts-test-servlet</include>
 			</includes>
+			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+			<outputDirectory>tests</outputDirectory>
+			<unpack>false</unpack>
+			<useTransitiveDependencies>false</useTransitiveDependencies>
+			<useProjectArtifact>false</useProjectArtifact>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>org.jboss.jbossts:ws-t11*api</include>
+				<include>org.jboss.jbossts:wstx11*api</include>
+				<include>org.jboss.jbossts:ws-c*api</include>
+				<include>org.jboss.jbossts:bridge*api</include>
+				<include>org.jboss.jbossts:ws-t*api</include>
+				<include>org.jboss.jbossts:ws-c10*api</include>
+				<include>org.jboss.jbossts:wstx10*api</include>
+				<include>org.jboss.jbossts:wstx*api</include>
+				<include>org.jboss.jbossts:ws-t10*api</include>
+			</includes>
 			<outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
 			<outputDirectory>lib</outputDirectory>
 			<unpack>false</unpack>
@@ -66,13 +84,23 @@
 			<useProjectArtifact>false</useProjectArtifact>
 		</dependencySet>
 		<dependencySet>
-			<excludes>
-				<exclude>*:api</exclude>
-				<exclude>*:xts-guide:*</exclude>
-				<exclude>*:xts-demo:*</exclude>
-                <exclude>*:war:*</exclude>
-                <exclude>*localjunit*</exclude>
-			</excludes>
+            <includes>
+                <include>org.jboss.jbossts:wsas:jar</include>
+                <include>org.jboss.jbossts:ws-c:jar</include>
+                <include>org.jboss.jbossts:ws-c10:jar</include>
+                <include>org.jboss.jbossts:ws-c11:jar</include>
+                <include>org.jboss.jbossts:ws-t:jar</include>
+                <include>org.jboss.jbossts:ws-t10:jar</include>
+                <include>org.jboss.jbossts:ws-t11:jar</include>
+                <include>org.jboss.jbossts:wscf:jar</include>
+                <include>org.jboss.jbossts:wscf10:jar</include>
+                <include>org.jboss.jbossts:wscf11:jar</include>
+                <include>org.jboss.jbossts:wstx:jar</include>
+                <include>org.jboss.jbossts:wstx10:jar</include>
+                <include>org.jboss.jbossts:wstx11:jar</include>
+                <include>org.jboss.jbossts:recovery:jar</include>
+                <include>org.jboss.jbossts:jbossxts-api:jar</include>
+            </includes>
 			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
 			<outputDirectory>lib</outputDirectory>
 			<unpack>false</unpack>
@@ -81,7 +109,7 @@
 		</dependencySet>
 		<dependencySet>
 			<includes>
-				<include>*jbossxts-sar*:sar</include>
+				<include>org.jboss.jbossts:jbossxts-sar:sar:sar</include>
 			</includes>
 			<outputDirectory>sar</outputDirectory>
 			<outputFileNameMapping>jbossxts.${artifact.extension}
@@ -92,11 +120,12 @@
 		</dependencySet>
 		<dependencySet>
 			<includes>
-				<include>*:war</include>
+				<include>org.jboss.jbossts:ws-c10:war:war</include>
+				<include>org.jboss.jbossts:ws-c11:war:war</include>
+				<include>org.jboss.jbossts:ws-t10:war:war</include>
+				<include>org.jboss.jbossts:wscf10:war:war</include>
+				<include>org.jboss.jbossts:wstx10:war:war</include>
 			</includes>
-			<excludes>
-				<exclude>*ws-t11*war*</exclude>
-			</excludes>
 			<outputDirectory>webapps</outputDirectory>
 			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
 			</outputFileNameMapping>
@@ -106,7 +135,9 @@
 		</dependencySet>
 		<dependencySet>
 			<includes>
-				<include>*ws-t11*war*</include>
+				<include>org.jboss.jbossts:ws-t11:war:client</include>
+				<include>org.jboss.jbossts:ws-t11:war:coordinator</include>
+				<include>org.jboss.jbossts:ws-t11:war:participant</include>
 			</includes>
 			<outputDirectory>webapps</outputDirectory>
 			<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}

Modified: labs/jbosstm/trunk/XTS/docs/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/docs/pom.xml	2011-03-18 16:32:17 UTC (rev 36848)
+++ labs/jbosstm/trunk/XTS/docs/pom.xml	2011-03-18 17:00:25 UTC (rev 36849)
@@ -21,7 +21,6 @@
     <groupId>org.jboss.jbossts</groupId>
     <artifactId>xts-docs</artifactId>
     <packaging>pom</packaging>
-    <name>XTS Documentation</name>
     <modules>
         <module>Transactions_XTS_Administration_And_Development_Guide</module>
     </modules>

Modified: labs/jbosstm/trunk/XTS/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/pom.xml	2011-03-18 16:32:17 UTC (rev 36848)
+++ labs/jbosstm/trunk/XTS/pom.xml	2011-03-18 17:00:25 UTC (rev 36849)
@@ -20,7 +20,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>xts-all</artifactId>
     <packaging>pom</packaging>
-    <name>JBossJTS everything</name>
     <modules>
         <module>WSAS</module>
         <module>WS-C</module>



More information about the jboss-svn-commits mailing list