[jboss-svn-commits] JBL Code SVN: r37342 - in labs/jbosstm/trunk: ArjunaCore and 48 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 3 11:01:00 EDT 2011
Author: tomjenkinson
Date: 2011-08-03 11:00:59 -0400 (Wed, 03 Aug 2011)
New Revision: 37342
Added:
labs/jbosstm/trunk/dist/readme.txt
Removed:
labs/jbosstm/trunk/ext/jcommon-1.0.10.jar
labs/jbosstm/trunk/ext/jfreechart-1.0.6.jar
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml
labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
labs/jbosstm/trunk/ArjunaCore/docs/development_guide/pom.xml
labs/jbosstm/trunk/ArjunaCore/docs/failure_recovery_guide/pom.xml
labs/jbosstm/trunk/ArjunaCore/pom.xml
labs/jbosstm/trunk/ArjunaCore/quickstarts/pom.xml
labs/jbosstm/trunk/ArjunaCore/quickstarts/txoj/pom.xml
labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml
labs/jbosstm/trunk/ArjunaJTA/docs/administration_guide/pom.xml
labs/jbosstm/trunk/ArjunaJTA/docs/development_guide/pom.xml
labs/jbosstm/trunk/ArjunaJTA/docs/installation_guide/pom.xml
labs/jbosstm/trunk/ArjunaJTA/docs/quick_start/pom.xml
labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml
labs/jbosstm/trunk/ArjunaJTA/jdbc/pom.xml
labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml
labs/jbosstm/trunk/ArjunaJTA/narayana-jta/pom.xml
labs/jbosstm/trunk/ArjunaJTA/pom.xml
labs/jbosstm/trunk/ArjunaJTA/quickstarts/jee_transactional_app/pom.xml
labs/jbosstm/trunk/ArjunaJTA/quickstarts/maven/pom.xml
labs/jbosstm/trunk/ArjunaJTA/quickstarts/pom.xml
labs/jbosstm/trunk/ArjunaJTA/quickstarts/recovery/pom.xml
labs/jbosstm/trunk/ArjunaJTS/docs/administration_guide/pom.xml
labs/jbosstm/trunk/ArjunaJTS/docs/development_guide/pom.xml
labs/jbosstm/trunk/ArjunaJTS/docs/orbportability/pom.xml
labs/jbosstm/trunk/ArjunaJTS/docs/quick_start/pom.xml
labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml
labs/jbosstm/trunk/ArjunaJTS/narayana-jts/pom.xml
labs/jbosstm/trunk/ArjunaJTS/orbportability/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/WSAS/wsas/pom.xml
labs/jbosstm/trunk/XTS/WSCF/wscf/pom.xml
labs/jbosstm/trunk/XTS/WSTX/wstx/pom.xml
labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml
labs/jbosstm/trunk/XTS/jbossxts/pom.xml
labs/jbosstm/trunk/XTS/recovery/pom.xml
labs/jbosstm/trunk/dist/pom.xml
labs/jbosstm/trunk/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/pom.xml
labs/jbosstm/trunk/rest-tx/pom.xml
labs/jbosstm/trunk/rest-tx/quickstarts/pom.xml
labs/jbosstm/trunk/rest-tx/quickstarts/recovery/pom.xml
labs/jbosstm/trunk/rest-tx/quickstarts/service/pom.xml
labs/jbosstm/trunk/rest-tx/quickstarts/simple/pom.xml
labs/jbosstm/trunk/txbridge/pom.xml
Log:
include the jdocbook artifacts in the distribution by using the dependency mechanism, make sure that the logger is marked as provided so its not put in the rest-tx war, added a readme.txt for the distribution
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -139,11 +139,9 @@
<systemPath>${project.basedir}/../../ext/orson-0.5.0.jar</systemPath>
</dependency>
<dependency>
- <groupId>jfreechart</groupId>
+ <groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
- <version>1.0.6</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/../../ext/jfreechart-1.0.6.jar</systemPath>
+ <version>1.0.9</version>
</dependency>
<dependency>
<groupId>oracle.java</groupId>
@@ -152,5 +150,20 @@
<scope>system</scope>
<systemPath>${env.JAVA_HOME}/lib/jconsole.jar</systemPath>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -146,5 +146,20 @@
<groupId>org.jboss.narayana.arjunacore</groupId>
<artifactId>txoj</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/ArjunaCore/docs/development_guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/docs/development_guide/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaCore/docs/development_guide/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -19,7 +19,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>arjunacore-dev-guide</artifactId>
+ <artifactId>development-guide</artifactId>
<name>ArjunaCore devguide module</name>
<description>arjunacore dev guide</description>
<packaging>jdocbook</packaging>
Modified: labs/jbosstm/trunk/ArjunaCore/docs/failure_recovery_guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/docs/failure_recovery_guide/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaCore/docs/failure_recovery_guide/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -19,7 +19,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>arjunacore-fail-guide</artifactId>
+ <artifactId>failure-recovery-guide</artifactId>
<name>arjunacore failure guide</name>
<description>arjunacore failure guide</description>
<packaging>jdocbook</packaging>
Modified: labs/jbosstm/trunk/ArjunaCore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaCore/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -42,5 +42,6 @@
<module>txoj</module>
<module>arjunacore</module>
<module>docs</module>
+ <module>quickstarts</module>
</modules>
</project>
Modified: labs/jbosstm/trunk/ArjunaCore/quickstarts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/quickstarts/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaCore/quickstarts/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -20,6 +20,18 @@
</snapshots>
</repository>
</repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<modules>
<module>txoj</module>
</modules>
Modified: labs/jbosstm/trunk/ArjunaCore/quickstarts/txoj/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/quickstarts/txoj/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaCore/quickstarts/txoj/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -25,14 +25,6 @@
<description>TXOJ example</description>
<build>
<plugins>
- <!-- This plugin allows our example to be tested -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <workingDirectory>${project.build.directory}/surefire-working-directory</workingDirectory>
- </configuration>
- </plugin>
<!-- This plugin allows our example to be executed by maven -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -58,15 +50,9 @@
</build>
<dependencies>
<dependency>
- <groupId>org.jboss.jbossts</groupId>
- <artifactId>narayana-jta</artifactId>
- <version>4.15.1.Final</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.jboss.narayana.arjunacore</groupId>
+ <artifactId>arjunacore</artifactId>
+ <version>5.0.0.M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -97,5 +97,20 @@
<version>4.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTA/docs/administration_guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/docs/administration_guide/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTA/docs/administration_guide/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -19,7 +19,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>narayana-jta-admin-guide</artifactId>
+ <artifactId>administration-guide</artifactId>
<name>jta admin guide</name>
<description>jta admin guide</description>
<packaging>jdocbook</packaging>
Modified: labs/jbosstm/trunk/ArjunaJTA/docs/development_guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/docs/development_guide/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTA/docs/development_guide/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -19,7 +19,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>narayana-jta-dev-guide</artifactId>
+ <artifactId>development-guide</artifactId>
<name>JBossJTA devguide module</name>
<description>jta devguide</description>
<packaging>jdocbook</packaging>
Modified: labs/jbosstm/trunk/ArjunaJTA/docs/installation_guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/docs/installation_guide/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTA/docs/installation_guide/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -19,7 +19,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>narayana-jta-install-guide</artifactId>
+ <artifactId>installation-guide</artifactId>
<name>jta install guide</name>
<description>jta install guide</description>
<packaging>jdocbook</packaging>
Modified: labs/jbosstm/trunk/ArjunaJTA/docs/quick_start/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/docs/quick_start/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTA/docs/quick_start/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -19,7 +19,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>narayana-jta-quickstart-guide</artifactId>
+ <artifactId>quick-start-guide</artifactId>
<name>jta quickstart</name>
<description>jta quickstart</description>
<packaging>jdocbook</packaging>
Modified: labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -62,5 +62,20 @@
<!-- TODO AS7 -->
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -67,5 +67,20 @@
<version>4.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -128,5 +128,20 @@
<artifactId>byteman-bmunit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTA/narayana-jta/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/narayana-jta/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTA/narayana-jta/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -158,5 +158,20 @@
<groupId>org.jboss.narayana.jta</groupId>
<artifactId>jdbc</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTA/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTA/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -42,5 +42,6 @@
<module>narayana-jta</module>
<module>docs</module>
<module>integration</module>
+ <module>quickstarts</module>
</modules>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTA/quickstarts/jee_transactional_app/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/jee_transactional_app/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/jee_transactional_app/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -11,89 +11,97 @@
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) 2009 -->
-<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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.narayana.jta.quickstarts</groupId>
- <artifactId>jee_transactional_app</artifactId>
- <version>5.0.0.M1-SNAPSHOT</version>
- <name>basic integration example</name>
- <description>basic integration example</description>
- <packaging>war</packaging>
- <repositories>
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
- <properties>
- <!-- For arquillian -->
- <jbossHome>${env.JBOSS_HOME}</jbossHome>
- </properties>
-
- <build>
- <finalName>${pom.artifactId}</finalName>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
- <failOnMissingWebXml>false</failOnMissingWebXml>
- <archive>
- <manifestEntries>
- <Dependencies>org.jboss.jts</Dependencies>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <!-- JBoss AS plugin to deploy war as a convenience -->
- <plugin>
- <groupId>org.jboss.as.plugins</groupId>
- <artifactId>jboss-as-maven-plugin</artifactId>
- <version>7.0.0.CR1</version>
- </plugin>
- <!-- Compiler plugin enforces Java 1.6 compatibility and activates annotation
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.narayana.jta.quickstarts</groupId>
+ <artifactId>jee_transactional_app</artifactId>
+ <version>5.0.0.M1-SNAPSHOT</version>
+ <name>basic integration example</name>
+ <description>basic integration example</description>
+ <packaging>war</packaging>
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ <properties>
+ <!-- For arquillian -->
+ <jbossHome>${env.JBOSS_HOME}</jbossHome>
+ </properties>
+ <build>
+ <finalName>${pom.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ <archive>
+ <manifestEntries>
+ <Dependencies>org.jboss.jts</Dependencies>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <!-- JBoss AS plugin to deploy war as a convenience -->
+ <plugin>
+ <groupId>org.jboss.as.plugins</groupId>
+ <artifactId>jboss-as-maven-plugin</artifactId>
+ <version>7.0.0.CR1</version>
+ </plugin>
+ <!-- Compiler plugin enforces Java 1.6 compatibility and activates annotation
processors -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencyManagement>
- <dependencies>
- <!-- Define the version of JBoss' Java EE 6 APIs we want to import. Any
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Define the version of JBoss' Java EE 6 APIs we want to import. Any
dependencies from org.jboss.spec will have their version defined by this
BOM -->
- <!-- JBoss distributes a complete set of Java EE 6 APIs including a Bill
+ <!-- JBoss distributes a complete set of Java EE 6 APIs including a Bill
of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
of artifacts. We use this here so that we always get the correct versions
of artifacts. Here we use the jboss-javaee-web-6.0 stack (you can read this
@@ -101,131 +109,150 @@
2.0.0.Beta1 which is the latest release of the stack. You can actually use
this stack with any version of JBoss AS that implements Java EE 6, not just
JBoss AS 7! -->
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-web-6.0</artifactId>
- <version>2.0.0.CR1</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <!-- Import the JPA API, we use provided scope as the API is included in
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-web-6.0</artifactId>
+ <version>2.0.0.CR1</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <!-- Import the JPA API, we use provided scope as the API is included in
JBoss AS 7 -->
- <dependency>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Import the JSF API, we use provided scope as the API is included in
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Import the JSF API, we use provided scope as the API is included in
JBoss AS 7 -->
- <dependency>
- <groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Import the JPA API, we use provided scope as the API is included in
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Import the JPA API, we use provided scope as the API is included in
JBoss AS 7 -->
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Import the EJB API, we use provided scope as the API is included in
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Import the EJB API, we use provided scope as the API is included in
JBoss AS 7 -->
- <dependency>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Import the CDI API, we use provided scope as the API is included in
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Import the CDI API, we use provided scope as the API is included in
JBoss AS 7 -->
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- For the txoj -->
- <dependency>
- <groupId>org.jboss.jbossts</groupId>
- <artifactId>narayana-jta</artifactId>
- <version>4.15.1.Final</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Import the injection annotations -->
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- We will provide some tests to check the quickstart deploys ok -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Arquillian allows you to test the example inside a container -->
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>1.0.0.CR1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <!-- An optional Arquillian testing profile that executes tests in your
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- For the txoj -->
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>jbossjta</artifactId>
+ <version>4.15.1.Final</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- Import the injection annotations -->
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- We will provide some tests to check the quickstart deploys ok -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- Arquillian allows you to test the example inside a container -->
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <version>1.0.0.CR1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <!-- The default profile skips all tests, though you can tune it
+ to run just unit tests based on a custom pattern -->
+ <!-- Seperate profiles are provided for running all tests, including
+ Arquillian tests that execute in the specified container -->
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.7.2</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <!-- The JBoss AS plugin deploys your war to a local JBoss
+ AS container -->
+ <!-- To use, set the JBOSS_HOME environment variable and run:
+ mvn package jboss-as:deploy -->
+ <plugin>
+ <groupId>org.jboss.as.plugins</groupId>
+ <artifactId>jboss-as-maven-plugin</artifactId>
+ <version>7.0.0.CR1</version>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!-- An optional Arquillian testing profile that executes tests in your
JBoss AS instance -->
- <!-- This profile will start a new JBoss AS instance, and execute the
+ <!-- This profile will start a new JBoss AS instance, and execute the
test, shutting it down when done -->
- <!-- Run with: mvn clean test -Parq-jbossas-managed -->
- <id>arq-jbossas-managed</id>
- <!-- Launch this profile by default -->
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-arquillian-container-managed</artifactId>
- <version>7.0.0.CR1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <!-- An optional Arquillian testing profile that executes tests in a remote
+ <!-- Run with: mvn clean test -Parq-jbossas-managed -->
+ <id>arq-jbossas-managed</id>
+ <!-- Launch this profile by default -->
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-managed</artifactId>
+ <version>7.0.0.CR1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <!-- An optional Arquillian testing profile that executes tests in a remote
JBoss AS instance -->
- <!-- Run with: mvn clean test -Parq-jbossas-remote -->
- <id>arq-jbossas-remote</id>
- <dependencies>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-arquillian-container-remote</artifactId>
- <version>7.0.0.CR1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+ <!-- Run with: mvn clean test -Parq-jbossas-remote -->
+ <id>arq-jbossas-remote</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-remote</artifactId>
+ <version>7.0.0.CR1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTA/quickstarts/maven/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/maven/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/maven/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -58,17 +58,6 @@
</build>
<dependencies>
<dependency>
- <groupId>org.jboss.jbossts</groupId>
- <artifactId>narayana-jta</artifactId>
- <version>4.15.1.Final</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
Modified: labs/jbosstm/trunk/ArjunaJTA/quickstarts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -24,6 +24,14 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<configuration>
@@ -75,15 +83,9 @@
<version>1.0.0.Final</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossts</groupId>
+ <groupId>org.jboss.narayana.jta</groupId>
<artifactId>narayana-jta</artifactId>
- <version>4.15.1.Final</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
+ <version>5.0.0.M1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: labs/jbosstm/trunk/ArjunaJTA/quickstarts/recovery/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/recovery/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/recovery/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -12,7 +12,6 @@
<artifactId>recovery</artifactId>
<packaging>jar</packaging>
<name>Recovery Examples</name>
-
<dependencies>
<dependency>
<groupId>org.jboss.spec.javax.jms</groupId>
Modified: labs/jbosstm/trunk/ArjunaJTS/docs/administration_guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/docs/administration_guide/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTS/docs/administration_guide/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -19,7 +19,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jbossts-iaa-guide</artifactId>
+ <artifactId>administration-guide</artifactId>
<name>JBossJTS Administration Guide module</name>
<description>jts admin guide</description>
<packaging>jdocbook</packaging>
Modified: labs/jbosstm/trunk/ArjunaJTS/docs/development_guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/docs/development_guide/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTS/docs/development_guide/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -19,7 +19,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jbossts-dev-guide</artifactId>
+ <artifactId>development-guide</artifactId>
<name>JBossJTS devguide module</name>
<description>jts devguide</description>
<packaging>jdocbook</packaging>
Modified: labs/jbosstm/trunk/ArjunaJTS/docs/orbportability/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/docs/orbportability/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTS/docs/orbportability/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -19,7 +19,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jbossts-orb-guide</artifactId>
+ <artifactId>orbportability-guide</artifactId>
<name>orb guide</name>
<description>orb portability guide</description>
<packaging>jdocbook</packaging>
Modified: labs/jbosstm/trunk/ArjunaJTS/docs/quick_start/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/docs/quick_start/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTS/docs/quick_start/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -19,7 +19,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jbossts-quickstart-guide</artifactId>
+ <artifactId>quick-start-guide</artifactId>
<name>jts quick start</name>
<description>jts quick start</description>
<packaging>jdocbook</packaging>
Modified: labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -96,13 +96,20 @@
<!-- TODO AS7 -->
<scope>provided</scope>
</dependency>
- <!--
- <dependency>
- <groupId>jacorb</groupId>
- <artifactId>jacorb</artifactId>
- <version>2.3.1jboss.patch01-brew</version>
- <scope>provided</scope>
- </dependency>
--->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -116,12 +116,14 @@
<dependency>
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<!-- JCA API -->
<groupId>org.jboss.ironjacamar</groupId>
<artifactId>ironjacamar-spec-api</artifactId>
<version>1.0.0.Beta5</version>
+ <scope>provided</scope>
<!-- TODO AS7 -->
</dependency>
<dependency>
@@ -133,6 +135,7 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Needed for JacORB logging -->
<dependency>
@@ -146,5 +149,20 @@
<version>4.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -185,5 +185,20 @@
<artifactId>slf4j-jdk14</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTS/narayana-jts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/narayana-jts/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTS/narayana-jts/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -194,5 +194,20 @@
<artifactId>wrapper</artifactId>
<version>3.2.3</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -130,14 +130,12 @@
<artifactId>jacorb</artifactId>
<scope>provided</scope>
</dependency>
-
<!-- Needed for JacORB logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -150,5 +148,20 @@
<version>1.7.1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -70,5 +70,20 @@
<groupId>org.jboss.narayana.arjunacore</groupId>
<artifactId>arjunacore</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </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-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -68,5 +68,20 @@
<artifactId>ws-c</artifactId>
<classifier>api</classifier>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </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-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/XTS/WS-T/ws-t/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -122,5 +122,20 @@
<groupId>org.jboss.narayana.arjunacore</groupId>
<artifactId>arjunacore</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -130,5 +130,20 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/WSAS/wsas/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/wsas/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/XTS/WSAS/wsas/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -31,5 +31,20 @@
<groupId>org.jboss.narayana.arjunacore</groupId>
<artifactId>arjunacore</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/WSCF/wscf/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/wscf/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/XTS/WSCF/wscf/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -39,5 +39,20 @@
<groupId>org.jboss.narayana.xts</groupId>
<artifactId>ws-c</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/WSTX/wstx/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/wstx/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/XTS/WSTX/wstx/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -78,5 +78,20 @@
<artifactId>ws-t</artifactId>
<classifier>api</classifier>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -111,5 +111,20 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/XTS/jbossxts/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/jbossxts/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/XTS/jbossxts/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -142,7 +142,6 @@
</artifactSet>
</configuration>
</execution>
-
<execution>
<id>mainjar</id>
<phase>package</phase>
@@ -242,78 +241,19 @@
<classifier>api</classifier>
</dependency>
<dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>wsas</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>wscf</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.narayana.xts</groupId>
- <artifactId>wscf11</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
</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>
Modified: labs/jbosstm/trunk/XTS/recovery/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/XTS/recovery/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -40,5 +40,20 @@
<groupId>org.jboss.narayana.xts</groupId>
<artifactId>wscf</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosstm/trunk/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/dist/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/dist/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -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>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -42,6 +50,14 @@
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
+ <dependencies>
+ <dependency>
+ <!-- Entry needed to enable jdocbook unzipping -->
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.3.5</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -69,11 +85,6 @@
<dependency>
<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>
@@ -87,11 +98,6 @@
<dependency>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>narayana-jts</artifactId>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.narayana.jts</groupId>
- <artifactId>narayana-jts</artifactId>
<classifier>javadoc</classifier>
</dependency>
<dependency>
@@ -108,11 +114,6 @@
<classifier>javadoc</classifier>
</dependency>
<dependency>
- <groupId>org.jboss.narayana.admin</groupId>
- <artifactId>jbossts-jopr-plugin</artifactId>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
<groupId>org.jboss.narayana.jts</groupId>
<artifactId>trailmap</artifactId>
</dependency>
@@ -121,8 +122,6 @@
<artifactId>rest-tx-web</artifactId>
<type>war</type>
</dependency>
-
-
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
<artifactId>jbossxts</artifactId>
@@ -173,11 +172,89 @@
<groupId>org.jboss.narayana.xts</groupId>
<artifactId>xts-test-servlet</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.narayana</groupId>
+ <artifactId>jbosstxbridge</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jts</groupId>
+ <artifactId>administration-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jts</groupId>
+ <artifactId>development-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jts</groupId>
+ <artifactId>orbportability-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jts</groupId>
+ <artifactId>quick-start-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>administration-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>development-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>installation-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>quick-start-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.arjunacore</groupId>
+ <artifactId>development-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.arjunacore</groupId>
+ <artifactId>failure-recovery-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.platform-docs</groupId>
+ <artifactId>development-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.platform-docs</groupId>
+ <artifactId>failure-recovery-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.platform-docs</groupId>
+ <artifactId>transactions-overview-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.platform-docs</groupId>
+ <artifactId>txbridge-guide</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.platform-docs</groupId>
+ <artifactId>release-notes</artifactId>
+ <type>jdocbook</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>xts-guide</artifactId>
+ <type>jdocbook</type>
+ </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>
Copied: labs/jbosstm/trunk/dist/readme.txt (from rev 37341, labs/jbosstm/trunk/ArjunaJTS/INSTALL)
===================================================================
--- labs/jbosstm/trunk/dist/readme.txt (rev 0)
+++ labs/jbosstm/trunk/dist/readme.txt 2011-08-03 15:00:59 UTC (rev 37342)
@@ -0,0 +1,106 @@
+ WELCOME TO NARAYANA
+ -------------------
+
+This release of Narayana is designed for use standalone.
+The JTA is also used by JBossAS 7 beta releases, but manual upgrading of the component inside JBossAS is not recommended.
+ JTS and XTS are not currently available in AS7.
+Integration with JBossAS 6 or earlier is no longer supported.
+
+
+ WHATS INCLUDED
+ --------------
+
+This release contains:
+ bin/
+ rest-tx-web.war - This can be deployed into a server running Narayana JTA to expose the Rest-TX API
+ ws-*.war - These wars can be used to deploy XTS standalone
+ jbossts-jopr-plugin - This can be deployed into a server running Narayana JTA and RHQ to administer the server - more details below
+ start-*.[bat|sh] - These scripts can be used to launch standalone transaction managers and recovery managers
+ *setup-env-*.[bat|sh] - This will configure an environment for use with Narayana
+
+ docs/
+ api - The various project components javadocs
+ guides - PDF versions of the projects documentation
+ JTS/
+ idl - The IDL files for integration with the JTS
+ trailmap - A trailmap for the project
+ XTS/
+ demo - A trailmap for the project
+
+ etc/
+ Some example configuration files are available here, remove the .jts or .jta suffix to enable the operation mode you require
+
+ jacorb/
+ A jacorb deployment for use with JTS
+
+ lib/
+ ext/ - All the dependencies required to run Narayana JTA/JTS/XTS
+ jbosstxbridge.jar.txbridge - After removing the .txbridge suffix, deploy this into a server running JTA and XTS to enable transactional bridging
+ jbossxts*.jar.xts - Remove the .xts suffix and deploy into a server to enable XTS, more details are available in the XTS guide.
+ narayana-jta*.jar.jta - Remove the .jta suffix to enable Narayana JTA
+ narayana-jts*.jar.jts - Remove the .jts suffix to enable Narayana JTS
+
+ quickstarts/
+ Some examples to get you up and running quickly
+
+ services/
+ This directory contains the files required to install Narayana as an operating system service
+
+
+ EMBEDDED TOOLS
+ --------------
+
+JMX Instrumentation
+-------------------
+
+With this release it is now possible to monitor the transaction Object
+Store using JMX. Monitoring the Object Store is useful for trouble
+shooting problems that occur when transactions are committed (it does
+not expose transactions prior to commit). The JMX instrumentation
+(of the ObjectStore) is a new feature and is not necessarily suitable
+for monitoring production systems.
+
+In any compliant JMX browser (such as jconsole) there should appear an
+MBean with the name
+ jboss.jta:type=ObjectStore
+This MBean corresponds to the object store and provides a naming context
+for other MBeans (for example in a JMX client such as jconsole the MBeans
+will be displayed in the form of a tree control). The various MBeans
+corresponding to this ObjectStore will have names prefixed by this
+'top level' MBean.
+
+Simply instantiate an object of type com.hp.mwtests.ts.arjuna.tools.ObjStoreBrowser
+and initialise it with a valid set of types for handling ObjectStore records. These types
+can be set using a setTypes() method via a properties file on the classpath.
+Please refer to the unit tests in the src distribution for more details.
+
+Tools Deployment
+----------------
+
+Transaction management is integrated into the admin console in the form of a JOPR plugin
+which is located in the install bin directory (jbossts-jopr-plugin.jar). Install it by copying
+to the admin console plugin directory ($JBOSS_HOME/common/deploy/admin-console.war/plugins).
+
+There is also a transaction statistics graphing tool which can run standalone or inside a
+jconsole tab (jconsole, a tool for managing JVMs, is distributed with the reference JDK).
+Various transaction statistics are graphed in real time with each graph updated during each
+poll interval (4 seconds unless the interval is overridden on the jconsole command line).
+
+The tool depends on the JFree graphing library. Download and upack Orson from http://www.jfree.org/orson
+and set the env variable ORSON_HOME to the directory where you plan to unpack the downloaded zip.
+If you intend to use the tool with jconsole you will also need to put the JDK tools and jconsole jars on
+the classpath:
+
+export CLASSPATH="$JDK_HOME/lib/tools.jar:$JDK_HOME/lib/jconsole.jar:$ORSON_HOME/orson-0.5.0.jar:$ORSON_HOME/lib/jfreechart-1.0.6.jar:$ORSON_HOME/lib/jcommon-1.0.10.jar:$TS_INSTALL_DIR/lib/narayana-jts.jar>"
+
+Standalone Usage:
+
+java com.arjuna.ats.arjuna.tools.stats.TxPerfGraph
+
+(note that standalone usage does not require the JDK tools and jconsole jars)
+
+Usage with jconsole:
+
+jconsole -J-Djava.class.path="$CLASSPATH" -pluginpath $TS_INSTALL_DIR/lib/narayana-jts.jar
+
+The tool will automatically enable statistics gathering on startup. It is recommended that you disable statistics gathering prior to exit on the Settings tab in the GUI.
Modified: labs/jbosstm/trunk/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/dist/src/main/assembly/bin.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/dist/src/main/assembly/bin.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -21,9 +21,24 @@
<dependencySets>
<dependencySet>
<includes>
+ <include>org.jboss.narayana*:jdocbook</include>
+ </includes>
+ <outputDirectory>docs/guides/${artifact.artifactId}</outputDirectory>
+ <useProjectAttachments>true</useProjectAttachments>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ <exclude>html/</exclude>
+ </excludes>
+ </unpackOptions>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <includes>
<include>org.jboss.narayana.xts:xts-demo</include>
</includes>
- <outputDirectory>demo</outputDirectory>
+ <outputDirectory>docs/XTS/demo</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
<unpack>true</unpack>
<unpackOptions>
@@ -37,7 +52,7 @@
<includes>
<include>org.jboss.narayana.xts:jbossxts:*javadoc*</include>
</includes>
- <outputDirectory>docs/api</outputDirectory>
+ <outputDirectory>docs/api/XTS</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
<unpack>true</unpack>
<useProjectArtifact>false</useProjectArtifact>
@@ -47,7 +62,7 @@
<include>org.jboss.narayana.xts:localjunit</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <outputDirectory>interop-tests</outputDirectory>
+ <outputDirectory>XTS/interop-tests</outputDirectory>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
@@ -57,7 +72,7 @@
<include>org.jboss.narayana.xts:localjunit</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <outputDirectory>tests</outputDirectory>
+ <outputDirectory>XTS/tests</outputDirectory>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
@@ -67,7 +82,7 @@
<include>org.jboss.narayana.xts:xts-test-servlet</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <outputDirectory>tests</outputDirectory>
+ <outputDirectory>XTS/tests</outputDirectory>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
@@ -76,7 +91,7 @@
<includes>
<include>org.jboss.narayana.xts:jbossxts:jar:api</include>
</includes>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}.xts</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
@@ -86,7 +101,7 @@
<includes>
<include>org.jboss.narayana.xts:jbossxts:jar</include>
</includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}.xts</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
@@ -94,9 +109,20 @@
</dependencySet>
<dependencySet>
<includes>
+ <include>org.jboss.narayana.rts:rest-tx-web:war</include>
+ </includes>
+ <outputDirectory>bin</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-c11:war:war</include>
</includes>
- <outputDirectory>webapps</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
</outputFileNameMapping>
<unpack>false</unpack>
@@ -109,7 +135,7 @@
<include>org.jboss.narayana.xts:ws-t11:war:coordinator</include>
<include>org.jboss.narayana.xts:ws-t11:war:participant</include>
</includes>
- <outputDirectory>webapps</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}
</outputFileNameMapping>
<unpack>false</unpack>
@@ -121,7 +147,7 @@
<includes>
<include>org.jboss.narayana.jts:trailmap</include>
</includes>
- <outputDirectory>trailmap</outputDirectory>
+ <outputDirectory>docs/JTS/trailmap</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
<unpack>true</unpack>
<unpackOptions>
@@ -137,91 +163,104 @@
</includes>
<outputFileNameMapping>${artifact.artifactId}-javadoc.${artifact.extension}
</outputFileNameMapping>
- <outputDirectory>bin</outputDirectory>
+ <outputDirectory>docs/api/admin</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
- <unpack>false</unpack>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.narayana.admin:jbossts-jopr-plugin:*:sources</include>
+ <include>org.jboss.narayana.jts:narayana-jts:*:javadoc</include>
</includes>
- <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}
+ <outputDirectory>docs/api/JTS</outputDirectory>
+ <useProjectAttachments>true</useProjectAttachments>
+ <unpack>true</unpack>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.narayana.jts:narayana-jts</include>
+ </includes>
+ <excludes>
+ <exclude>*:javadoc</exclude>
+ </excludes>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}.jts
</outputFileNameMapping>
- <outputDirectory>bin</outputDirectory>
- <useTransitiveDependencies>false</useTransitiveDependencies>
<unpack>false</unpack>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.narayana.jts:narayana-jts:*:javadoc</include>
+ <include>org.jboss.narayana.jts:narayana-jts-integration</include>
</includes>
- <outputDirectory>htdocs</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}.jts
+ </outputFileNameMapping>
+ <unpack>false</unpack>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.narayana.jta:narayana-jta:*:javadoc</include>
+ </includes>
+ <outputDirectory>docs/api/JTA</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
<unpack>true</unpack>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.narayana.jts:narayana-jts:*:sources</include>
+ <include>org.jboss.narayana.jta:narayana-jta</include>
</includes>
- <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}
- </outputFileNameMapping>
+ <excludes>
+ <exclude>*:javadoc</exclude>
+ </excludes>
<outputDirectory>lib</outputDirectory>
- <useTransitiveDependencies>false</useTransitiveDependencies>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}.jta
+ </outputFileNameMapping>
<unpack>false</unpack>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.narayana.admin:jbossts-jopr-plugin</include>
+ <include>org.jboss.narayana.jta:narayana-jta-integration</include>
</includes>
- <outputDirectory>bin</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}.jta
</outputFileNameMapping>
<unpack>false</unpack>
- <useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.narayana.jts:narayana-jts</include>
+ <include>org.jboss.narayana:jbosstxbridge</include>
</includes>
- <excludes>
- <exclude>*:sources</exclude>
- <exclude>*:javadoc</exclude>
- </excludes>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}.txbridge
</outputFileNameMapping>
<unpack>false</unpack>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.jboss.narayana.jts:narayana-jts-integration</include>
+ <include>org.jboss.narayana.admin:jbossts-jopr-plugin</include>
</includes>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
</outputFileNameMapping>
<unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<excludes>
- <exclude>org.jboss.narayana.jts:narayana-jts</exclude>
- <exclude>org.jboss.narayana.jts:narayana-jts-integration</exclude>
- <exclude>org.jboss.narayana.arjunacore:arjunacore-services</exclude>
- <exclude>org.jboss.narayana:common</exclude>
- <exclude>org.jboss.narayana.arjunacore:arjuna</exclude>
- <exclude>org.jboss.narayana.arjunacore:txoj</exclude>
- <exclude>org.jboss.narayana.jta:jta</exclude>
- <exclude>org.jboss.narayana.jts:orbportability</exclude>
- <exclude>org.jboss.narayana.jts:jts</exclude>
- <exclude>org.jboss.narayana.jts:jtax</exclude>
- <exclude>org.jboss.narayana.admin:jbossts-jopr-plugin</exclude>
- <exclude>org.jboss.narayana.jts:trailmap</exclude>
+ <exclude>org.jboss.narayana.*</exclude>
</excludes>
<outputDirectory>lib/ext</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
@@ -234,11 +273,10 @@
<include>org.jboss.narayana.arjunacore:arjunacore-services</include>
</includes>
<outputDirectory>services/lib</outputDirectory>
- <outputFileNameMapping>narayana-jts-services.jar
- </outputFileNameMapping>
<unpack>false</unpack>
</dependencySet>
</dependencySets>
+
<files>
<file>
<source>../ArjunaJTS/copyright.txt</source>
@@ -253,51 +291,43 @@
<source>../ext/third_party_licenses.txt</source>
<fileMode>0644</fileMode>
<outputDirectory>lib/ext</outputDirectory>
+ <destName>jts_third_party_licenses.txt</destName>
</file>
<file>
- <source>../ArjunaCore/scripts/withorb-setup-env.sh</source>
- <fileMode>0755</fileMode>
- <outputDirectory>bin</outputDirectory>
- <destName>setup-env.sh</destName>
- <filtered>true</filtered>
- </file>
- <file>
- <source>../ArjunaCore/scripts/withorb-setup-env.bat</source>
- <fileMode>0755</fileMode>
- <outputDirectory>bin</outputDirectory>
- <destName>setup-env.bat</destName>
- <filtered>true</filtered>
- </file>
- <file>
- <source>../ArjunaJTS/jbossts-properties-arjunajts.xml</source>
+ <source>../ArjunaJTA/jbossts-properties-arjunajta.xml</source>
<fileMode>0644</fileMode>
- <destName>default-jbossts-properties.xml</destName>
+ <outputDirectory>etc</outputDirectory>
+ <destName>jbossts-properties.xml.jta</destName>
</file>
<file>
<source>../ArjunaJTS/jbossts-properties-arjunajts.xml</source>
<fileMode>0644</fileMode>
<outputDirectory>etc</outputDirectory>
- <destName>jbossts-properties.xml</destName>
+ <destName>jbossts-properties.xml.jts</destName>
</file>
<file>
- <source>../ArjunaJTS/INSTALL</source>
+ <source>readme.txt</source>
<fileMode>0644</fileMode>
</file>
<file>
<source>../XTS/third_party_licenses.txt</source>
<fileMode>0644</fileMode>
<outputDirectory>lib/ext</outputDirectory>
+ <destName>xts_third_party_licenses.txt</destName>
</file>
+
+ <!--
<file>
<source>../XTS/localjunit/run-tests.xml</source>
<fileMode>0644</fileMode>
- <outputDirectory>tests</outputDirectory>
+ <outputDirectory>XTS/tests</outputDirectory>
</file>
<file>
<source>../XTS/localjunit/run-interop-tests.xml</source>
<fileMode>0644</fileMode>
- <outputDirectory>interop-tests</outputDirectory>
+ <outputDirectory>XTS/interop-tests</outputDirectory>
</file>
+ -->
</files>
<fileSets>
<fileSet>
@@ -307,7 +337,7 @@
<includes>
<include>start-transaction-service*</include>
<include>start-recovery-manager*</include>
- <include>run-tools*</include>
+ <include>-setup-env.*</include>
</includes>
</fileSet>
<fileSet>
@@ -360,14 +390,14 @@
</fileSet>
<fileSet>
<directory>../ArjunaJTS/jts/idl/arjuna</directory>
- <outputDirectory>idl</outputDirectory>
+ <outputDirectory>docs/JTS/idl</outputDirectory>
<includes>
<include>ArjunaOTS.idl</include>
</includes>
</fileSet>
<fileSet>
<directory>../ArjunaJTS/jts/idl/omg</directory>
- <outputDirectory>idl</outputDirectory>
+ <outputDirectory>docs/JTS/idl</outputDirectory>
<includes>
<include>CosTransactions.idl</include>
<include>XA.idl</include>
@@ -377,87 +407,21 @@
<directory>../ArjunaJTS/jacorb</directory>
<outputDirectory>jacorb</outputDirectory>
</fileSet>
-
+
<fileSet>
- <directory>../ArjunaJTS/docs/administration_guide/target/docbook/publish/en-US/pdf/
+ <directory>../ArjunaJTA/quickstarts
</directory>
- <outputDirectory>docs</outputDirectory>
+ <outputDirectory>quickstarts/jta</outputDirectory>
</fileSet>
<fileSet>
- <directory>../ArjunaJTS/docs/development_guide/target/docbook/publish/en-US/pdf/
+ <directory>../ArjunaCore/quickstarts
</directory>
- <outputDirectory>docs</outputDirectory>
+ <outputDirectory>quickstarts/arjunacore</outputDirectory>
</fileSet>
<fileSet>
- <directory>../ArjunaJTS/docs/orbportability/target/docbook/publish/en-US/pdf/
+ <directory>../rest-tx/quickstarts
</directory>
- <outputDirectory>docs</outputDirectory>
+ <outputDirectory>quickstarts/rest-tx</outputDirectory>
</fileSet>
- <fileSet>
- <directory>../ArjunaJTS/docs/quick_start/target/docbook/publish/en-US/pdf/
- </directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
-
-
- <fileSet>
- <directory>../ArjunaJTA/docs/administration_guide/target/docbook/publish/en-US/pdf/
- </directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../ArjunaJTA/docs/development_guide/target/docbook/publish/en-US/pdf/
- </directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../ArjunaJTA/docs/installation_guide/target/docbook/publish/en-US/pdf/
- </directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../ArjunaJTA/docs/quick_start/target/docbook/publish/en-US/pdf/
- </directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../ArjunaCore/docs/development_guide/target/docbook/publish/en-US/pdf/
- </directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../ArjunaCore/docs/failure_recovery_guide/target/docbook/publish/en-US/pdf/
- </directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../docs/development_guide/target/docbook/publish/en-US/pdf/
- </directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../docs/failure_recovery_guide/target/docbook/publish/en-US/pdf/
- </directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../docs/transactions_overview_guide/target/docbook/publish/en-US/pdf/
- </directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../docs/txbridge_guide/target/docbook/publish/en-US/pdf/
- </directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../docs/release_notes/target/docbook/publish/en-US/pdf/
- </directory>
- <outputDirectory>docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../XTS/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>
Deleted: labs/jbosstm/trunk/ext/jcommon-1.0.10.jar
===================================================================
(Binary files differ)
Deleted: labs/jbosstm/trunk/ext/jfreechart-1.0.6.jar
===================================================================
(Binary files differ)
Modified: labs/jbosstm/trunk/pom.xml
===================================================================
--- labs/jbosstm/trunk/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -96,7 +96,6 @@
<developerConnection>scm:svn:https://svn.jboss.org/repos/labs/labs/jbosstm/</developerConnection>
<url>http://fisheye.jboss.org/browse/JBossTS/</url>
</scm>
-
<pluginRepositories>
<pluginRepository>
<id>jboss-public-repository-group</id>
@@ -110,7 +109,6 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-
<repositories>
<repository>
<id>jbossThirdParty</id>
@@ -153,66 +151,57 @@
</snapshotRepository>
</distributionManagement>
<build>
- <pluginManagement>
+ <pluginManagement>
<plugins>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>idlj-maven-plugin</artifactId>
- <version>1.1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.6</version>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>idlj-maven-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.6</version>
<configuration>
<skip>true</skip>
</configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.7.2</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
- </plugin>
+ </plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.7.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ </plugin>
+ <plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
<version>2.3.5</version>
@@ -697,6 +686,11 @@
<type>war</type>
</dependency>
<dependency>
+ <groupId>org.jboss.narayana</groupId>
+ <artifactId>jbosstxbridge</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.0.0.Beta5</version>
@@ -735,26 +729,108 @@
<version>1.5.1</version>
</dependency>
<dependency>
- <groupId>org.jboss.byteman</groupId>
- <artifactId>byteman-dtest</artifactId>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman-dtest</artifactId>
<version>1.5.1</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jts</groupId>
+ <artifactId>administration-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jts</groupId>
+ <artifactId>development-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jts</groupId>
+ <artifactId>orbportability-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jts</groupId>
+ <artifactId>quick-start-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>administration-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>development-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>installation-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>quick-start-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.arjunacore</groupId>
+ <artifactId>development-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.arjunacore</groupId>
+ <artifactId>failure-recovery-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.platform-docs</groupId>
+ <artifactId>development-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.platform-docs</groupId>
+ <artifactId>failure-recovery-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.platform-docs</groupId>
+ <artifactId>transactions-overview-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.platform-docs</groupId>
+ <artifactId>txbridge-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.platform-docs</groupId>
+ <artifactId>release-notes</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.xts</groupId>
+ <artifactId>xts-guide</artifactId>
+ <type>jdocbook</type>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-processor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-generator</artifactId>
- </dependency>
- </dependencies>
<properties>
<maven.build.timestamp.format>yyyy/MMM/dd HH:mm</maven.build.timestamp.format>
<buildproperty.date>${maven.build.timestamp}</buildproperty.date>
@@ -770,6 +846,7 @@
<module>ArjunaJTS</module>
<module>rest-tx</module>
<module>rhq-plugin</module>
+ <module>txbridge</module>
<module>dist</module>
</modules>
</project>
Modified: labs/jbosstm/trunk/rest-tx/pom.xml
===================================================================
--- labs/jbosstm/trunk/rest-tx/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/rest-tx/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -16,27 +16,27 @@
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</groupId>
- <artifactId>narayana</artifactId>
- <version>5.0.0.M1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.narayana.rts</groupId>
- <artifactId>rest-tx</artifactId>
- <packaging>pom</packaging>
- <name>RESTful Transactions</name>
- <description>rest tx</description>
- <url>http://www.jboss.org/jbosstm</url>
- <modules>
- <module>tx</module>
- <module>webservice</module>
- <module>quickstarts</module>
- </modules>
- <properties>
- <version.artifactId>5.0.0.M1-SNAPSHOT</version.artifactId>
- <artifactId.name>rest-tx</artifactId.name>
- <version.org.jboss.resteasy>2.0.0.GA</version.org.jboss.resteasy>
- </properties>
+ <parent>
+ <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>
+ <groupId>org.jboss.narayana.rts</groupId>
+ <artifactId>rest-tx</artifactId>
+ <packaging>pom</packaging>
+ <name>RESTful Transactions</name>
+ <description>rest tx</description>
+ <url>http://www.jboss.org/jbosstm</url>
+ <modules>
+ <module>tx</module>
+ <module>webservice</module>
+ <module>quickstarts</module>
+ </modules>
+ <properties>
+ <version.artifactId>5.0.0.M1-SNAPSHOT</version.artifactId>
+ <artifactId.name>rest-tx</artifactId.name>
+ <version.org.jboss.resteasy>2.0.0.GA</version.org.jboss.resteasy>
+ </properties>
</project>
Modified: labs/jbosstm/trunk/rest-tx/quickstarts/pom.xml
===================================================================
--- labs/jbosstm/trunk/rest-tx/quickstarts/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/rest-tx/quickstarts/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -16,53 +16,50 @@
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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.narayana.rts.quickstarts</groupId>
- <artifactId>quickstarts</artifactId>
- <version>5.0.0.M1-SNAPSHOT</version>
- <name>RESTful Atomic Transaction Quickstarts</name>
- <description>Provides examples of how to use transactions with web applications</description>
- <packaging>pom</packaging>
-
- <repositories>
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <modules>
- <module>simple</module>
- <module>service</module>
- <module>recovery</module>
- </modules>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.narayana.rts.quickstarts</groupId>
+ <artifactId>quickstarts</artifactId>
+ <version>5.0.0.M1-SNAPSHOT</version>
+ <name>RESTful Atomic Transaction Quickstarts</name>
+ <description>Provides examples of how to use transactions with web applications</description>
+ <packaging>pom</packaging>
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <modules>
+ <module>simple</module>
+ <module>service</module>
+ <module>recovery</module>
+ </modules>
</project>
Modified: labs/jbosstm/trunk/rest-tx/quickstarts/recovery/pom.xml
===================================================================
--- labs/jbosstm/trunk/rest-tx/quickstarts/recovery/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/rest-tx/quickstarts/recovery/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -1,58 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>quickstarts</artifactId>
- <groupId>org.jboss.narayana.rts.quickstarts</groupId>
- <version>5.0.0.M1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>recovery</artifactId>
- <name>RESTful Atomic Transaction Quickstart: Participant Service with Recovery</name>
- <description>Example of how a web service can recover from failures during transaction completion</description>
-
- <repositories>
- <!-- Jersey -->
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
- <!-- end Jersey -->
- </repositories>
-
- <dependencies>
-
- <!-- the implementation of REST Atomic Transactions -->
- <dependency>
- <groupId>org.jboss.narayana.rts</groupId>
- <artifactId>rest-tx-api</artifactId>
- <version>5.0.0.M1-SNAPSHOT</version>
- </dependency>
-
- <!-- Jersey container for running participant services -->
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
-
- <dependency>
- <groupId>com.sun.grizzly</groupId>
- <artifactId>grizzly-servlet-webserver</artifactId>
- <version>1.9.18-i</version>
- </dependency>
- <!-- end Jersey -->
- </dependencies>
-
+<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/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>quickstarts</artifactId>
+ <groupId>org.jboss.narayana.rts.quickstarts</groupId>
+ <version>5.0.0.M1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>recovery</artifactId>
+ <name>RESTful Atomic Transaction Quickstart: Participant Service with Recovery</name>
+ <description>Example of how a web service can recover from failures during transaction completion</description>
+ <repositories>
+ <!-- Jersey -->
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ <layout>default</layout>
+ </repository>
+ <!-- end Jersey -->
+ </repositories>
+ <dependencies>
+ <!-- the implementation of REST Atomic Transactions -->
+ <dependency>
+ <groupId>org.jboss.narayana.rts</groupId>
+ <artifactId>rest-tx-api</artifactId>
+ <version>5.0.0.M1-SNAPSHOT</version>
+ </dependency>
+ <!-- Jersey container for running participant services -->
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-servlet-webserver</artifactId>
+ <version>1.9.18-i</version>
+ </dependency>
+ <!-- end Jersey -->
+ </dependencies>
</project>
Modified: labs/jbosstm/trunk/rest-tx/quickstarts/service/pom.xml
===================================================================
--- labs/jbosstm/trunk/rest-tx/quickstarts/service/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/rest-tx/quickstarts/service/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -1,84 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>quickstarts</artifactId>
- <groupId>org.jboss.narayana.rts.quickstarts</groupId>
- <version>5.0.0.M1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>service</artifactId>
- <name>RESTful Atomic Transaction Quickstart: Participant Service</name>
- <description>Examples show how a web service can participate in a transaction</description>
-
- <repositories>
- <!-- Jersey -->
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
- <!-- end Jersey -->
- </repositories>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>java</executable>
- <workingDirectory>${project.build.directory}/exec-working-directory</workingDirectory>
- <arguments>
- <argument>-classpath</argument>
- <classpath />
- <argument>quickstart.MultipleParticipants</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <!-- the implementation of REST Atomic Transactions -->
- <dependency>
- <groupId>org.jboss.narayana.rts</groupId>
- <artifactId>rest-tx-api</artifactId>
- <version>5.0.0.M1-SNAPSHOT</version>
- </dependency>
-
- <!-- Jersey container for running participant services -->
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
-
- <dependency>
- <groupId>com.sun.grizzly</groupId>
- <artifactId>grizzly-servlet-webserver</artifactId>
- <version>1.9.18-i</version>
- </dependency>
- <!-- end Jersey -->
- </dependencies>
-
+<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/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>quickstarts</artifactId>
+ <groupId>org.jboss.narayana.rts.quickstarts</groupId>
+ <version>5.0.0.M1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>service</artifactId>
+ <name>RESTful Atomic Transaction Quickstart: Participant Service</name>
+ <description>Examples show how a web service can participate in a transaction</description>
+ <repositories>
+ <!-- Jersey -->
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ <layout>default</layout>
+ </repository>
+ <!-- end Jersey -->
+ </repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>java</executable>
+ <workingDirectory>${project.build.directory}/exec-working-directory</workingDirectory>
+ <arguments>
+ <argument>-classpath</argument>
+ <classpath/>
+ <argument>quickstart.MultipleParticipants</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <!-- the implementation of REST Atomic Transactions -->
+ <dependency>
+ <groupId>org.jboss.narayana.rts</groupId>
+ <artifactId>rest-tx-api</artifactId>
+ <version>5.0.0.M1-SNAPSHOT</version>
+ </dependency>
+ <!-- Jersey container for running participant services -->
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.grizzly</groupId>
+ <artifactId>grizzly-servlet-webserver</artifactId>
+ <version>1.9.18-i</version>
+ </dependency>
+ <!-- end Jersey -->
+ </dependencies>
</project>
Modified: labs/jbosstm/trunk/rest-tx/quickstarts/simple/pom.xml
===================================================================
--- labs/jbosstm/trunk/rest-tx/quickstarts/simple/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/rest-tx/quickstarts/simple/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -22,44 +22,42 @@
<version>5.0.0.M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>simple</artifactId>
- <version>5.0.0.M1-SNAPSHOT</version>
- <name>RESTful Atomic Transaction Quickstart: Basic</name>
- <description>Basic example of how to start and stop a REST Atomic transaction</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>java</executable>
- <workingDirectory>${project.build.directory}/exec-working-directory</workingDirectory>
- <arguments>
- <argument>-classpath</argument>
- <classpath />
- <argument>RestTransactionExample</argument>
- <argument>MultipleTransactions</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.narayana.rts</groupId>
- <artifactId>rest-tx-api</artifactId>
- <version>5.0.0.M1-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>simple</artifactId>
+ <version>5.0.0.M1-SNAPSHOT</version>
+ <name>RESTful Atomic Transaction Quickstart: Basic</name>
+ <description>Basic example of how to start and stop a REST Atomic transaction</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>java</executable>
+ <workingDirectory>${project.build.directory}/exec-working-directory</workingDirectory>
+ <arguments>
+ <argument>-classpath</argument>
+ <classpath/>
+ <argument>RestTransactionExample</argument>
+ <argument>MultipleTransactions</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.narayana.rts</groupId>
+ <artifactId>rest-tx-api</artifactId>
+ <version>5.0.0.M1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
Modified: labs/jbosstm/trunk/txbridge/pom.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/pom.xml 2011-08-03 08:35:27 UTC (rev 37341)
+++ labs/jbosstm/trunk/txbridge/pom.xml 2011-08-03 15:00:59 UTC (rev 37342)
@@ -20,8 +20,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jbosstxbridge</artifactId>
- <name>${pom.artifactId}</name>
- <description>${pom.artifactId}</description>
+ <name>${project.artifactId}</name>
+ <description>${project.artifactId}</description>
<packaging>jar</packaging>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -70,11 +70,12 @@
<dependencies>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
- <artifactId>bridge</artifactId>
+ <artifactId>jbossxts</artifactId>
+ <classifier>api</classifier>
</dependency>
<dependency>
<groupId>org.jboss.narayana.jta</groupId>
- <artifactId>jta</artifactId>
+ <artifactId>narayana-jta</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
@@ -86,23 +87,23 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman</artifactId>
<version>1.5.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.byteman</groupId>
- <artifactId>byteman-dtest</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
+ <dependency>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman-dtest</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-server-manager</artifactId>
<version>1.0.2.GA</version>
More information about the jboss-svn-commits
mailing list