[jboss-svn-commits] JBL Code SVN: r37334 - in labs/jbosstm/trunk: ArjunaCore and 15 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 2 16:43:09 EDT 2011
Author: tomjenkinson
Date: 2011-08-02 16:43:08 -0400 (Tue, 02 Aug 2011)
New Revision: 37334
Added:
labs/jbosstm/trunk/XTS/sar/resources/
labs/jbosstm/trunk/dist/
labs/jbosstm/trunk/dist/src/main/assembly/xts.xml
Removed:
labs/jbosstm/trunk/ArjunaCore/dist/
labs/jbosstm/trunk/ArjunaJTA/dist/
labs/jbosstm/trunk/ArjunaJTS/dist/
labs/jbosstm/trunk/XTS/dist/
labs/jbosstm/trunk/XTS/jbossxts/src/main/
Modified:
labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
labs/jbosstm/trunk/ArjunaCore/pom.xml
labs/jbosstm/trunk/ArjunaJTA/pom.xml
labs/jbosstm/trunk/ArjunaJTS/pom.xml
labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml
labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml
labs/jbosstm/trunk/XTS/WS-T/ws-t/pom.xml
labs/jbosstm/trunk/XTS/WSAS/wsas/pom.xml
labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet/pom.xml
labs/jbosstm/trunk/XTS/WSCF/wscf/pom.xml
labs/jbosstm/trunk/XTS/jbossxts/pom.xml
labs/jbosstm/trunk/XTS/pom.xml
labs/jbosstm/trunk/XTS/sar/pom.xml
labs/jbosstm/trunk/build-release-pkgs.xml
labs/jbosstm/trunk/dist/pom.xml
labs/jbosstm/trunk/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/pom.xml
Log:
updated to make sure that XTS jbossxts jar has the correct dependencies
Modified: labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -26,6 +26,14 @@
<build>
<plugins>
<plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.0-beta-4</version>
Modified: labs/jbosstm/trunk/ArjunaCore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/ArjunaCore/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -42,6 +42,5 @@
<module>txoj</module>
<module>arjunacore</module>
<module>docs</module>
- <module>dist</module>
</modules>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTA/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/ArjunaJTA/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -42,6 +42,5 @@
<module>narayana-jta</module>
<module>docs</module>
<module>integration</module>
- <module>dist</module>
</modules>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTS/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/ArjunaJTS/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -45,6 +45,5 @@
<module>trailmap</module>
<module>docs</module>
<module>../rhq-plugin</module>
- <module>dist</module>
</modules>
</project>
Modified: labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -67,8 +67,8 @@
</build>
<dependencies>
<dependency>
- <groupId>org.jboss.narayana</groupId>
- <artifactId>common</artifactId>
+ <groupId>org.jboss.narayana.arjunacore</groupId>
+ <artifactId>arjunacore</artifactId>
</dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -48,8 +48,8 @@
</build>
<dependencies>
<dependency>
- <groupId>org.jboss.narayana</groupId>
- <artifactId>common</artifactId>
+ <groupId>org.jboss.narayana.arjunacore</groupId>
+ <artifactId>arjunacore</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
Modified: labs/jbosstm/trunk/XTS/WS-T/ws-t/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/ws-t/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/XTS/WS-T/ws-t/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -120,7 +120,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.narayana.arjunacore</groupId>
- <artifactId>arjuna</artifactId>
+ <artifactId>arjunacore</artifactId>
</dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/WSAS/wsas/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/wsas/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/XTS/WSAS/wsas/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.narayana.arjunacore</groupId>
- <artifactId>arjuna</artifactId>
+ <artifactId>arjunacore</artifactId>
</dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.jboss.narayana.arjunacore</groupId>
- <artifactId>arjuna</artifactId>
+ <artifactId>arjunacore</artifactId>
</dependency>
<!-- XTS: -->
<dependency>
Modified: labs/jbosstm/trunk/XTS/WSCF/wscf/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/wscf/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/XTS/WSCF/wscf/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.jboss.narayana.arjunacore</groupId>
- <artifactId>arjuna</artifactId>
+ <artifactId>arjunacore</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
Modified: labs/jbosstm/trunk/XTS/jbossxts/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/jbossxts/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/XTS/jbossxts/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -64,6 +64,7 @@
</archive>
</configuration>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -107,6 +108,7 @@
</execution>
</executions>
</plugin>
+ -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -121,43 +123,44 @@
<version>1.4</version>
<executions>
<execution>
- <id>mainjar</id>
+ <id>apijar</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
+ <shadedClassifierName>api</shadedClassifierName>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
<createDependencyReducedPom>true</createDependencyReducedPom>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet>
<includes>
- <include>org.jboss.narayana.xts</include>
+ <include>org.jboss.narayana.xts:ws-c:jar:api:${project.version}</include>
+ <include>org.jboss.narayana.xts:ws-t:jar:api:${project.version}</include>
+ <include>org.jboss.narayana.xts:wstx:jar:api:${project.version}</include>
+ <include>org.jboss.narayana.xts:wstx11:jar:api:${project.version}</include>
+ <include>org.jboss.narayana.xts:bridge:jar:api:${project.version}</include>
</includes>
- <excludes>
- <exclude>org.jboss.narayana.xts:*:api</exclude>
- </excludes>
</artifactSet>
</configuration>
</execution>
+
<execution>
- <id>apijar</id>
+ <id>mainjar</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
- <shadedClassifierName>api</shadedClassifierName>
- <shadedArtifactAttached>true</shadedArtifactAttached>
<createDependencyReducedPom>true</createDependencyReducedPom>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet>
<includes>
- <include>org.jboss.narayana.xts:ws-c:jar:api:${project.version}</include>
- <include>org.jboss.narayana.xts:ws-t:jar:api:${project.version}</include>
- <include>org.jboss.narayana.xts:wstx:jar:api:${project.version}</include>
- <include>org.jboss.narayana.xts:wstx11:jar:api:${project.version}</include>
- <include>org.jboss.narayana.xts:bridge:jar:api:${project.version}</include>
+ <include>org.jboss.narayana.xts</include>
</includes>
+ <includes>
+ <include>org.jboss.narayana.xts</include>
+ </includes>
</artifactSet>
</configuration>
</execution>
Modified: labs/jbosstm/trunk/XTS/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/XTS/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -48,7 +48,7 @@
<module>demo</module>
<module>docs</module>
<module>jbossxts</module>
+ <module>jbossxts-api</module>
<module>localjunit</module>
- <module>dist</module>
</modules>
</project>
Modified: labs/jbosstm/trunk/XTS/sar/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/XTS/sar/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -25,6 +25,11 @@
<description>xts sar</description>
<build>
<sourceDirectory>src</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>resources</directory>
+ </resource>
+ </resources>
</build>
<dependencies>
<dependency>
Modified: labs/jbosstm/trunk/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/trunk/build-release-pkgs.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/build-release-pkgs.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -136,13 +136,13 @@
</exec>
<!-- package the JTA only src tree (no JTS, XTS, txbridge, RTS) -->
- <delete file="${workdir}/jbossts-jta-${version}-src.zip"/>
+ <delete file="${workdir}/narayana-jta-${version}-src.zip"/>
<zip basedir="${workdir}" destfile="${workdir}/jbossts-jta-${version}-src.zip"
includes="${tag}/**"
excludes="${tag}/ArjunaJTS/**, ${tag}/XTS/** ${tag}/txbridge/**, ${tag}/rest-tx/**, ${tag}/repository/**"/>
<!-- package the full source release (all src tree) -->
- <delete file="${workdir}/jbossts-full-${version}-src.zip"/>
+ <delete file="${workdir}/narayana-full-${version}-src.zip"/>
<zip basedir="${workdir}" destfile="${workdir}/jbossts-full-${version}-src.zip"
includes="${tag}/**"
excludes="${tag}/repository/**"/>
@@ -172,10 +172,10 @@
<mkdir dir="${downloads.dir}/${version}/binary"/>
<copy todir="${downloads.dir}/${version}/src">
- <fileset dir="${workdir}" includes="jbossts-*-${version}-src.zip"/>
+ <fileset dir="${workdir}" includes="narayana-*-${version}-src.zip"/>
</copy>
<copy todir="${downloads.dir}/${version}/binary">
- <fileset dir="${workdir}/${tag}" includes="ArjunaJT*/dist/target/*-bin.zip,XTS/dist/target/*-bin.zip"/>
+ <fileset dir="${workdir}/${tag}" includes="dist/target/narayana-full-${version}-bin.zip"/>
</copy>
<!-- TODO: notes dir, xml generation? project.xml edits -->
</target>
Modified: labs/jbosstm/trunk/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml 2011-08-02 18:30:18 UTC (rev 37332)
+++ labs/jbosstm/trunk/dist/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -13,16 +13,16 @@
if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Fifth Floor, Boston, MA 02110-1301, USA. (C) 2009, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
<parent>
- <groupId>org.jboss.narayana.jts</groupId>
- <artifactId>narayana-jts-all</artifactId>
+ <groupId>org.jboss.narayana</groupId>
+ <artifactId>narayana</artifactId>
<version>5.0.0.M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jbossts-full</artifactId>
+ <artifactId>narayana-full</artifactId>
<packaging>pom</packaging>
- <name>JBossJTS distribution</name>
- <description>jts dist</description>
+ <name>${project.artifactId}</name>
+ <description>${project.artifactId}</description>
<build>
<plugins>
<plugin>
@@ -63,26 +63,36 @@
<artifactId>arjunacore-services</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.narayana</groupId>
- <artifactId>common</artifactId>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>narayana-jta</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.narayana.arjunacore</groupId>
- <artifactId>txoj</artifactId>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>narayana-jta</artifactId>
+ <classifier>sources</classifier>
</dependency>
<dependency>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>narayana-jta</artifactId>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>narayana-jta-integration</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts</artifactId>
- <classifier>javadoc</classifier>
+ <classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts</artifactId>
- <classifier>sources</classifier>
+ <classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jts</groupId>
@@ -106,9 +116,77 @@
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>trailmap</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>jbossxts</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>jbossxts</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.rts</groupId>
+ <artifactId>rest-tx-web</artifactId>
+ <type>war</type>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>jbossxts</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>jbossxts</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>jbossxts</artifactId>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>xts-demo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-c11</artifactId>
+ <classifier>war</classifier>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t11</artifactId>
+ <classifier>client</classifier>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t11</artifactId>
+ <classifier>coordinator</classifier>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t11</artifactId>
+ <classifier>participant</classifier>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>localjunit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>xts-test-servlet</artifactId>
+ </dependency>
</dependencies>
<properties>
<PRODUCT_NAME>narayana-jts</PRODUCT_NAME>
<HOME_DIRECTORY>JBOSSTS_HOME</HOME_DIRECTORY>
+ <PRODUCT_NAME>xts</PRODUCT_NAME>
+ <HOME_DIRECTORY>XTS_HOME</HOME_DIRECTORY>
</properties>
</project>
Modified: labs/jbosstm/trunk/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml 2011-08-02 18:30:18 UTC (rev 37332)
+++ labs/jbosstm/trunk/dist/src/main/assembly/bin.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -142,6 +142,7 @@
<unpack>false</unpack>
</dependencySet>
</dependencySets>
+ <!--
<files>
<file>
<source>../copyright.txt</source>
@@ -344,4 +345,5 @@
<outputDirectory>docs</outputDirectory>
</fileSet>
</fileSets>
+ -->
</assembly>
Copied: labs/jbosstm/trunk/dist/src/main/assembly/xts.xml (from rev 37332, labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml)
===================================================================
--- labs/jbosstm/trunk/dist/src/main/assembly/xts.xml (rev 0)
+++ labs/jbosstm/trunk/dist/src/main/assembly/xts.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -0,0 +1,138 @@
+<?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. -->
+<assembly>
+ <id>bin</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.narayana.xts:xts-demo</include>
+ </includes>
+ <outputDirectory>demo</outputDirectory>
+ <useProjectAttachments>true</useProjectAttachments>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.narayana.xts:jbossxts:*javadoc*</include>
+ </includes>
+ <outputDirectory>docs/api</outputDirectory>
+ <useProjectAttachments>true</useProjectAttachments>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.narayana.xts:localjunit</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>interop-tests</outputDirectory>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.narayana.xts:localjunit</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.narayana.xts: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.narayana.xts:jbossxts:jar:api</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.narayana.xts:jbossxts:jar</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.narayana.xts:ws-c11:war:war</include>
+ </includes>
+ <outputDirectory>webapps</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+ </outputFileNameMapping>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.narayana.xts:ws-t11:war:client</include>
+ <include>org.jboss.narayana.xts:ws-t11:war:coordinator</include>
+ <include>org.jboss.narayana.xts:ws-t11:war:participant</include>
+ </includes>
+ <outputDirectory>webapps</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}
+ </outputFileNameMapping>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+ <!--
+ <files>
+ <file>
+ <source>../third_party_licenses.txt</source>
+ <fileMode>0644</fileMode>
+ <outputDirectory>lib/ext</outputDirectory>
+ </file>
+ <file>
+ <source>../localjunit/run-tests.xml</source>
+ <fileMode>0644</fileMode>
+ <outputDirectory>tests</outputDirectory>
+ </file>
+ <file>
+ <source>../localjunit/run-interop-tests.xml</source>
+ <fileMode>0644</fileMode>
+ <outputDirectory>interop-tests</outputDirectory>
+ </file>
+ </files>
+ <fileSets>
+ <fileSet>
+ <directory>../docs/Transactions_XTS_Administration_And_Development_Guide/target/publican/Transactions_XTS_Administration_And_Development_Guide/en-US/pdf/</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
+ </fileSets>
+ -->
+</assembly>
Modified: labs/jbosstm/trunk/pom.xml
===================================================================
--- labs/jbosstm/trunk/pom.xml 2011-08-02 19:06:00 UTC (rev 37333)
+++ labs/jbosstm/trunk/pom.xml 2011-08-02 20:43:08 UTC (rev 37334)
@@ -666,6 +666,12 @@
</dependency>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>jbossxts</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
<artifactId>xts-docs</artifactId>
<version>${project.version}</version>
</dependency>
@@ -685,6 +691,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.narayana.rts</groupId>
+ <artifactId>rest-tx-web</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.0.0.Beta5</version>
@@ -755,8 +767,9 @@
<module>ArjunaCore</module>
<module>ArjunaJTA</module>
<module>XTS</module>
- <!-- BUILT BY ArjunaJTS module>rhq-plugin</module-->
<module>ArjunaJTS</module>
<module>rest-tx</module>
+ <module>rhq-plugin</module>
+ <module>dist</module>
</modules>
</project>
More information about the jboss-svn-commits
mailing list