[jboss-svn-commits] JBL Code SVN: r37323 - in labs/jbosstm/trunk: ArjunaCore and 31 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 1 16:44:10 EDT 2011
Author: tomjenkinson
Date: 2011-08-01 16:44:10 -0400 (Mon, 01 Aug 2011)
New Revision: 37323
Added:
labs/jbosstm/trunk/XTS/jbossxts/
labs/jbosstm/trunk/XTS/jbossxts/pom.xml
labs/jbosstm/trunk/XTS/jbossxts/src/
labs/jbosstm/trunk/XTS/jbossxts/src/main/
labs/jbosstm/trunk/XTS/jbossxts/src/main/resources/
labs/jbosstm/trunk/XTS/jbossxts/src/main/resources/xts-properties.xml
Removed:
labs/jbosstm/trunk/XTS/config/xts-properties11.xml
labs/jbosstm/trunk/XTS/jbossxts-api/
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml
labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
labs/jbosstm/trunk/ArjunaCore/pom.xml
labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml
labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml
labs/jbosstm/trunk/ArjunaJTA/jbossjta/pom.xml
labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml
labs/jbosstm/trunk/ArjunaJTA/pom.xml
labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
labs/jbosstm/trunk/ArjunaJTS/jbossjts/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/WS-T/ws-t11/pom.xml
labs/jbosstm/trunk/XTS/WSTX/wstx/pom.xml
labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml
labs/jbosstm/trunk/XTS/bridge/pom.xml
labs/jbosstm/trunk/XTS/dist/pom.xml
labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/XTS/pom.xml
labs/jbosstm/trunk/XTS/recovery/pom.xml
labs/jbosstm/trunk/XTS/sar/pom.xml
labs/jbosstm/trunk/build-release-pkgs.xml
labs/jbosstm/trunk/common/pom.xml
labs/jbosstm/trunk/pom.xml
labs/jbosstm/trunk/rest-tx/quickstarts/pom.xml
labs/jbosstm/trunk/rhq-plugin/build.xml
labs/jbosstm/trunk/rhq-plugin/pom.xml
labs/jbosstm/trunk/sharedbuild.xml
labs/jbosstm/trunk/txbridge/pom.xml
Log:
JBTM-848 updated the maven code to handle the new XTS build style
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -41,6 +41,14 @@
</testResources>
<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>build-helper-maven-plugin</artifactId>
<executions>
@@ -106,25 +114,21 @@
<dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman</artifactId>
- <version>${byteman-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-install</artifactId>
- <version>${byteman-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-submit</artifactId>
- <version>${byteman-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-bmunit</artifactId>
- <version>${byteman-version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -149,7 +153,4 @@
<systemPath>${env.JAVA_HOME}/lib/jconsole.jar</systemPath>
</dependency>
</dependencies>
- <properties>
- <byteman-version>1.5.1</byteman-version>
- </properties>
</project>
Modified: labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -111,6 +111,7 @@
<goal>shade</goal>
</goals>
<configuration>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
<artifactSet>
<includes>
<include>org.jboss.narayana:common</include>
Modified: labs/jbosstm/trunk/ArjunaCore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/ArjunaCore/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -24,6 +24,18 @@
<packaging>pom</packaging>
<name>ArjunaCore everything</name>
<description>arjunacore</description>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<modules>
<module>arjuna</module>
<module>arjuna/services</module>
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -38,6 +38,14 @@
</testResources>
<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>build-helper-maven-plugin</artifactId>
<executions>
Modified: labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -27,7 +27,15 @@
<sourceDirectory>../../atsintegration/classes</sourceDirectory>
<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.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<excludes>
Modified: labs/jbosstm/trunk/ArjunaJTA/jbossjta/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jbossjta/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/ArjunaJTA/jbossjta/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -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>
@@ -113,6 +121,7 @@
<goal>shade</goal>
</goals>
<configuration>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
<artifactSet>
<includes>
<include>org.jboss.narayana:common</include>
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -111,29 +111,22 @@
<dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman</artifactId>
- <version>${byteman-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-install</artifactId>
- <version>${byteman-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-submit</artifactId>
- <version>${byteman-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-bmunit</artifactId>
- <version>${byteman-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
- <properties>
- <byteman-version>1.5.1</byteman-version>
- </properties>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTA/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/ArjunaJTA/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -24,6 +24,18 @@
<packaging>pom</packaging>
<name>JBossJTA everything</name>
<description>jta all</description>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<modules>
<module>jta</module>
<module>jdbc</module>
Modified: labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -27,6 +27,14 @@
<sourceDirectory>../../atsintegration/classes</sourceDirectory>
<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/ArjunaJTS/jbossjts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -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>
@@ -129,13 +137,14 @@
<goal>shade</goal>
</goals>
<configuration>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
<artifactSet>
<includes>
<include>org.jboss.narayana:common</include>
<include>org.jboss.narayana.arjunacore:arjuna</include>
<include>org.jboss.narayana.arjunacore:txoj</include>
<include>org.jboss.narayana.jta:jta</include>
- <include>org.jboss.narayana.jts:jdbc</include>
+ <include>org.jboss.narayana.jta:jdbc</include>
<include>org.jboss.narayana.jts:orbportability</include>
<include>org.jboss.narayana.jts:jts</include>
<include>org.jboss.narayana.jts:jtax</include>
Modified: labs/jbosstm/trunk/ArjunaJTS/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/ArjunaJTS/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -24,6 +24,18 @@
<packaging>pom</packaging>
<name>JBossJTS everything</name>
<description>jts all</description>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<modules>
<module>orbportability</module>
<module>jts</module>
Modified: labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -25,12 +25,18 @@
<description>wsc</description>
<build>
<sourceDirectory>../dev/src</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>../dev/dd</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
+ <id>api</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
@@ -42,6 +48,19 @@
</includes>
</configuration>
</execution>
+ <execution>
+ <id>impl</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ <excludes>
+ <exclude>com/arjuna/wsc/AlreadyRegisteredException.class</exclude>
+ </excludes>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Modified: labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -63,5 +63,10 @@
<groupId>org.jboss.narayana.xts</groupId>
<artifactId>ws-c</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-c</artifactId>
+ <classifier>api</classifier>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/WS-T/ws-t/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/ws-t/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/XTS/WS-T/ws-t/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -25,12 +25,18 @@
<description>wst</description>
<build>
<sourceDirectory>../dev/src</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>../dev/dd</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
+ <id>api</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
@@ -59,6 +65,36 @@
</includes>
</configuration>
</execution>
+ <execution>
+ <id>impl</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ <excludes>
+ <exclude>com/arjuna/wst/Vote.class</exclude>
+ <exclude>com/arjuna/wst/Prepared.class</exclude>
+ <exclude>com/arjuna/wst/ReadOnly.class</exclude>
+ <exclude>com/arjuna/wst/Aborted.class</exclude>
+ <exclude>com/arjuna/wst/Participant.class</exclude>
+ <exclude>com/arjuna/wst/Durable2PCParticipant.class</exclude>
+ <exclude>com/arjuna/wst/Volatile2PCParticipant.class</exclude>
+ <exclude>com/arjuna/wst/BusinessAgreementWithParticipantCompletionParticipant.class</exclude>
+ <exclude>com/arjuna/wst/BusinessAgreementWithCoordinatorCompletionParticipant.class</exclude>
+ <exclude>com/arjuna/wst/WrongStateException.class</exclude>
+ <exclude>com/arjuna/wst/SystemException.class</exclude>
+ <exclude>com/arjuna/wst/TransactionRolledBackException.class</exclude>
+ <exclude>com/arjuna/wst/UnknownTransactionException.class</exclude>
+ <exclude>com/arjuna/wst/FaultedException.class</exclude>
+ <exclude>org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryModule.class</exclude>
+ <exclude>org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManager.class</exclude>
+ <exclude>org/jboss/jbossts/xts/recovery/participant/ba/XTSBARecoveryModule.class</exclude>
+ <exclude>org/jboss/jbossts/xts/recovery/participant/ba/XTSBARecoveryManager.class</exclude>
+ </excludes>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
Modified: labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -31,6 +31,7 @@
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
+ <id>api</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
@@ -43,6 +44,20 @@
</includes>
</configuration>
</execution>
+ <execution>
+ <id>impl</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ <excludes>
+ <exclude>com/arjuna/wst11/BAParticipantManager.class</exclude>
+ <exclude>com/arjuna/wst11/ConfirmCompletedParticipant.class</exclude>
+ </excludes>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -100,6 +115,11 @@
</dependency>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
<artifactId>wscf</artifactId>
</dependency>
<dependency>
Modified: labs/jbosstm/trunk/XTS/WSTX/wstx/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/wstx/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/XTS/WSTX/wstx/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -31,6 +31,7 @@
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
+ <id>api</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
@@ -42,6 +43,19 @@
</includes>
</configuration>
</execution>
+ <execution>
+ <id>impl</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ <excludes>
+ <exclude>com/arjuna/mw/wst/TxContext.class</exclude>
+ </excludes>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -59,5 +73,10 @@
<groupId>org.jboss.narayana.xts</groupId>
<artifactId>wscf</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t</artifactId>
+ <classifier>api</classifier>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -31,6 +31,7 @@
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
+ <id>api</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
@@ -54,6 +55,31 @@
</includes>
</configuration>
</execution>
+ <execution>
+ <id>impl</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ <excludes>
+ <exclude>com/arjuna/mw/wst11/UserTransaction.class</exclude>
+ <exclude>com/arjuna/mw/wst11/UserTransactionFactory.class</exclude>
+ <exclude>com/arjuna/mw/wst11/TransactionManager.class</exclude>
+ <exclude>com/arjuna/mw/wst11/TransactionManagerFactory.class</exclude>
+ <exclude>com/arjuna/mw/wst11/UserBusinessActivity.class</exclude>
+ <exclude>com/arjuna/mw/wst11/UserBusinessActivityFactory.class</exclude>
+ <exclude>com/arjuna/mw/wst11/BusinessActivityManager.class</exclude>
+ <exclude>com/arjuna/mw/wst11/BusinessActivityManagerFactory.class</exclude>
+ <exclude>com/arjuna/mw/wst11/client/JaxWSHeaderContextProcessor.class</exclude>
+ <exclude>com/arjuna/mw/wst11/client/JaxBaseHeaderContextProcessor.class</exclude>
+ <exclude>com/arjuna/mw/wst11/service/JaxWSHeaderContextProcessor.class</exclude>
+ <exclude>com/arjuna/mw/wst11/service/JaxWSSubordinateHeaderContextProcessor.class</exclude>
+ <exclude>com/arjuna/mw/wst11/service/JaxBaseHeaderContextProcessor.class</exclude>
+ </excludes>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -72,6 +98,16 @@
<artifactId>wstx</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t11</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wstx</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-api</artifactId>
</dependency>
Modified: labs/jbosstm/trunk/XTS/bridge/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/bridge/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/XTS/bridge/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -31,6 +31,7 @@
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
+ <id>api</id>
<goals>
<goal>jar</goal>
</goals>
@@ -41,6 +42,18 @@
</includes>
</configuration>
</execution>
+ <execution>
+ <id>impl</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <forceCreation>true</forceCreation>
+ <excludes>
+ <exclude>org/jboss/jbossts/xts/bridge/at/BridgeWrapper.class</exclude>
+ </excludes>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Deleted: labs/jbosstm/trunk/XTS/config/xts-properties11.xml
===================================================================
--- labs/jbosstm/trunk/XTS/config/xts-properties11.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/XTS/config/xts-properties11.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<!--
- JBoss, Home of Professional Open Source
- Copyright 2010, Red Hat and individual contributors
- as indicated by the @author tags.
- 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.
-
- (C) 2010,
- @author JBoss, a division of Red Hat.
--->
-<properties>
- <!--
- This is the XTS configuration file for the supported configuration where only the 1.1 protocol
- implementation is deployed. The original file is called xts-properties11.xml but it is deployed
- as xts-properties.xml. This file is only needed if you are deploying XTS outside of JBoss AS.
- When deployed inside JBoss AS the XTS the beans.xml file in the XTS service archive configures
- the relevant properties using micro-container injection.
-
- These properties define values which configure operation of all 3 components of the XTS
- implementation, the client services, participant (transactional web service) services and
- the XTS coordinator services. Normally all three components are deployed and configured in a
- single container so one property file serves to configure the behaviour of all three deployments.
- By redefining certain of these properties to have empty values it is possible to avoid loading
- implementations classes used by the client or coordinator components. In order to fully remove any
- of these three components from a deployment it is also necessary to modify the war deployments which
- expose the service endpoints.
- -->
-
- <!--
- bind address/ports
- the following entries are used by the XTS components to construct
- the URLS handed out when they need to provide a reference to the
- service. These URLs refer to services deployed in the client,
- coordinator or participant web service container so the bind
- properties must always be configured in any XTS deployment.
-
- In JBoss AS these properties will be injected by the
- microcontainer using values derived from service JBoss Web as
- specified in file jboss-beans.xml. So bind.address will be set
- using the bind address supplied when JBoss AS is started while
- the ports will be derived from the configuration file in the
- server's config directory.
- -->
-
- <!-- these are the values employed by the 1.1 implementation
- -->
- <entry key="org.jboss.jbossts.xts11.bind.address">localhost</entry>
- <entry key="org.jboss.jbossts.xts11.bind.port">8080</entry>
- <entry key="org.jboss.jbossts.xts11.bind.port.secure">8443</entry>
-
- <!-- transport timeouts
- these properties configure timings in the transport layer which manages messages between client
- and coordinator or participant (web service) and coordinator. This layer is common to all 3 XTS components
- so these properties may be set in all deployments. The example settings below specify the default values
- which are all calibrated in milliseconds.
-
- transportTimeout determines the maximum time a participant or coordinator service will wait for a response
- to a protocol message before assuming that the service at the other end has crashed. Note that in some cases,
- particularly in the case of participants a timeout can only be handled by resending the message. However,
- in other cases a timeout may lead to a transaction start transition e.g. to aborting. n.b. transportTimeout
- should be significantly greater than initialTransportPeriod which determines how frequently messages are
- resent. The default timeout is 30 seconds which should never be exceeded on a local network because of
- message delivery delays. If your service and coordinator are distributed across internet domains then you
- may possibly need to increase this value.
-
- initialTransportPeriod is the initial period for which a participant or coordinator service will wait before
- resending a protocol message if it does not receive a reply. In cases where a wait is performed the first
- resend will only happen after the initial wait timeout and this property is used to determine the period
- before the second resend. In cases where a wait is not performed the resend happens automatically on the
- assumption that the first message must not have reached its destination. Where a response is mandated by the
- transaction protocol resends continue indefinitely at gradually increasing intervals - the period roughly
- doubling every two resends. The default period is 5 seconds which should never be exceeded on a local
- network because of message delivery delays.If your service and coordinator are distributed across internet
- domains then you may possibly need to increase this value.
-
- maximumTransportPeriod is the maximum value which the resend period can be increased to. It should be
- significantly larger than initialTransportPeriod since there is no point resending messages with high
- frequency if a the server at the other end has been down for a long time. The default maximum period is 300
- seconds which will only be reached after a message has been sent approximately 15 times.
- -->
- <!-- uncomment to configure transport timing properties -->
- <!--
- <property name="org.jboss.jbossts.xts.transport.initialTransportPeriod">5000</property>
- <property name="org.jboss.jbossts.xts.transport.maximumTransportPeriod">300000</property>
- <property name="org.jboss.jbossts.xts.transport.transportTimeout">30000</property>
- -->
-
- <!-- coordinator URL
- the following entries are used in the client container only to
- identify the URL used to address the ActivationCoordinator service.
- This is the XTS service which is contacted when a begin operation
- is invoked to start a WS-AT or WS-BA transaction.
-
- If a full URL is provide then it will be used as given.
- Otherwise a URL will be constructed using any URL components
- such as scheme, host etc which have been specified as properties
- and defaulting any remaining unspecified properties.
- if no URL or components are specified the URL defaults to that
- of the local coordinator service.
- -->
-
- <!-- 1.1 properties : only set if you want to use a non-local coordinator
- -->
- <!--
- <entry key="org.jboss.jbossts.xts11.coordinatorURL">http://localhost:8080/ws-c11/ActivationService</entry>
- <entry key="org.jboss.jbossts.xts11.coordinator.scheme">http</entry>
- <entry key="org.jboss.jbossts.xts11.coordinator.address">localhost</entry>
- <entry key="org.jboss.jbossts.xts11.coordinator.port">8080</entry>
- <entry key="org.jboss.jbossts.xts11.coordinator.path">ws-c11/ActivationService</entry>
- -->
-
- <!-- user transaction and transaction manager implementation
- mappings.
- these are used in the client or web service container to identify the
- classes used to implement the WSAT and WSBA client and web service APIs. they
- will not normally be reconfigured since doing so requires modifying the
- implementation to include new versions of these classes.
-
- if you are deploying XTS to a coordinator container which does
- not need to operate as a client or web service
- then you can leave these properties unset and the corresponding
- classes will not be loaded.
-
- Note that in the client container you must define both the UserXX and XXManager classes.
- In the participant container you do not have to define the UserXXX class unless you also
- want it to operate as a client container
- -->
- <!-- client mappings for the 1.1 implementation
- -->
- <entry key="org.jboss.jbossts.xts11.wsat.UserTransaction">com.arjuna.mwlabs.wst11.at.remote.UserTransactionImple</entry>
- <entry key="org.jboss.jbossts.xts11.wsba.UserBusinessActivity">com.arjuna.mwlabs.wst11.ba.remote.UserBusinessActivityImple</entry>
- <!-- participant mappings for the 1.1 implementation
- -->
- <entry key="org.jboss.jbossts.xts11.wsat.TransactionManager">com.arjuna.mwlabs.wst11.at.remote.TransactionManagerImple</entry>
- <entry key="org.jboss.jbossts.xts11.wsba.BusinessActivityManager">com.arjuna.mwlabs.wst11.ba.remote.BusinessActivityManagerImple</entry>
-
- <!-- protocol mappings.
-
- these are used in the coordinator container only to determine
- which classes to use to implement the coordination
- services. they are used to establish mappings from
- coordination service types to their implementation classes and
- from coordination types to coordination context factories.
- they will not normally be reconfigured since this also
- requires providing alternative implementations.
-
- if you are deploying XTS to a client or participant (web
- service) container which uses a coordinator located in
- a remote container then you can omit these properties and
- no coordinator implementations will be loaded.
-
- coordination service implementation classes must be tagged
- with an HLSProvider annotation identifying the implemented
- service type. the annotation must also declare the
- coordination type of the coordination protocol supported by
- the service.
-
- context factory classes must be tagged with a ContextProvider
- annotation identifying the coordination type and
- implementation class of the contexts created by the
- factory. the annotation must also declare the service type
- for which the context is appropriate.
- -->
-
- <!-- protocol definitions for 1.1 implementation
- first the HLS services and then the context factories
- -->
- <entry key="org.jboss.jbossts.xts.protocolImplementation1">com.arjuna.mwlabs.wscf11.model.twophase.arjunacore.TwoPhaseHLSImple</entry>
- <entry key="org.jboss.jbossts.xts.protocolImplementation2">com.arjuna.mwlabs.wscf11.model.sagas.arjunacore.SagasHLSImple</entry>
- <entry key="org.jboss.jbossts.xts.protocolImplementation3">com.arjuna.mwlabs.wst11.at.ContextFactoryImple</entry>
- <entry key="org.jboss.jbossts.xts.protocolImplementation4">com.arjuna.mwlabs.wst11.ba.ContextFactoryImple</entry>
-
- <!-- XTS recovery modules to be deployed either in the coordinator or participant. you should
- never need to change these values or add new ones. howver you may want to remove participant modules
- if you are only deploying coordinator services or remove coordinator modules if you are only deploying
- participant services. If you are only deploying a client then you can remove all these modules.
-
- Note that these are the modules which implement XTS recovery and are not the same as the application
- defined recovery modules registered by participant web services. The latter are called when the AT and BA
- participant modules in the list below get run.
-
- n.b. the 1.0 and 1.1 implementations both use the same recovery module.
- -->
-
- <entry key="org.jboss.jbossts.xts.recovery.coordinatorRecoveryModule1">org.jboss.jbossts.xts.recovery.coordinator.at.ATCoordinatorRecoveryModule</entry>
- <entry key="org.jboss.jbossts.xts.recovery.coordinatorRecoveryModule2">org.jboss.jbossts.xts.recovery.coordinator.at.SubordinateATCoordinatorRecoveryModule</entry>
- <entry key="org.jboss.jbossts.xts.recovery.coordinatorRecoveryModule3">org.jboss.jbossts.xts.recovery.coordinator.ba.BACoordinatorRecoveryModule</entry>
- <entry key="org.jboss.jbossts.xts.recovery.coordinatorRecoveryModule4">org.jboss.jbossts.xts.recovery.coordinator.ba.SubordinateBACoordinatorRecoveryModule</entry>
-
- <entry key="org.jboss.jbossts.xts.recovery.participantRecoveryModule1">org.jboss.jbossts.xts.recovery.participant.at.ATParticipantRecoveryModule</entry>
- <entry key="org.jboss.jbossts.xts.recovery.participantRecoveryModule2">org.jboss.jbossts.xts.recovery.participant.ba.BAParticipantRecoveryModule</entry>
-
- <!-- initialisations
- these are classes which implement the startup and shutdown operations defined by the XTSInitialisation lifecycle
- interface. For 1.1 here are 3 such classes performing all initialisation relevant to the coordinator side, participant
- side and client side services. You may want to delete some of these entries if you only wish to deploy a subset
- of the 1.1 XTS services.
- -->
- <entry key="org.jboss.jbossts.xts.initialisation.xtsInitialisation_1">org.jboss.jbossts.xts.initialisation.CoordinatorSideInitialisation</entry>
- <entry key="org.jboss.jbossts.xts.initialisation.xtsInitialisation_2">org.jboss.jbossts.xts.initialisation.ParticipantSideInitialisation</entry>
- <entry key="org.jboss.jbossts.xts.initialisation.xtsInitialisation_3">org.jboss.jbossts.xts.initialisation.ClientSideInitialisation</entry>
-
- <!--
- if you are deploying XTS outside of JBoss then you may not be able to map the WS-C and WS-T service
- endpoints to the same URLs as those employed by JBossWS. The services need to know where the endpoints
- have been mapped because they need to insert their endpoint URLs into protocol messages. The following
- properties can be set to identify the URL path element of the service. So, for example, with these
- configuration settings the default URL for the WS-T Participant service
- http://<webhost>:<webport>/ws-t11-participant/ParticipantService would be remapped to
- http://<webhost>:<webport>/participant/services/ParticipantService. These properties are normally
- left unset so that the JBoss default URLs are employed.
- <entry key="org.jboss.jbossts.xts11.wsc.serviceURLPath.">/coord/services</entry>
- <entry key="org.jboss.jbossts.xts11.wst.coordinatorServiceURLPath.">/coord/services</entry>
- <entry key="org.jboss.jbossts.xts11.wst.clientServiceURLPath.">/client/services</entry>
- <entry key="org.jboss.jbossts.xts11.wst.participantServiceURLPath.">/participant/services</entry>
- -->
-
-</properties>
Modified: labs/jbosstm/trunk/XTS/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/dist/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/XTS/dist/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -48,81 +48,16 @@
<dependencies>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
- <artifactId>wsas</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>ws-c</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>ws-c11</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>ws-c</artifactId>
+ <artifactId>jbossxts</artifactId>
<classifier>api</classifier>
</dependency>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
- <artifactId>ws-t</artifactId>
+ <artifactId>jbossxts</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
- <artifactId>ws-t11</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>ws-t</artifactId>
- <classifier>api</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>ws-t11</artifactId>
- <classifier>api</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>wscf</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>wscf11</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>wstx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>wstx11</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>wstx</artifactId>
- <classifier>api</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>wstx11</artifactId>
- <classifier>api</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>recovery</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>bridge</artifactId>
- <classifier>api</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>jbossxts-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>jbossxts-api</artifactId>
+ <artifactId>jbossxts</artifactId>
<classifier>javadoc</classifier>
</dependency>
<dependency>
@@ -155,12 +90,6 @@
</dependency>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
- <artifactId>jbossxts-sar</artifactId>
- <classifier>sar</classifier>
- <type>sar</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
<artifactId>localjunit</artifactId>
</dependency>
<dependency>
Modified: labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -28,7 +28,7 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.narayana.xts:jbossxts-api*javadoc*</include>
+ <include>org.jboss.narayana.xts:jbossxts:*javadoc*</include>
</includes>
<outputDirectory>docs/api</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
@@ -67,12 +67,7 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.narayana.xts:ws-t11*api</include>
- <include>org.jboss.narayana.xts:wstx11*api</include>
- <include>org.jboss.narayana.xts:ws-c*api</include>
- <include>org.jboss.narayana.xts:bridge*api</include>
- <include>org.jboss.narayana.xts:ws-t*api</include>
- <include>org.jboss.narayana.xts:wstx*api</include>
+ <include>org.jboss.narayana.xts:jbossxts:jar:api</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
@@ -81,19 +76,9 @@
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
- <includes>
- <include>org.jboss.narayana.xts:wsas:jar</include>
- <include>org.jboss.narayana.xts:ws-c:jar</include>
- <include>org.jboss.narayana.xts:ws-c11:jar</include>
- <include>org.jboss.narayana.xts:ws-t:jar</include>
- <include>org.jboss.narayana.xts:ws-t11:jar</include>
- <include>org.jboss.narayana.xts:wscf:jar</include>
- <include>org.jboss.narayana.xts:wscf11:jar</include>
- <include>org.jboss.narayana.xts:wstx:jar</include>
- <include>org.jboss.narayana.xts:wstx11:jar</include>
- <include>org.jboss.narayana.xts:recovery:jar</include>
- <include>org.jboss.narayana.xts:jbossxts-api:jar</include>
- </includes>
+ <includes>
+ <include>org.jboss.narayana.xts:jbossxts:jar</include>
+ </includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
@@ -102,17 +87,6 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.narayana.xts:jbossxts-sar:sar:sar</include>
- </includes>
- <outputDirectory>sar</outputDirectory>
- <outputFileNameMapping>jbossxts.${artifact.extension}
- </outputFileNameMapping>
- <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>
@@ -155,11 +129,6 @@
</files>
<fileSets>
<fileSet>
- <directory>../config</directory>
- <outputDirectory>conf</outputDirectory>
- <filtered>true</filtered>
- </fileSet>
- <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>
Property changes on: labs/jbosstm/trunk/XTS/jbossxts
___________________________________________________________________
Added: svn:ignore
+ target
Added: labs/jbosstm/trunk/XTS/jbossxts/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/jbossxts/pom.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/jbossxts/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -0,0 +1,318 @@
+<?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.narayana.xts</groupId>
+ <artifactId>xts-all</artifactId>
+ <version>5.0.0.M1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jbossxts</artifactId>
+ <packaging>jar</packaging>
+ <name>${pom.artifactId}</name>
+ <description>${pom.artifactId}</description>
+ <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>
+ <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>
+ <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>
+ <detectOfflineLinks>false</detectOfflineLinks>
+ <excludePackageNames>org.*:com.arjuna.services.*:com.arjuna.webservices*:com.arjuna.mwlabs.*:com.arjuna.webservices11*:com.arjuna.schemas:com.arjuna.mw.wstx</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>../WSAS/classes</source>
+ <source>../WSCF/classes</source>
+ <source>../WS-C/dev/src</source>
+ <source>../WS-T/dev/src</source>
+ <source>../WSTX/classes</source>
+ <source>../WS-C/dev/src11</source>
+ <source>../WS-T/dev/src11</source>
+ <source>../WSTX/classes11</source>
+ <source>../recovery/src</source>
+ <source>../sar/src</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>mainjar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <artifactSet>
+ <includes>
+ <include>org.jboss.narayana.xts</include>
+ </includes>
+ <excludes>
+ <exclude>org.jboss.narayana.xts:*:api</exclude>
+ </excludes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ <execution>
+ <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: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>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wsas</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wscf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wscf11</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-c</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-c11</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t11</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wstx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wstx11</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>recovery</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>service</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-c</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t11</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wstx</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wstx11</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>bridge</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wsas</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wscf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wscf11</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-c</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-c11</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t11</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wstx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wstx11</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>recovery</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>service</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-c</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t11</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wstx</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>wstx11</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>bridge</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ </dependencies>
+</project>
Copied: labs/jbosstm/trunk/XTS/jbossxts/src/main/resources/xts-properties.xml (from rev 37321, labs/jbosstm/trunk/XTS/config/xts-properties11.xml)
===================================================================
--- labs/jbosstm/trunk/XTS/jbossxts/src/main/resources/xts-properties.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/jbossxts/src/main/resources/xts-properties.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2010, Red Hat and individual contributors
+ as indicated by the @author tags.
+ 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.
+
+ (C) 2010,
+ @author JBoss, a division of Red Hat.
+-->
+<properties>
+ <!--
+ This is the XTS configuration file for the supported configuration where only the 1.1 protocol
+ implementation is deployed. The original file is called xts-properties11.xml but it is deployed
+ as xts-properties.xml. This file is only needed if you are deploying XTS outside of JBoss AS.
+ When deployed inside JBoss AS the XTS the beans.xml file in the XTS service archive configures
+ the relevant properties using micro-container injection.
+
+ These properties define values which configure operation of all 3 components of the XTS
+ implementation, the client services, participant (transactional web service) services and
+ the XTS coordinator services. Normally all three components are deployed and configured in a
+ single container so one property file serves to configure the behaviour of all three deployments.
+ By redefining certain of these properties to have empty values it is possible to avoid loading
+ implementations classes used by the client or coordinator components. In order to fully remove any
+ of these three components from a deployment it is also necessary to modify the war deployments which
+ expose the service endpoints.
+ -->
+
+ <!--
+ bind address/ports
+ the following entries are used by the XTS components to construct
+ the URLS handed out when they need to provide a reference to the
+ service. These URLs refer to services deployed in the client,
+ coordinator or participant web service container so the bind
+ properties must always be configured in any XTS deployment.
+
+ In JBoss AS these properties will be injected by the
+ microcontainer using values derived from service JBoss Web as
+ specified in file jboss-beans.xml. So bind.address will be set
+ using the bind address supplied when JBoss AS is started while
+ the ports will be derived from the configuration file in the
+ server's config directory.
+ -->
+
+ <!-- these are the values employed by the 1.1 implementation
+ -->
+ <entry key="org.jboss.jbossts.xts11.bind.address">localhost</entry>
+ <entry key="org.jboss.jbossts.xts11.bind.port">8080</entry>
+ <entry key="org.jboss.jbossts.xts11.bind.port.secure">8443</entry>
+
+ <!-- transport timeouts
+ these properties configure timings in the transport layer which manages messages between client
+ and coordinator or participant (web service) and coordinator. This layer is common to all 3 XTS components
+ so these properties may be set in all deployments. The example settings below specify the default values
+ which are all calibrated in milliseconds.
+
+ transportTimeout determines the maximum time a participant or coordinator service will wait for a response
+ to a protocol message before assuming that the service at the other end has crashed. Note that in some cases,
+ particularly in the case of participants a timeout can only be handled by resending the message. However,
+ in other cases a timeout may lead to a transaction start transition e.g. to aborting. n.b. transportTimeout
+ should be significantly greater than initialTransportPeriod which determines how frequently messages are
+ resent. The default timeout is 30 seconds which should never be exceeded on a local network because of
+ message delivery delays. If your service and coordinator are distributed across internet domains then you
+ may possibly need to increase this value.
+
+ initialTransportPeriod is the initial period for which a participant or coordinator service will wait before
+ resending a protocol message if it does not receive a reply. In cases where a wait is performed the first
+ resend will only happen after the initial wait timeout and this property is used to determine the period
+ before the second resend. In cases where a wait is not performed the resend happens automatically on the
+ assumption that the first message must not have reached its destination. Where a response is mandated by the
+ transaction protocol resends continue indefinitely at gradually increasing intervals - the period roughly
+ doubling every two resends. The default period is 5 seconds which should never be exceeded on a local
+ network because of message delivery delays.If your service and coordinator are distributed across internet
+ domains then you may possibly need to increase this value.
+
+ maximumTransportPeriod is the maximum value which the resend period can be increased to. It should be
+ significantly larger than initialTransportPeriod since there is no point resending messages with high
+ frequency if a the server at the other end has been down for a long time. The default maximum period is 300
+ seconds which will only be reached after a message has been sent approximately 15 times.
+ -->
+ <!-- uncomment to configure transport timing properties -->
+ <!--
+ <property name="org.jboss.jbossts.xts.transport.initialTransportPeriod">5000</property>
+ <property name="org.jboss.jbossts.xts.transport.maximumTransportPeriod">300000</property>
+ <property name="org.jboss.jbossts.xts.transport.transportTimeout">30000</property>
+ -->
+
+ <!-- coordinator URL
+ the following entries are used in the client container only to
+ identify the URL used to address the ActivationCoordinator service.
+ This is the XTS service which is contacted when a begin operation
+ is invoked to start a WS-AT or WS-BA transaction.
+
+ If a full URL is provide then it will be used as given.
+ Otherwise a URL will be constructed using any URL components
+ such as scheme, host etc which have been specified as properties
+ and defaulting any remaining unspecified properties.
+ if no URL or components are specified the URL defaults to that
+ of the local coordinator service.
+ -->
+
+ <!-- 1.1 properties : only set if you want to use a non-local coordinator
+ -->
+ <!--
+ <entry key="org.jboss.jbossts.xts11.coordinatorURL">http://localhost:8080/ws-c11/ActivationService</entry>
+ <entry key="org.jboss.jbossts.xts11.coordinator.scheme">http</entry>
+ <entry key="org.jboss.jbossts.xts11.coordinator.address">localhost</entry>
+ <entry key="org.jboss.jbossts.xts11.coordinator.port">8080</entry>
+ <entry key="org.jboss.jbossts.xts11.coordinator.path">ws-c11/ActivationService</entry>
+ -->
+
+ <!-- user transaction and transaction manager implementation
+ mappings.
+ these are used in the client or web service container to identify the
+ classes used to implement the WSAT and WSBA client and web service APIs. they
+ will not normally be reconfigured since doing so requires modifying the
+ implementation to include new versions of these classes.
+
+ if you are deploying XTS to a coordinator container which does
+ not need to operate as a client or web service
+ then you can leave these properties unset and the corresponding
+ classes will not be loaded.
+
+ Note that in the client container you must define both the UserXX and XXManager classes.
+ In the participant container you do not have to define the UserXXX class unless you also
+ want it to operate as a client container
+ -->
+ <!-- client mappings for the 1.1 implementation
+ -->
+ <entry key="org.jboss.jbossts.xts11.wsat.UserTransaction">com.arjuna.mwlabs.wst11.at.remote.UserTransactionImple</entry>
+ <entry key="org.jboss.jbossts.xts11.wsba.UserBusinessActivity">com.arjuna.mwlabs.wst11.ba.remote.UserBusinessActivityImple</entry>
+ <!-- participant mappings for the 1.1 implementation
+ -->
+ <entry key="org.jboss.jbossts.xts11.wsat.TransactionManager">com.arjuna.mwlabs.wst11.at.remote.TransactionManagerImple</entry>
+ <entry key="org.jboss.jbossts.xts11.wsba.BusinessActivityManager">com.arjuna.mwlabs.wst11.ba.remote.BusinessActivityManagerImple</entry>
+
+ <!-- protocol mappings.
+
+ these are used in the coordinator container only to determine
+ which classes to use to implement the coordination
+ services. they are used to establish mappings from
+ coordination service types to their implementation classes and
+ from coordination types to coordination context factories.
+ they will not normally be reconfigured since this also
+ requires providing alternative implementations.
+
+ if you are deploying XTS to a client or participant (web
+ service) container which uses a coordinator located in
+ a remote container then you can omit these properties and
+ no coordinator implementations will be loaded.
+
+ coordination service implementation classes must be tagged
+ with an HLSProvider annotation identifying the implemented
+ service type. the annotation must also declare the
+ coordination type of the coordination protocol supported by
+ the service.
+
+ context factory classes must be tagged with a ContextProvider
+ annotation identifying the coordination type and
+ implementation class of the contexts created by the
+ factory. the annotation must also declare the service type
+ for which the context is appropriate.
+ -->
+
+ <!-- protocol definitions for 1.1 implementation
+ first the HLS services and then the context factories
+ -->
+ <entry key="org.jboss.jbossts.xts.protocolImplementation1">com.arjuna.mwlabs.wscf11.model.twophase.arjunacore.TwoPhaseHLSImple</entry>
+ <entry key="org.jboss.jbossts.xts.protocolImplementation2">com.arjuna.mwlabs.wscf11.model.sagas.arjunacore.SagasHLSImple</entry>
+ <entry key="org.jboss.jbossts.xts.protocolImplementation3">com.arjuna.mwlabs.wst11.at.ContextFactoryImple</entry>
+ <entry key="org.jboss.jbossts.xts.protocolImplementation4">com.arjuna.mwlabs.wst11.ba.ContextFactoryImple</entry>
+
+ <!-- XTS recovery modules to be deployed either in the coordinator or participant. you should
+ never need to change these values or add new ones. howver you may want to remove participant modules
+ if you are only deploying coordinator services or remove coordinator modules if you are only deploying
+ participant services. If you are only deploying a client then you can remove all these modules.
+
+ Note that these are the modules which implement XTS recovery and are not the same as the application
+ defined recovery modules registered by participant web services. The latter are called when the AT and BA
+ participant modules in the list below get run.
+
+ n.b. the 1.0 and 1.1 implementations both use the same recovery module.
+ -->
+
+ <entry key="org.jboss.jbossts.xts.recovery.coordinatorRecoveryModule1">org.jboss.jbossts.xts.recovery.coordinator.at.ATCoordinatorRecoveryModule</entry>
+ <entry key="org.jboss.jbossts.xts.recovery.coordinatorRecoveryModule2">org.jboss.jbossts.xts.recovery.coordinator.at.SubordinateATCoordinatorRecoveryModule</entry>
+ <entry key="org.jboss.jbossts.xts.recovery.coordinatorRecoveryModule3">org.jboss.jbossts.xts.recovery.coordinator.ba.BACoordinatorRecoveryModule</entry>
+ <entry key="org.jboss.jbossts.xts.recovery.coordinatorRecoveryModule4">org.jboss.jbossts.xts.recovery.coordinator.ba.SubordinateBACoordinatorRecoveryModule</entry>
+
+ <entry key="org.jboss.jbossts.xts.recovery.participantRecoveryModule1">org.jboss.jbossts.xts.recovery.participant.at.ATParticipantRecoveryModule</entry>
+ <entry key="org.jboss.jbossts.xts.recovery.participantRecoveryModule2">org.jboss.jbossts.xts.recovery.participant.ba.BAParticipantRecoveryModule</entry>
+
+ <!-- initialisations
+ these are classes which implement the startup and shutdown operations defined by the XTSInitialisation lifecycle
+ interface. For 1.1 here are 3 such classes performing all initialisation relevant to the coordinator side, participant
+ side and client side services. You may want to delete some of these entries if you only wish to deploy a subset
+ of the 1.1 XTS services.
+ -->
+ <entry key="org.jboss.jbossts.xts.initialisation.xtsInitialisation_1">org.jboss.jbossts.xts.initialisation.CoordinatorSideInitialisation</entry>
+ <entry key="org.jboss.jbossts.xts.initialisation.xtsInitialisation_2">org.jboss.jbossts.xts.initialisation.ParticipantSideInitialisation</entry>
+ <entry key="org.jboss.jbossts.xts.initialisation.xtsInitialisation_3">org.jboss.jbossts.xts.initialisation.ClientSideInitialisation</entry>
+
+ <!--
+ if you are deploying XTS outside of JBoss then you may not be able to map the WS-C and WS-T service
+ endpoints to the same URLs as those employed by JBossWS. The services need to know where the endpoints
+ have been mapped because they need to insert their endpoint URLs into protocol messages. The following
+ properties can be set to identify the URL path element of the service. So, for example, with these
+ configuration settings the default URL for the WS-T Participant service
+ http://<webhost>:<webport>/ws-t11-participant/ParticipantService would be remapped to
+ http://<webhost>:<webport>/participant/services/ParticipantService. These properties are normally
+ left unset so that the JBoss default URLs are employed.
+ <entry key="org.jboss.jbossts.xts11.wsc.serviceURLPath.">/coord/services</entry>
+ <entry key="org.jboss.jbossts.xts11.wst.coordinatorServiceURLPath.">/coord/services</entry>
+ <entry key="org.jboss.jbossts.xts11.wst.clientServiceURLPath.">/client/services</entry>
+ <entry key="org.jboss.jbossts.xts11.wst.participantServiceURLPath.">/participant/services</entry>
+ -->
+
+</properties>
Modified: labs/jbosstm/trunk/XTS/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/XTS/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -24,6 +24,18 @@
<packaging>pom</packaging>
<name>xts all</name>
<description>xts all</description>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<modules>
<module>WSAS</module>
<module>WS-C</module>
@@ -35,7 +47,7 @@
<module>sar</module>
<module>demo</module>
<module>docs</module>
- <module>jbossxts-api</module>
+ <module>jbossxts</module>
<module>localjunit</module>
<module>dist</module>
</modules>
Modified: labs/jbosstm/trunk/XTS/recovery/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/XTS/recovery/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -33,6 +33,11 @@
</dependency>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>ws-t</artifactId>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
<artifactId>wscf</artifactId>
</dependency>
</dependencies>
Modified: labs/jbosstm/trunk/XTS/sar/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/XTS/sar/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -19,41 +19,12 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jbossxts-sar</artifactId>
+ <artifactId>service</artifactId>
<packaging>jar</packaging>
<name>xts sar</name>
<description>xts sar</description>
<build>
<sourceDirectory>src</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>my-sar</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>assembly/sar.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.2</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
</build>
<dependencies>
<dependency>
@@ -66,10 +37,6 @@
</dependency>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
- <artifactId>jbossxts-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.xts</groupId>
<artifactId>ws-c</artifactId>
</dependency>
<dependency>
Modified: labs/jbosstm/trunk/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/trunk/build-release-pkgs.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/build-release-pkgs.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -72,28 +72,22 @@
<!--
<property name="svnbase" value="https://svn.jboss.org/repos/labs/labs/jbosstm"/>
<property name="tag" value="trunk"/>
- <property name="filename" value="5.0.0-SNAPSHOT"/>
- <property name="mvn.repositoryId" value="jboss-snapshots-repository"/>
- <property name="mvn.repo.url" value="https://repository.jboss.org/nexus/content/repositories/snapshots/"/>
+ <property name="version" value="5.0.0-SNAPSHOT"/>
-->
<!-- a working directory for the process. Can contain output from previous releases if you like to keep them archived locally. -->
<property name="workdir" location="/tmp/packaged_builds"/>
<!-- where to get the source -->
- <property name="svnbase" value="https://svn.jboss.org/repos/labs/labs/jbosstm/tags"/>
+ <property name="svnbase" value="https://svn.jboss.org/repos/labs/labs/jbosstm"/>
<!-- The tag as it appears under svnbase -->
- <property name="tag" value="JBOSSTS_5_0_0_M1-SNAPSHOT"/>
+ <property name="tag" value="trunk"/>
<!-- The file name base for the user downloadable files. Derive it from the tag -->
- <property name="filename" value="5.0.0.M1-SNAPSHOT"/>
+ <property name="version" value="5.0.0.M1-SNAPSHOT"/>
<!-- the location the JBossTS web site content is copied to -->
- <property name="downloads.dir" value="/home/jhalli/IdeaProjects/jboss/filemgmt.jboss.org/downloads_htdocs/jbosstm/"/>
- <!-- the mvn repo to upload to -->
- <property name="mvn.repo.url" value="https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/"/>
+ <property name="downloads.dir" value="${user.home}/filemgmt.jboss.org/downloads_htdocs/jbosstm/"/>
<!-- you probably don't need to change anything below here -->
- <property name="mvn.repositoryId" value="jboss-releases-repository"/>
-
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath>
<pathelement location="./antbuildsystem/ant-contrib-1.0b3.jar"/>
@@ -114,73 +108,38 @@
</exec>
<!-- package the full source release (all src tree) -->
- <delete file="${workdir}/jbossts-full-${filename}-src.zip"/>
- <zip basedir="${workdir}" destfile="${workdir}/jbossts-full-${filename}-src.zip"
+ <delete file="${workdir}/jbossts-full-${version}-src.zip"/>
+ <zip basedir="${workdir}" destfile="${workdir}/jbossts-full-${version}-src.zip"
includes="${tag}/**"/>
<!-- package the JTA only src tree (no JTS, XTS) -->
- <delete file="${workdir}/jbossts-jta-${filename}-src.zip"/>
- <zip basedir="${workdir}" destfile="${workdir}/jbossts-jta-${filename}-src.zip"
+ <delete file="${workdir}/jbossts-jta-${version}-src.zip"/>
+ <zip basedir="${workdir}" destfile="${workdir}/jbossts-jta-${version}-src.zip"
includes="${tag}/**"
excludes="${tag}/ArjunaJTS/**, ${tag}/XTS/** ${tag}/txbridge/**"/>
- <!-- build the JTA only binary release -->
- <delete dir="${workdir}/build"/>
- <mkdir dir="${workdir}/build"/>
- <unzip src="${workdir}/jbossts-jta-${filename}-src.zip" dest="${workdir}/build"/>
- <ant dir="${workdir}/build/${tag}" antfile="build.xml" target="jbossjta">
- <property name="com.hp.mw.sourceid" value="${tag}"/>
- </ant>
-
- <!-- package the JTA only binary release -->
- <copy todir="${workdir}/build/${tag}/${tag}">
- <fileset dir="${workdir}/build/${tag}/install"/>
- </copy>
- <delete file="${workdir}/jbossts-jta-${filename}.zip"/>
- <zip basedir="${workdir}/build/${tag}" destfile="${workdir}/jbossts-jta-${filename}.zip"
- includes="${tag}/**"/>
-
- <!-- build the full release (assumes XTS builds against JTS) -->
- <delete dir="${workdir}/build"/>
- <mkdir dir="${workdir}/build"/>
- <unzip src="${workdir}/jbossts-full-${filename}-src.zip" dest="${workdir}/build"/>
- <ant dir="${workdir}/build/${tag}" antfile="build.xml" target="jbossjts">
- <property name="com.hp.mw.sourceid" value="${tag}"/>
- </ant>
-
- <ant dir="${workdir}/build/${tag}/XTS" antfile="build.xml" target="install">
- <!-- build the 1.1 jbossxts jars and test apps) -->
- </ant>
-
- <ant dir="${workdir}/build/${tag}/txbridge" antfile="build.xml" target="dist"/>
-
- <ant dir="${workdir}/build/${tag}/rhq-plugin" antfile="build.xml" target="dist">
- <property name="version" value="${filename}"/>
- </ant>
-
- <!-- package the full release -->
- <copy todir="${workdir}/build/${tag}/${tag}">
- <fileset dir="${workdir}/build/${tag}/install"/>
- </copy>
- <copy todir="${workdir}/build/${tag}/${tag}/xts">
- <fileset dir="${workdir}/build/${tag}/XTS/xts-install"/>
- </copy>
- <delete file="${workdir}/jbossts-full-${filename}.zip"/>
- <zip basedir="${workdir}/build/${tag}" destfile="${workdir}/jbossts-full-${filename}.zip"
- includes="${tag}/**"/>
+ <!-- build the binary releases -->
+ <exec dir="${workdir}/${tag}" executable="mvn">
+ <arg line="deploy -DskipTests"/>
+ </exec>
</target>
<!-- copy the release into the downloads dir tree (http://www.jboss.org/jbosstm web site content) -->
<target name="downloads" description="copy release bundles to JBossTS web site content">
- <mkdir dir="${downloads.dir}/${filename}"/>
- <mkdir dir="${downloads.dir}/${filename}/src"/>
- <mkdir dir="${downloads.dir}/${filename}/binary"/>
- <mkdir dir="${downloads.dir}/${filename}/notes"/>
- <copy todir="${downloads.dir}/${filename}/src">
- <fileset dir="${workdir}" includes="jbossts-*-${filename}-src.zip"/>
+ <fail>
+ <not>
+ <available dir="${downloads.dir}"/>
+ </not>
+ </fail>
+ <mkdir dir="${downloads.dir}/${version}"/>
+ <mkdir dir="${downloads.dir}/${version}/src"/>
+ <mkdir dir="${downloads.dir}/${version}/binary"/>
+ <mkdir dir="${downloads.dir}/${version}/notes"/>
+ <copy todir="${downloads.dir}/${version}/src">
+ <fileset dir="${workdir}" includes="jbossts-*-${version}-src.zip"/>
</copy>
- <copy todir="${downloads.dir}/${filename}/binary">
- <fileset dir="${workdir}" includes="jbossts-*-${filename}.zip"/>
+ <copy todir="${downloads.dir}/${version}/binary">
+ <fileset dir="${workdir}" includes="jbossts-*-${version}.zip"/>
</copy>
<!-- TODO: notes dir, xml generation? project.xml edits -->
</target>
@@ -188,136 +147,21 @@
<!-- copy the release artifacts to the maven repository -->
<target name="mvn-repository" description="copy the release artifacts to the maven repository">
- <!-- we use ant rather than maven for the build, so we just take the built artifacts
- and use mvn to deploy them to the repo. The pom is shared by all artifacts,
- with ant pre-processing being used to substitute in appropriate values.
- TODO: when we add in proper dependency info we may wind up needing separate
- poms for each artifact with a shared parent for common info -->
- <!-- http://community.jboss.org/wiki/MavenGettingStarted-Developers
- http://community.jboss.org/wiki/MavenDeployingaRelease -->
- <delete dir="${workdir}/build"/>
- <mkdir dir="${workdir}/build"/>
- <unzip src="${workdir}/jbossts-jta-${filename}.zip" dest="${workdir}/build"/>
-
- <!-- jta -->
-
- <mvn-artifact.macro artifact="jbossjta" dir="${workdir}/build/${tag}/lib"/>
- <mvn-artifact.macro artifact="jbossjta-integration" dir="${workdir}/build/${tag}/lib"/>
-
-
- <delete dir="${workdir}/build"/>
- <mkdir dir="${workdir}/build"/>
- <unzip src="${workdir}/jbossts-full-${filename}.zip" dest="${workdir}/build"/>
-
- <!-- jts -->
-
- <mvn-artifact.macro artifact="jbossjts" dir="${workdir}/build/${tag}/lib"/>
- <mvn-artifact.macro artifact="jbossjts-integration" dir="${workdir}/build/${tag}/lib"/>
-
- <!-- tools -->
-
- <mvn-artifact.macro artifact="jbossts-tools" packaging="sar"
- dir="${workdir}/build/${tag}/bin"/>
- <mvn-artifact.macro artifact="jbossts-jopr-plugin" packaging="jar"
- dir="${workdir}/build/${tag}/bin"/>
-
<!-- xts -->
- <delete dir="${workdir}/build"/>
- <mkdir dir="${workdir}/build"/>
- <unzip src="${workdir}/jbossts-full-${filename}.zip" dest="${workdir}/build"/>
- <mvn-artifact.macro artifact="jbossxts" packaging="jar"
- dir="${workdir}/build/${tag}/xts/lib"/>
- <mvn-artifact.macro artifact="jbossxts-api" packaging="jar"
- dir="${workdir}/build/${tag}/xts/lib"/>
<mvn-artifact.macro artifact="jbossxts-tests" packaging="zip"
dir="${workdir}/build/${tag}/xts/tests"/>
<mvn-artifact.macro artifact="jbossxts-interop-tests" packaging="zip"
dir="${workdir}/build/${tag}/xts/interop-tests"/>
- <!-- txbridge -->
- <mvn-artifact.macro artifact="jbosstxbridge" packaging="jar"
- dir="${workdir}/build/${tag}/txbridge"/>
-
</target>
- <!-- macro to process a pom template into an actual pom and use it with mvn deploy-file to upload to the repo -->
- <!-- http://community.jboss.org/wiki/MavenDeployingaRelease -->
- <macrodef name="mvn-artifact.macro">
-
- <attribute name="artifact"/>
- <attribute name="dir"/>
- <attribute name="packaging" default="jar"/>
-
- <sequential>
-
- <property name="groupid" value="org.jboss.jbossts"/>
-
- <if>
- <not>
- <available file="@{dir}/@{artifact}-sources.jar"/>
- </not>
- <then>
- <touch file="@{dir}/@{artifact}-sources.txt"/>
- <jar destfile="@{dir}/@{artifact}-sources.jar">
- <include name="@{dir}/@{artifact}-sources.txt"/>
- </jar>
- </then>
- </if>
-
- <!-- where a -sources.jar exists, upload it first as we need the latter binary .jar to overwrite the
- generated pom due to the requirement for working around http://jira.codehaus.org/browse/MDEPLOY-48
- which is also the same reason we need to mess around with uniqueVersion=false /sigh. -->
- <if>
- <available file="@{dir}/@{artifact}-sources.jar"/>
- <then>
- <exec executable="mvn" dir="${workdir}">
- <arg value="deploy:deploy-file"/>
- <arg value="-Dfile=@{dir}/@{artifact}-sources.jar"/>
- <arg value="-DrepositoryId=${mvn.repositoryId}"/>
- <arg value="-Durl=${mvn.repo.url}"/>
-
- <arg value="-DgroupId=${groupid}"/>
- <arg value="-DartifactId=@{artifact}"/>
- <!--<arg value="-DgeneratePom=false"/> disable this due to MDEPLOY-48-->
- <arg value="-Dclassifier=sources"/>
- <arg value="-Dpackaging=java-source"/>
- <arg value="-Dversion=${filename}"/>
- <arg value="-DuniqueVersion=false"/>
- </exec>
- </then>
- </if>
-
- <copy file="${workdir}/${tag}/maven/pom-template.xml"
- tofile="${workdir}/build/${tag}/pom-@{artifact}.xml"
- filtering="true">
- <filterset>
- <filter token="groupid" value="${groupid}"/>
- <filter token="artifact" value="@{artifact}"/>
- <filter token="version" value="${filename}"/>
- <filter token="packaging" value="@{packaging}"/>
- </filterset>
- </copy>
-
- <exec executable="mvn" dir="${workdir}">
- <arg value="deploy:deploy-file"/>
- <arg value="-Dfile=@{dir}/@{artifact}.@{packaging}"/>
- <arg value="-DrepositoryId=${mvn.repositoryId}"/>
- <arg value="-Durl=${mvn.repo.url}"/>
- <arg value="-DpomFile=${workdir}/build/${tag}/pom-@{artifact}.xml"/>
- <arg value="-DuniqueVersion=false"/>
- </exec>
-
- </sequential>
-
- </macrodef>
-
<!-- magnolia (the cms that sits behind jboss.org/jbosstm pages) is a pain. This target generates
xml for /downloads/somerelease.xml pages to ease some of the pain in publishing an upload
right click jbosstm/downloads node, import from xml, then right click new node and activate.
@@ -329,18 +173,18 @@
<arg line="+'%FT%H:%M:%S.000Z'"/>
</exec>
- <length property="jta-src-length" file="${workdir}/jbossts-jta-${filename}-src.zip"/>
- <length property="full-src-length" file="${workdir}/jbossts-full-${filename}-src.zip"/>
- <length property="jta-bin-length" file="${workdir}/jbossts-jta-${filename}.zip"/>
- <length property="full-bin-length" file="${workdir}/jbossts-full-${filename}.zip"/>
+ <length property="jta-src-length" file="${workdir}/jbossts-jta-${version}-src.zip"/>
+ <length property="full-src-length" file="${workdir}/jbossts-full-${version}-src.zip"/>
+ <length property="jta-bin-length" file="${workdir}/jbossts-jta-${version}.zip"/>
+ <length property="full-bin-length" file="${workdir}/jbossts-full-${version}.zip"/>
<copy file="magnolia-release-download-page-template.xml"
- tofile="${workdir}/website.jbosstm.downloads.${filename}.xml"
+ tofile="${workdir}/website.jbosstm.downloads.${version}.xml"
filtering="true"
overwrite="true">
<filterset>
<filter token="tag" value="${tag}"/>
- <filter token="filename" value="${filename}"/>
+ <filter token="version" value="${version}"/>
<filter token="date" value="${date}"/>
<filter token="jta-src-length" value="${jta-src-length}"/>
<filter token="full-src-length" value="${full-src-length}"/>
Modified: labs/jbosstm/trunk/common/pom.xml
===================================================================
--- labs/jbosstm/trunk/common/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/common/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -26,7 +26,15 @@
<testSourceDirectory>tests</testSourceDirectory>
<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.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
Modified: labs/jbosstm/trunk/pom.xml
===================================================================
--- labs/jbosstm/trunk/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -156,6 +156,13 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
<version>2.3.5</version>
@@ -208,6 +215,14 @@
</pluginManagement>
<plugins>
<plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
@@ -579,13 +594,24 @@
</dependency>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
- <artifactId>jbossxts-api</artifactId>
+ <artifactId>bridge</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
- <artifactId>jbossxts-api</artifactId>
+ <artifactId>jbossxts</artifactId>
<version>${project.version}</version>
+ <classifier>api</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>jbossxts</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>jbossxts</artifactId>
+ <version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
@@ -605,10 +631,8 @@
</dependency>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
- <artifactId>jbossxts-sar</artifactId>
+ <artifactId>service</artifactId>
<version>${project.version}</version>
- <classifier>sar</classifier>
- <type>sar</type>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
@@ -628,6 +652,31 @@
<version>1.0.0.Beta6</version>
<!-- TODO AS7 -->
</dependency>
+ <dependency>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman-install</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman-submit</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman-bmunit</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman-dtest</artifactId>
+ <version>1.5.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Modified: labs/jbosstm/trunk/rest-tx/quickstarts/pom.xml
===================================================================
--- labs/jbosstm/trunk/rest-tx/quickstarts/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/rest-tx/quickstarts/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -41,6 +41,13 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Modified: labs/jbosstm/trunk/rhq-plugin/build.xml
===================================================================
--- labs/jbosstm/trunk/rhq-plugin/build.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/rhq-plugin/build.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -15,12 +15,6 @@
<property name="plugindocjar" value="${modulename}-javadoc.jar"/>
<target name="maven:package" depends="clean">
-
- <exec executable="mvn" dir="../">
- <arg value="install"/>
- <arg value="-DTS_EMMA_JAR=/"/>
- </exec>
-
<exec executable="mvn" dir="${basedir}">
<arg value="-Dversion=${version}"/>
<arg value="-DartifactId=${modulename}"/>
Modified: labs/jbosstm/trunk/rhq-plugin/pom.xml
===================================================================
--- labs/jbosstm/trunk/rhq-plugin/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/rhq-plugin/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -40,7 +40,15 @@
<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.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/sharedbuild.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -501,29 +501,6 @@
</copy>
<mkdir dir="${build.dir}/testresults"/>
- <junit printsummary="yes" fork="yes" dir="${build.dir}" showoutput="@{showoutput}" includeantruntime="true">
- <formatter type="plain"/>
- <classpath>
- <pathelement location="etc"/>
- <pathelement location="${build.dir}/lib/${modulename}.jar"/>
- <pathelement location="${build.dir}/classes/"/>
- <pathelement location="${build.dir}/tests/"/>
- <fileset dir="${build.dir}/lib/ext/" includes="*"/>
- <fileset dir="${basedir}" includes="${lib.dir}/ext/*"/>
- <fileset dir="${global.ext.lib.dir}" includes="${global.ext.libs}"/>
- <fileset dir="${global.ext.lib.dir}" includes="${global.ext.test.libs}"/>
- <fileset dir="${global.ext.lib.dir}" includes="jboss-logging.jar,log4j.jar"/>
- <additional.classpath.aux/>
- <path refid="emma.lib" />
- <path refid="byteman.lib" />
- </classpath>
-
- <batchtest haltonerror="yes" haltonfailure="yes" fork="yes" todir="${build.dir}/testresults">
- <tests.aux/>
- </batchtest>
-
- <additional.jvmargs.aux/>
- </junit>
</sequential>
</macrodef>
Modified: labs/jbosstm/trunk/txbridge/pom.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/pom.xml 2011-08-01 13:36:38 UTC (rev 37322)
+++ labs/jbosstm/trunk/txbridge/pom.xml 2011-08-01 20:44:10 UTC (rev 37323)
@@ -41,7 +41,15 @@
</testResources>
<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.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- DOES NOT WORK ON AS7 -->
More information about the jboss-svn-commits
mailing list