[jboss-svn-commits] JBL Code SVN: r36839 - in labs/jbosstm/trunk: ArjunaCore and 71 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Mar 17 08:02:41 EDT 2011


Author: tomjenkinson
Date: 2011-03-17 08:02:38 -0400 (Thu, 17 Mar 2011)
New Revision: 36839

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml
   labs/jbosstm/trunk/ArjunaCore/arjuna/services/pom.xml
   labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
   labs/jbosstm/trunk/ArjunaCore/dist/pom.xml
   labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/pom.xml
   labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_And_Administration_Guide/pom.xml
   labs/jbosstm/trunk/ArjunaCore/docs/pom.xml
   labs/jbosstm/trunk/ArjunaCore/pom.xml
   labs/jbosstm/trunk/ArjunaCore/tsmx/jmxbrowser/pom.xml
   labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser/pom.xml
   labs/jbosstm/trunk/ArjunaCore/tsmx/osbv-defaults/pom.xml
   labs/jbosstm/trunk/ArjunaCore/tsmx/perfgraph/pom.xml
   labs/jbosstm/trunk/ArjunaCore/tsmx/pom.xml
   labs/jbosstm/trunk/ArjunaCore/tsmx/tools/pom.xml
   labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Development_Guide/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Installation_And_Administration_Guide/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/docs/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/jbossjta/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/jdbc/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/pom.xml
   labs/jbosstm/trunk/ArjunaJTA/tsmx/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Development_Guide/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Installation_And_Administration_Guide/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/docs/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/tsmx-sar/pom.xml
   labs/jbosstm/trunk/ArjunaJTS/tsmx/pom.xml
   labs/jbosstm/trunk/XTS/WS-C/pom.xml
   labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml
   labs/jbosstm/trunk/XTS/WS-C/ws-c10/pom.xml
   labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml
   labs/jbosstm/trunk/XTS/WS-T/pom.xml
   labs/jbosstm/trunk/XTS/WS-T/ws-t/pom.xml
   labs/jbosstm/trunk/XTS/WS-T/ws-t10/pom.xml
   labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml
   labs/jbosstm/trunk/XTS/WSAS/pom.xml
   labs/jbosstm/trunk/XTS/WSCF/pom.xml
   labs/jbosstm/trunk/XTS/WSCF/wscf/pom.xml
   labs/jbosstm/trunk/XTS/WSCF/wscf10/pom.xml
   labs/jbosstm/trunk/XTS/WSCF/wscf11/pom.xml
   labs/jbosstm/trunk/XTS/WSTX/pom.xml
   labs/jbosstm/trunk/XTS/WSTX/wstx/pom.xml
   labs/jbosstm/trunk/XTS/WSTX/wstx10/pom.xml
   labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml
   labs/jbosstm/trunk/XTS/bridge/pom.xml
   labs/jbosstm/trunk/XTS/demo/pom.xml
   labs/jbosstm/trunk/XTS/dist/pom.xml
   labs/jbosstm/trunk/XTS/docs/Transactions_XTS_Administration_And_Development_Guide/pom.xml
   labs/jbosstm/trunk/XTS/docs/pom.xml
   labs/jbosstm/trunk/XTS/jbossxts-api/pom.xml
   labs/jbosstm/trunk/XTS/pom.xml
   labs/jbosstm/trunk/XTS/recovery/pom.xml
   labs/jbosstm/trunk/XTS/sar/pom.xml
   labs/jbosstm/trunk/common/pom.xml
   labs/jbosstm/trunk/narayana-parent/pom.xml
   labs/jbosstm/trunk/pom.xml
   labs/jbosstm/trunk/qa/pom.xml
   labs/jbosstm/trunk/qa/tests/pom.xml
   labs/jbosstm/trunk/rest-tx/pom.xml
   labs/jbosstm/trunk/rest-tx/tx/pom.xml
   labs/jbosstm/trunk/rest-tx/webservice/pom.xml
   labs/jbosstm/trunk/rhq-plugin/pom.xml
Log:
JBTM-574 formatted the poms

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,135 +11,124 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>arjuna</artifactId>
-	<name>ArjunaCore arjuna module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>classes</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>etc</directory>
-			</resource>
-		</resources>
-		<testSourceDirectory>tests/classes</testSourceDirectory>
-		<testResources>
-			<testResource>
-				<directory>src/test/resources</directory>
-			</testResource>
-			<testResource>
-				<directory>tests/byteman-scripts</directory>
-			</testResource>
-		</testResources>
-
-
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-test-source</id>
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<additionalClasspathElements>
-						<additionalClasspathElement>${env.JAVA_HOME}/lib/tools.jar</additionalClasspathElement>
-					</additionalClasspathElements>
-					<useManifestOnlyJar>false</useManifestOnlyJar>
-					<excludes>
-						<!-- Dont run the common tests -->
-						<exclude>com/arjuna/common/tests/**</exclude>
-
-						<exclude>**/resources/**</exclude>
-						<exclude>**/DummyCheckedAction.java</exclude>
-						<exclude>**/MyAccess.java</exclude>
-						<exclude>**/Worker.java</exclude>
-						<exclude>**/BasicCrashRecord.java</exclude>
-						<exclude>**/DummyRecoveryModule.java</exclude>
-						<exclude>**/CrashAbstractRecord*.java</exclude>
-						<exclude>**/RecoveryTransaction.java</exclude>
-						<exclude>**/UserDefFirst0Setup.java</exclude>
-						<exclude>**/CachedTest.java</exclude>
-
-						<!-- LogStressTest2 takes too long - needs moving to /qa -->
-						<exclude>**/LogStressTest2.java</exclude>
-						
-						<!-- auxilairy code used by reaper test classes -->
-						<exclude>**/reaper/ReaperTestCaseControl.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.hornetq</groupId>
-			<artifactId>hornetq-core</artifactId>
-			<version>2.1.2.Final</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.byteman</groupId>
-			<artifactId>byteman</artifactId>
-			<version>${byteman-version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.byteman</groupId>
-			<artifactId>byteman-install</artifactId>
-			<version>${byteman-version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.byteman</groupId>
-			<artifactId>byteman-submit</artifactId>
-			<version>${byteman-version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.byteman</groupId>
-			<artifactId>byteman-bmunit</artifactId>
-			<version>${byteman-version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<properties>
-		<byteman-version>1.5.1</byteman-version>
-	</properties>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>arjuna</artifactId>
+    <name>ArjunaCore arjuna module</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>classes</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>etc</directory>
+            </resource>
+        </resources>
+        <testSourceDirectory>tests/classes</testSourceDirectory>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+            <testResource>
+                <directory>tests/byteman-scripts</directory>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <additionalClasspathElements>
+                        <additionalClasspathElement>${env.JAVA_HOME}/lib/tools.jar</additionalClasspathElement>
+                    </additionalClasspathElements>
+                    <useManifestOnlyJar>false</useManifestOnlyJar>
+                    <excludes>
+                        <!-- Dont run the common tests -->
+                        <exclude>com/arjuna/common/tests/**</exclude>
+                        <exclude>**/resources/**</exclude>
+                        <exclude>**/DummyCheckedAction.java</exclude>
+                        <exclude>**/MyAccess.java</exclude>
+                        <exclude>**/Worker.java</exclude>
+                        <exclude>**/BasicCrashRecord.java</exclude>
+                        <exclude>**/DummyRecoveryModule.java</exclude>
+                        <exclude>**/CrashAbstractRecord*.java</exclude>
+                        <exclude>**/RecoveryTransaction.java</exclude>
+                        <exclude>**/UserDefFirst0Setup.java</exclude>
+                        <exclude>**/CachedTest.java</exclude>
+                        <!-- LogStressTest2 takes too long - needs moving to /qa -->
+                        <exclude>**/LogStressTest2.java</exclude>
+                        <!-- auxilairy code used by reaper test classes -->
+                        <exclude>**/reaper/ReaperTestCaseControl.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-core</artifactId>
+            <version>2.1.2.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.byteman</groupId>
+            <artifactId>byteman</artifactId>
+            <version>${byteman-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.byteman</groupId>
+            <artifactId>byteman-install</artifactId>
+            <version>${byteman-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.byteman</groupId>
+            <artifactId>byteman-submit</artifactId>
+            <version>${byteman-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.byteman</groupId>
+            <artifactId>byteman-bmunit</artifactId>
+            <version>${byteman-version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <byteman-version>1.5.1</byteman-version>
+    </properties>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/services/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/services/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/services/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,32 +11,28 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>arjunacore-services</artifactId>
-	<name>ArjunaCore arjuna services module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>classes</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>tanukisoft</groupId>
-			<artifactId>wrapper</artifactId>
-			<version>3.2.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>arjunacore-services</artifactId>
+    <name>ArjunaCore arjuna services module</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>classes</sourceDirectory>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>tanukisoft</groupId>
+            <artifactId>wrapper</artifactId>
+            <version>3.2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/arjunacore/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,162 +11,155 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>arjunacore</artifactId>
-	<name>ArjunaCore packaged module</name>
-	<packaging>jar</packaging>
-
-
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0-beta-4</version>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>create</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<doCheck>true</doCheck>
-					<doUpdate>false</doUpdate>
-					<scmBranchPropertyName>buildScmBranch</scmBranchPropertyName>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestEntries>
-							<arjuna-scm-revision>${buildScmBranch} (revision: ${buildNumber})</arjuna-scm-revision>
-							<arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
-							<arjuna-builder>JBoss Inc. [${user.name}] ${os.name} ${os.version} ${buildproperty.date}</arjuna-builder>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<detectOfflineLinks>false</detectOfflineLinks>
-					<excludePackageNames>*.internal.*</excludePackageNames>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>../../common/classes</source>
-								<source>../arjuna/classes</source>
-								<source>../txoj/classes</source>
-								<source>../tsmx/classes</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>**/*.*</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>1.4</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<artifactSet>
-								<includes>
-									<include>org.jboss.jbossts:common</include>
-									<include>org.jboss.jbossts:arjuna</include>
-									<include>org.jboss.jbossts:tsmx-tools</include>
-									<include>org.jboss.jbossts:tsmx-jmxbrowser</include>
-									<include>org.jboss.jbossts:tsmx-core-objectstorebrowser</include>
-									<include>org.jboss.jbossts:osbv-defaults</include>
-									<include>org.jboss.jbossts:tsmx-perfgraph</include>
-									<include>org.jboss.jbossts:txoj</include>
-								</includes>
-							</artifactSet>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-tools</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-jmxbrowser</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-core-objectstorebrowser</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>osbv-defaults</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-perfgraph</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>txoj</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>arjunacore</artifactId>
+    <name>ArjunaCore packaged module</name>
+    <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>1.0-beta-4</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <doCheck>true</doCheck>
+                    <doUpdate>false</doUpdate>
+                    <scmBranchPropertyName>buildScmBranch</scmBranchPropertyName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <arjuna-scm-revision>${buildScmBranch} (revision: ${buildNumber})</arjuna-scm-revision>
+                            <arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
+                            <arjuna-builder>JBoss Inc. [${user.name}] ${os.name} ${os.version} ${buildproperty.date}</arjuna-builder>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <detectOfflineLinks>false</detectOfflineLinks>
+                    <excludePackageNames>*.internal.*</excludePackageNames>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>../../common/classes</source>
+                                <source>../arjuna/classes</source>
+                                <source>../txoj/classes</source>
+                                <source>../tsmx/classes</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*.*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.jboss.jbossts:common</include>
+                                    <include>org.jboss.jbossts:arjuna</include>
+                                    <include>org.jboss.jbossts:tsmx-tools</include>
+                                    <include>org.jboss.jbossts:tsmx-jmxbrowser</include>
+                                    <include>org.jboss.jbossts:tsmx-core-objectstorebrowser</include>
+                                    <include>org.jboss.jbossts:osbv-defaults</include>
+                                    <include>org.jboss.jbossts:tsmx-perfgraph</include>
+                                    <include>org.jboss.jbossts:txoj</include>
+                                </includes>
+                            </artifactSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-tools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-jmxbrowser</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-core-objectstorebrowser</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>osbv-defaults</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-perfgraph</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>txoj</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/dist/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/dist/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,110 +12,104 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-
-
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>arjunacore-dist</artifactId>
-	<packaging>pom</packaging>
-	<name>ArjunaCore distribution</name>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/bin.xml</descriptor>
-					</descriptors>
-					<tarLongFileMode>gnu</tarLongFileMode>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjunacore</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjunacore</artifactId>
-			<classifier>javadoc</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjunacore</artifactId>
-			<classifier>sources</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjunacore-services</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-tools</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-jmxbrowser</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-core-objectstorebrowser</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>osbv-defaults</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-perfgraph</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>txoj</artifactId>
-		</dependency>
-	</dependencies>
-	
-	<properties>
-		<PRODUCT_NAME>arjunacore</PRODUCT_NAME>
-		<HOME_DIRECTORY>JBOSSCORE_HOME</HOME_DIRECTORY>
-	</properties>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.jbossts</groupId>
+    <artifactId>arjunacore-dist</artifactId>
+    <packaging>pom</packaging>
+    <name>ArjunaCore distribution</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                    </descriptors>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjunacore</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjunacore</artifactId>
+            <classifier>javadoc</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjunacore</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjunacore-services</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-tools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-jmxbrowser</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-core-objectstorebrowser</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>osbv-defaults</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-perfgraph</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>txoj</artifactId>
+        </dependency>
+    </dependencies>
+    <properties>
+        <PRODUCT_NAME>arjunacore</PRODUCT_NAME>
+        <HOME_DIRECTORY>JBOSSCORE_HOME</HOME_DIRECTORY>
+    </properties>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,53 +11,49 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>arjunacore-dev-guide</artifactId>
-	<name>ArjunaCore devguide module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<outputDirectory>target/publican</outputDirectory>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<configuration>
-							<target unless="skipPublican">
-								<exec dir="." executable="publican">
-									<arg value="build" />
-									<arg value="--langs=en-US" />
-									<arg value="--formats=pdf" />
-									<arg value="--config=publican-maven.cfg" />
-								</exec>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>**/*.pdf</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>arjunacore-dev-guide</artifactId>
+    <name>ArjunaCore devguide module</name>
+    <packaging>jar</packaging>
+    <build>
+        <outputDirectory>target/publican</outputDirectory>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target unless="skipPublican">
+                                <exec dir="." executable="publican">
+                                    <arg value="build"/>
+                                    <arg value="--langs=en-US"/>
+                                    <arg value="--formats=pdf"/>
+                                    <arg value="--config=publican-maven.cfg"/>
+                                </exec>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*.pdf</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_And_Administration_Guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_And_Administration_Guide/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_And_Administration_Guide/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,53 +11,49 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>arjunacore-iaa-guide</artifactId>
-	<name>ArjunaCore Installation and Administration Guide module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<outputDirectory>target/publican</outputDirectory>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<configuration>
-							<target unless="skipPublican">
-								<exec dir="." executable="publican">
-									<arg value="build" />
-									<arg value="--langs=en-US" />
-									<arg value="--formats=pdf" />
-									<arg value="--config=publican-maven.cfg" />
-								</exec>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>**/*.pdf</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>arjunacore-iaa-guide</artifactId>
+    <name>ArjunaCore Installation and Administration Guide module</name>
+    <packaging>jar</packaging>
+    <build>
+        <outputDirectory>target/publican</outputDirectory>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target unless="skipPublican">
+                                <exec dir="." executable="publican">
+                                    <arg value="build"/>
+                                    <arg value="--langs=en-US"/>
+                                    <arg value="--formats=pdf"/>
+                                    <arg value="--config=publican-maven.cfg"/>
+                                </exec>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*.pdf</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/docs/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/docs/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/docs/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,22 +12,18 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-
-
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>arjunacore-docs</artifactId>
-	<packaging>pom</packaging>
-	<name>ArjunaCore Documentation</name>
-
-	<modules>
-		<module>ArjunaCore_Development_Guide</module>
-		<module>ArjunaCore_Installation_And_Administration_Guide</module>
-	</modules>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.jbossts</groupId>
+    <artifactId>arjunacore-docs</artifactId>
+    <packaging>pom</packaging>
+    <name>ArjunaCore Documentation</name>
+    <modules>
+        <module>ArjunaCore_Development_Guide</module>
+        <module>ArjunaCore_Installation_And_Administration_Guide</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,25 +12,23 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>arjunacore-all</artifactId>
-	<packaging>pom</packaging>
-	<name>ArjunaCore everything</name>
-
-	<modules>
-		<module>../common</module>
- 		<module>arjuna</module>
-		<module>arjuna/services</module>
-		<module>tsmx</module>
-		<module>txoj</module>
-		<module>arjunacore</module>
-		<module>docs</module>
-		<module>dist</module>
-	</modules>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>arjunacore-all</artifactId>
+    <packaging>pom</packaging>
+    <name>ArjunaCore everything</name>
+    <modules>
+        <module>../common</module>
+        <module>arjuna</module>
+        <module>arjuna/services</module>
+        <module>tsmx</module>
+        <module>txoj</module>
+        <module>arjunacore</module>
+        <module>docs</module>
+        <module>dist</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/jmxbrowser/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/jmxbrowser/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/jmxbrowser/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,54 +11,49 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>tsmx-jmxbrowser</artifactId>
-	<name>ArjunaCore tsmx-jmxbrowser module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../bin</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>../etc/jmxbrowser</directory>
-			</resource>
-		</resources>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/jmxbrowser/**</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/jmxbrowser/**</include>
-						<include>**/*.properties</include>
-						<include>**/*.gif</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-tools</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tsmx-jmxbrowser</artifactId>
+    <name>ArjunaCore tsmx-jmxbrowser module</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../bin</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>../etc/jmxbrowser</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/jmxbrowser/**</include>
+                    </includes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/jmxbrowser/**</include>
+                        <include>**/*.properties</include>
+                        <include>**/*.gif</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-tools</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/objectstorebrowser/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,69 +11,64 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>tsmx-core-objectstorebrowser</artifactId>
-	<name>ArjunaCore tsmx-core-objectstorebrowser module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../bin</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>../etc/objectstorebrowser</directory>
-			</resource>
-		</resources>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/objectstorebrowser/**</include>
-					</includes>
-					<!--  TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO A TYPO
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tsmx-core-objectstorebrowser</artifactId>
+    <name>ArjunaCore tsmx-core-objectstorebrowser module</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../bin</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>../etc/objectstorebrowser</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/objectstorebrowser/**</include>
+                    </includes>
+                    <!--  TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO A TYPO
 					<excludes>
 						<exclude>com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/**</exclude>
 					</excludes>
 					 -->
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/objectstorebrowser/**</include>
-						<include>**/*.properties</include>
-						<include>**/*.gif</include>
-					</includes>
-					<!--  TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO A TYPO
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/objectstorebrowser/**</include>
+                        <include>**/*.properties</include>
+                        <include>**/*.gif</include>
+                    </includes>
+                    <!--  TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO A TYPO
 					<excludes>
 						<exclude>com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/**</exclude>
 					</excludes>
 					 -->
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-tools</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.spec.javax.transaction</groupId>
-			<artifactId>jboss-transaction-api_1.1_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-tools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.transaction</groupId>
+            <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/osbv-defaults/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/osbv-defaults/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/osbv-defaults/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,78 +11,74 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>osbv-defaults</artifactId>
-	<name>ArjunaCore osbv-defaults module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../bin</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/**</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/**</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestSections>
-							<manifestSection>
-								<name>arjuna-tools-objectstorebrowser-jta</name>
-								<manifestEntries>
-									<plugin-classname-1>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.atomicaction.AtomicActionViewer</plugin-classname-1>
-									<plugin-classname-2>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.abstractrecord.XAResourceRecordViewer</plugin-classname-2>
-									<plugin-classname-3>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.abstractrecord.AbstractRecordViewer</plugin-classname-3>
-									<plugin-classname-4>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.InFlightTransactionViewer</plugin-classname-4>
-								</manifestEntries>
-							</manifestSection>
-							<manifestSection>
-								<name>arjuna-tools-objectstorebrowser-jts</name>
-								<manifestEntries>
-									<plugin-classname-1>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.arjunatransaction.ArjunaTransactionViewer</plugin-classname-1>
-									<plugin-classname-2>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.abstractrecord.ResourceRecordViewer</plugin-classname-2>
-									<plugin-classname-3>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.abstractrecord.ExtendedResourceRecordViewer</plugin-classname-3>
-								</manifestEntries>
-							</manifestSection>
-						</manifestSections>
-					</archive>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-core-objectstorebrowser</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.spec.javax.transaction</groupId>
-			<artifactId>jboss-transaction-api_1.1_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>osbv-defaults</artifactId>
+    <name>ArjunaCore osbv-defaults module</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../bin</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/**</include>
+                    </includes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/**</include>
+                    </includes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestSections>
+                            <manifestSection>
+                                <name>arjuna-tools-objectstorebrowser-jta</name>
+                                <manifestEntries>
+                                    <plugin-classname-1>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.atomicaction.AtomicActionViewer</plugin-classname-1>
+                                    <plugin-classname-2>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.abstractrecord.XAResourceRecordViewer</plugin-classname-2>
+                                    <plugin-classname-3>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.abstractrecord.AbstractRecordViewer</plugin-classname-3>
+                                    <plugin-classname-4>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.InFlightTransactionViewer</plugin-classname-4>
+                                </manifestEntries>
+                            </manifestSection>
+                            <manifestSection>
+                                <name>arjuna-tools-objectstorebrowser-jts</name>
+                                <manifestEntries>
+                                    <plugin-classname-1>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.arjunatransaction.ArjunaTransactionViewer</plugin-classname-1>
+                                    <plugin-classname-2>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.abstractrecord.ResourceRecordViewer</plugin-classname-2>
+                                    <plugin-classname-3>com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.abstractrecord.ExtendedResourceRecordViewer</plugin-classname-3>
+                                </manifestEntries>
+                            </manifestSection>
+                        </manifestSections>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-core-objectstorebrowser</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.transaction</groupId>
+            <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/perfgraph/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/perfgraph/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/perfgraph/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,64 +11,59 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>tsmx-perfgraph</artifactId>
-	<name>ArjunaCore tsmx-perfgraph module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../bin</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>../etc/perfgraph</directory>
-			</resource>
-		</resources>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/perfgraph/**</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/perfgraph/**</include>
-						<include>**/*.properties</include>
-						<include>**/*.gif</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>jfree</groupId>
-			<artifactId>jfreechart</artifactId>
-			<version>1.0.2</version>
-		</dependency>
-	        <dependency>
-	            <groupId>jfree</groupId>
-	            <artifactId>jcommon</artifactId>
-	            <version>1.0.2</version>
-	        </dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-tools</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tsmx-perfgraph</artifactId>
+    <name>ArjunaCore tsmx-perfgraph module</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../bin</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>../etc/perfgraph</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/perfgraph/**</include>
+                    </includes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/perfgraph/**</include>
+                        <include>**/*.properties</include>
+                        <include>**/*.gif</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>jfree</groupId>
+            <artifactId>jfreechart</artifactId>
+            <version>1.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>jfree</groupId>
+            <artifactId>jcommon</artifactId>
+            <version>1.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-tools</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,25 +11,21 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>tsmx-core</artifactId>
-	<name>ArjunaCore tsmx module</name>
-	<packaging>pom</packaging>
-
-	<modules>
-		<module>tools</module>
-		<module>jmxbrowser</module>
-		<module>objectstorebrowser</module>
-		<module>osbv-defaults</module>
-		<module>perfgraph</module>
-	</modules>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tsmx-core</artifactId>
+    <name>ArjunaCore tsmx module</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>tools</module>
+        <module>jmxbrowser</module>
+        <module>objectstorebrowser</module>
+        <module>osbv-defaults</module>
+        <module>perfgraph</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/tools/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/tools/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/tools/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,69 +11,64 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>tsmx-tools</artifactId>
-	<name>ArjunaCore tsmx-tools module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../bin</sourceDirectory>
-
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>../classes</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/toolsframework/**</include>
-						<include>com/arjuna/ats/tsmx/**</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/toolsframework/**</include>
-						<include>com/arjuna/ats/tsmx/**</include>
-						<include>**/*.properties</include>
-						<include>**/*.gif</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tsmx-tools</artifactId>
+    <name>ArjunaCore tsmx-tools module</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../bin</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>../classes</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/toolsframework/**</include>
+                        <include>com/arjuna/ats/tsmx/**</include>
+                    </includes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/toolsframework/**</include>
+                        <include>com/arjuna/ats/tsmx/**</include>
+                        <include>**/*.properties</include>
+                        <include>**/*.gif</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,85 +11,78 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>txoj</artifactId>
-	<name>ArjunaCore txoj module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>classes</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>etc</directory>
-			</resource>
-		</resources>
-		<testSourceDirectory>tests/classes</testSourceDirectory>
-		<testResources>
-			<testResource>
-				<directory>src/test/resources</directory>
-			</testResource>
-		</testResources>
-
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-test-source</id>
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<excludes>
-						<!-- Were refactored to true classes as used in multiple places -->
-						<exclude>**/AbortObject.java</exclude>
-						<exclude>**/CommitObject.java</exclude>
-						<exclude>**/ThreadObject1.java</exclude>
-						<exclude>**/ThreadObject2.java</exclude>
-						<exclude>**/DummyLockManager.java</exclude>
-						<exclude>**/DummyTOModule.java</exclude>
-						<exclude>**/MyRecoveredTO.java</exclude>
-						
-						<exclude>**/common/**</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>txoj</artifactId>
+    <name>ArjunaCore txoj module</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>classes</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>etc</directory>
+            </resource>
+        </resources>
+        <testSourceDirectory>tests/classes</testSourceDirectory>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <excludes>
+                        <!-- Were refactored to true classes as used in multiple places -->
+                        <exclude>**/AbortObject.java</exclude>
+                        <exclude>**/CommitObject.java</exclude>
+                        <exclude>**/ThreadObject1.java</exclude>
+                        <exclude>**/ThreadObject2.java</exclude>
+                        <exclude>**/DummyLockManager.java</exclude>
+                        <exclude>**/DummyTOModule.java</exclude>
+                        <exclude>**/MyRecoveredTO.java</exclude>
+                        <exclude>**/common/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTA/dist/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,119 +12,112 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-
-
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>jbossts-jta</artifactId>
-	<packaging>pom</packaging>
-	<name>JBossJTA distribution</name>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/bin.xml</descriptor>
-					</descriptors>
-					<tarLongFileMode>gnu</tarLongFileMode>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjunacore-services</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-tools</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-jmxbrowser</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>osbv-defaults</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-perfgraph</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>txoj</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jbossjta</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jbossjta</artifactId>
-			<classifier>javadoc</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jbossjta</artifactId>
-			<classifier>sources</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-jta-objectstorebrowser</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jbossjta-integration</artifactId>
-		</dependency>
-	</dependencies>
-	
-	
-	<properties>
-		<PRODUCT_NAME>jbossjta</PRODUCT_NAME>
-		<HOME_DIRECTORY>JBOSSTA_HOME</HOME_DIRECTORY>
-	</properties>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.jbossts</groupId>
+    <artifactId>jbossts-jta</artifactId>
+    <packaging>pom</packaging>
+    <name>JBossJTA distribution</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                    </descriptors>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjunacore-services</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-tools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-jmxbrowser</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>osbv-defaults</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-perfgraph</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>txoj</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossjta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossjta</artifactId>
+            <classifier>javadoc</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossjta</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-jta-objectstorebrowser</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossjta-integration</artifactId>
+        </dependency>
+    </dependencies>
+    <properties>
+        <PRODUCT_NAME>jbossjta</PRODUCT_NAME>
+        <HOME_DIRECTORY>JBOSSTA_HOME</HOME_DIRECTORY>
+    </properties>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Development_Guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Development_Guide/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Development_Guide/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,54 +11,49 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jbossjta-dev-guide</artifactId>
-	<name>JBossJTA devguide module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<outputDirectory>target/publican</outputDirectory>
-		<plugins>
-
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<configuration>
-							<target unless="skipPublican">
-								<exec dir="." executable="publican">
-									<arg value="build" />
-									<arg value="--langs=en-US" />
-									<arg value="--formats=pdf" />
-									<arg value="--config=publican-maven.cfg" />
-								</exec>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>**/*.pdf</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jbossjta-dev-guide</artifactId>
+    <name>JBossJTA devguide module</name>
+    <packaging>jar</packaging>
+    <build>
+        <outputDirectory>target/publican</outputDirectory>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target unless="skipPublican">
+                                <exec dir="." executable="publican">
+                                    <arg value="build"/>
+                                    <arg value="--langs=en-US"/>
+                                    <arg value="--formats=pdf"/>
+                                    <arg value="--config=publican-maven.cfg"/>
+                                </exec>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*.pdf</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Installation_And_Administration_Guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Installation_And_Administration_Guide/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTA/docs/ArjunaTA_Installation_And_Administration_Guide/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,53 +11,49 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jbossjta-iaa-guide</artifactId>
-	<name>JBossJTA Installation and Administration Guide module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<outputDirectory>target/publican</outputDirectory>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<configuration>
-							<target unless="skipPublican">
-								<exec dir="." executable="publican">
-									<arg value="build" />
-									<arg value="--langs=en-US" />
-									<arg value="--formats=pdf" />
-									<arg value="--config=publican-maven.cfg" />
-								</exec>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>**/*.pdf</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jbossjta-iaa-guide</artifactId>
+    <name>JBossJTA Installation and Administration Guide module</name>
+    <packaging>jar</packaging>
+    <build>
+        <outputDirectory>target/publican</outputDirectory>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target unless="skipPublican">
+                                <exec dir="." executable="publican">
+                                    <arg value="build"/>
+                                    <arg value="--langs=en-US"/>
+                                    <arg value="--formats=pdf"/>
+                                    <arg value="--config=publican-maven.cfg"/>
+                                </exec>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*.pdf</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTA/docs/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/docs/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTA/docs/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,22 +12,18 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-
-
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>jbossjta-docs</artifactId>
-	<packaging>pom</packaging>
-	<name>JBossJTA Documentation</name>
-
-	<modules>
-		<module>ArjunaTA_Development_Guide</module>
-		<module>ArjunaTA_Installation_And_Administration_Guide</module>
-	</modules>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.jbossts</groupId>
+    <artifactId>jbossjta-docs</artifactId>
+    <packaging>pom</packaging>
+    <name>JBossJTA Documentation</name>
+    <modules>
+        <module>ArjunaTA_Development_Guide</module>
+        <module>ArjunaTA_Installation_And_Administration_Guide</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTA/integration/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,43 +11,38 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jbossjta-integration</artifactId>
-	<name>JBossJTA ATX module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../../atsintegration/classes</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>**/jts/**</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jta</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.integration</groupId>
-			<artifactId>jboss-integration</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jbossjta-integration</artifactId>
+    <name>JBossJTA ATX module</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../../atsintegration/classes</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/jts/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.integration</groupId>
+            <artifactId>jboss-integration</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTA/jbossjta/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jbossjta/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTA/jbossjta/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,176 +11,169 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jbossjta</artifactId>
-	<name>JBossJTA packaged module</name>
-	<packaging>jar</packaging>
-
-
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0-beta-4</version>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>create</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<doCheck>true</doCheck>
-					<doUpdate>false</doUpdate>
-					<scmBranchPropertyName>buildScmBranch</scmBranchPropertyName>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestEntries>
-							<arjuna-scm-revision>${buildScmBranch} (revision: ${buildNumber})</arjuna-scm-revision>
-							<arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
-							<arjuna-builder>JBoss Inc. [${user.name}] ${os.name} ${os.version} ${buildproperty.date}</arjuna-builder>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<detectOfflineLinks>false</detectOfflineLinks>
-					<excludePackageNames>*.internal.*</excludePackageNames>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>../../common/classes</source>
-								<source>../../ArjunaCore/arjuna/classes</source>
-								<source>../../ArjunaCore/txoj/classes</source>
-								<source>../../ArjunaCore/tsmx/classes</source>
-								<source>../../ArjunaCore/tsmx/bin</source>
-								<source>../jta/classes</source>
-								<source>../jdbc/classes</source>
-								<source>../tsmx/bin</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>**/*.*</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>1.4</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<artifactSet>
-								<includes>
-									<include>org.jboss.jbossts:common</include>
-									<include>org.jboss.jbossts:arjuna</include>
-									<include>org.jboss.jbossts:tsmx-tools</include>
-									<include>org.jboss.jbossts:tsmx-jmxbrowser</include>
-									<include>org.jboss.jbossts:osbv-defaults</include>
-									<include>org.jboss.jbossts:tsmx-perfgraph</include>
-									<include>org.jboss.jbossts:txoj</include>
-									<include>org.jboss.jbossts:jta</include>
-									<include>org.jboss.jbossts:jdbc</include>
-									<include>org.jboss.jbossts:tsmx-jta-objectstorebrowser</include>
-								</includes>
-							</artifactSet>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-tools</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-jmxbrowser</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>osbv-defaults</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-perfgraph</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>txoj</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jta</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-jta-objectstorebrowser</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jbossjta</artifactId>
+    <name>JBossJTA packaged module</name>
+    <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>1.0-beta-4</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <doCheck>true</doCheck>
+                    <doUpdate>false</doUpdate>
+                    <scmBranchPropertyName>buildScmBranch</scmBranchPropertyName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <arjuna-scm-revision>${buildScmBranch} (revision: ${buildNumber})</arjuna-scm-revision>
+                            <arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
+                            <arjuna-builder>JBoss Inc. [${user.name}] ${os.name} ${os.version} ${buildproperty.date}</arjuna-builder>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <detectOfflineLinks>false</detectOfflineLinks>
+                    <excludePackageNames>*.internal.*</excludePackageNames>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>../../common/classes</source>
+                                <source>../../ArjunaCore/arjuna/classes</source>
+                                <source>../../ArjunaCore/txoj/classes</source>
+                                <source>../../ArjunaCore/tsmx/classes</source>
+                                <source>../../ArjunaCore/tsmx/bin</source>
+                                <source>../jta/classes</source>
+                                <source>../jdbc/classes</source>
+                                <source>../tsmx/bin</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*.*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.jboss.jbossts:common</include>
+                                    <include>org.jboss.jbossts:arjuna</include>
+                                    <include>org.jboss.jbossts:tsmx-tools</include>
+                                    <include>org.jboss.jbossts:tsmx-jmxbrowser</include>
+                                    <include>org.jboss.jbossts:osbv-defaults</include>
+                                    <include>org.jboss.jbossts:tsmx-perfgraph</include>
+                                    <include>org.jboss.jbossts:txoj</include>
+                                    <include>org.jboss.jbossts:jta</include>
+                                    <include>org.jboss.jbossts:jdbc</include>
+                                    <include>org.jboss.jbossts:tsmx-jta-objectstorebrowser</include>
+                                </includes>
+                            </artifactSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-tools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-jmxbrowser</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>osbv-defaults</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-perfgraph</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>txoj</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-jta-objectstorebrowser</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,71 +11,60 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jdbc</artifactId>
-	<name>JBossJTA jdbc module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>classes</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>etc</directory>
-			</resource>
-		</resources>
-		<testSourceDirectory>tests/classes</testSourceDirectory>
-		<testResources>
-			<testResource>
-				<directory>src/test/resources</directory>
-			</testResource>
-		</testResources>
-
-
-		<plugins>
-			<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jdbc</artifactId>
+    <name>JBossJTA jdbc module</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>classes</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>etc</directory>
+            </resource>
+        </resources>
+        <testSourceDirectory>tests/classes</testSourceDirectory>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+        </testResources>
+        <plugins>
+            <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> 
 				<executions> <execution> <id>add-test-source</id> <phase>generate-test-sources</phase> 
 				<goals> <goal>add-test-source</goal> </goals> <configuration> <sources> <source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source> 
 				</sources> </configuration> </execution> </executions> </plugin> -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<excludes>
-						<exclude>**/utils/plugins/**</exclude>
-						<exclude>**/DBPlugin.java</exclude>
-
-
-						<exclude>**/JDBC2Test.java</exclude>
-						<exclude>**/JDBC3Test.java</exclude>
-						<exclude>**/*JNDISetup.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-
-		</plugins>
-	</build>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jta</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/utils/plugins/**</exclude>
+                        <exclude>**/DBPlugin.java</exclude>
+                        <exclude>**/JDBC2Test.java</exclude>
+                        <exclude>**/JDBC3Test.java</exclude>
+                        <exclude>**/*JNDISetup.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,137 +11,125 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jta</artifactId>
-	<name>JBossJTA jta module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>classes</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>etc</directory>
-			</resource>
-		</resources>
-		<testSourceDirectory>tests/classes</testSourceDirectory>
-		<testResources>
-			<testResource>
-				<directory>src/test/resources</directory>
-			</testResource>
-			<testResource>
-				<directory>tests/byteman-scripts</directory>
-			</testResource>
-		</testResources>
-
-
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-test-source</id>
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<additionalClasspathElements>
-						<additionalClasspathElement>${env.JAVA_HOME}/lib/tools.jar</additionalClasspathElement>
-					</additionalClasspathElements>
-					<useManifestOnlyJar>false</useManifestOnlyJar>
-					<excludes>
-						<!-- exclude tests which were run above using byteman scripts -->
-						<exclude>**/recovery/CrashRecovery.java</exclude>
-						<!-- exclude tests which we don't want to run -->
-						<exclude>**/common/**</exclude>
-						<exclude>**/LastOnePhaseResource.java</exclude>
-						<exclude>**/DummyXARecoveryResource.java</exclude>
-						<exclude>**/TestSynchronization.java</exclude>
-						<exclude>**/TestXAResource.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-
-		</plugins>
-	</build>
-
-	<dependencies>
-
-		<!-- JTA (local: ArjunaJTA/jta and remote: ArjunaJTS/jtax) need JTA and 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jta</artifactId>
+    <name>JBossJTA jta module</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>classes</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>etc</directory>
+            </resource>
+        </resources>
+        <testSourceDirectory>tests/classes</testSourceDirectory>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+            <testResource>
+                <directory>tests/byteman-scripts</directory>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <additionalClasspathElements>
+                        <additionalClasspathElement>${env.JAVA_HOME}/lib/tools.jar</additionalClasspathElement>
+                    </additionalClasspathElements>
+                    <useManifestOnlyJar>false</useManifestOnlyJar>
+                    <excludes>
+                        <!-- exclude tests which were run above using byteman scripts -->
+                        <exclude>**/recovery/CrashRecovery.java</exclude>
+                        <!-- exclude tests which we don't want to run -->
+                        <exclude>**/common/**</exclude>
+                        <exclude>**/LastOnePhaseResource.java</exclude>
+                        <exclude>**/DummyXARecoveryResource.java</exclude>
+                        <exclude>**/TestSynchronization.java</exclude>
+                        <exclude>**/TestXAResource.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <!-- JTA (local: ArjunaJTA/jta and remote: ArjunaJTS/jtax) need JTA and 
 			JCA (for tx inflow) apis. -->
-		<dependency>
-			<groupId>org.jboss.spec.javax.transaction</groupId>
-			<artifactId>jboss-transaction-api_1.1_spec</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jboss.spec.javax.resource</groupId>
-			<artifactId>jboss-connector-api_1.5_spec</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.byteman</groupId>
-			<artifactId>byteman</artifactId>
-			<version>${byteman-version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.byteman</groupId>
-			<artifactId>byteman-install</artifactId>
-			<version>${byteman-version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.byteman</groupId>
-			<artifactId>byteman-submit</artifactId>
-			<version>${byteman-version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.byteman</groupId>
-			<artifactId>byteman-bmunit</artifactId>
-			<version>${byteman-version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<properties>
-		<byteman-version>1.5.1</byteman-version>
-	</properties>
-
+        <dependency>
+            <groupId>org.jboss.spec.javax.transaction</groupId>
+            <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.resource</groupId>
+            <artifactId>jboss-connector-api_1.5_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.byteman</groupId>
+            <artifactId>byteman</artifactId>
+            <version>${byteman-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.byteman</groupId>
+            <artifactId>byteman-install</artifactId>
+            <version>${byteman-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.byteman</groupId>
+            <artifactId>byteman-submit</artifactId>
+            <version>${byteman-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.byteman</groupId>
+            <artifactId>byteman-bmunit</artifactId>
+            <version>${byteman-version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <byteman-version>1.5.1</byteman-version>
+    </properties>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTA/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTA/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,28 +12,26 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jbossjta-all</artifactId>
-	<packaging>pom</packaging>
-	<name>JBossJTA everything</name>
-
-	<modules>
-		<module>../common</module>
-		<module>../ArjunaCore/arjuna</module>
-		<module>../ArjunaCore/txoj</module>
-		<module>../ArjunaCore/tsmx</module>
-		<module>jta</module>
-		<module>jdbc</module>
-		<module>tsmx</module>
-		<module>jbossjta</module>
-		<module>docs</module>
-		<module>integration</module>
-		<module>dist</module>
-	</modules>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jbossjta-all</artifactId>
+    <packaging>pom</packaging>
+    <name>JBossJTA everything</name>
+    <modules>
+        <module>../common</module>
+        <module>../ArjunaCore/arjuna</module>
+        <module>../ArjunaCore/txoj</module>
+        <module>../ArjunaCore/tsmx</module>
+        <module>jta</module>
+        <module>jdbc</module>
+        <module>tsmx</module>
+        <module>jbossjta</module>
+        <module>docs</module>
+        <module>integration</module>
+        <module>dist</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTA/tsmx/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTA/tsmx/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,87 +11,82 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>tsmx-jta-objectstorebrowser</artifactId>
-	<name>JBossJTA tsmx-jta-objectstorebrowser module</name>
-	<packaging>jar</packaging>
-
-
-	<build>
-		<resources>
-			<resource>
-				<directory>../../ArjunaCore/tsmx/etc/objectstorebrowser</directory>
-			</resource>
-		</resources>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/objectstorebrowser/**</include>
-					</includes>
-					<!-- TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tsmx-jta-objectstorebrowser</artifactId>
+    <name>JBossJTA tsmx-jta-objectstorebrowser module</name>
+    <packaging>jar</packaging>
+    <build>
+        <resources>
+            <resource>
+                <directory>../../ArjunaCore/tsmx/etc/objectstorebrowser</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/objectstorebrowser/**</include>
+                    </includes>
+                    <!-- TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO 
 						A TYPO <excludes> <exclude>com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/**</exclude> 
 						</excludes> -->
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/objectstorebrowser/**</include>
-						<include>**/*.properties</include>
-						<include>**/*.gif</include>
-					</includes>
-					<!-- TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO 
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/objectstorebrowser/**</include>
+                        <include>**/*.properties</include>
+                        <include>**/*.gif</include>
+                    </includes>
+                    <!-- TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO 
 						A TYPO <excludes> <exclude>com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/**</exclude> 
 						</excludes> -->
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>../../ArjunaCore/tsmx/bin</source>
-								<source>bin</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-tools</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jta</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.spec.javax.transaction</groupId>
-			<artifactId>jboss-transaction-api_1.1_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>../../ArjunaCore/tsmx/bin</source>
+                                <source>bin</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-tools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.transaction</groupId>
+            <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,135 +12,128 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-
-
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>jbossts-full</artifactId>
-	<packaging>pom</packaging>
-	<name>JBossJTS distribution</name>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/bin.xml</descriptor>
-					</descriptors>
-					<tarLongFileMode>gnu</tarLongFileMode>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjunacore-services</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jbossts-tools</artifactId>
-			<classifier>sar</classifier>
-			<type>sar</type>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-tools</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-jmxbrowser</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>osbv-defaults</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-perfgraph</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>txoj</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jbossjts</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jbossjts</artifactId>
-			<classifier>javadoc</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jbossjts</artifactId>
-			<classifier>sources</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-jts-objectstorebrowser</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jbossjts-integration</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jbossts-jopr-plugin</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jbossts-jopr-plugin</artifactId>
-			<classifier>javadoc</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jbossts-jopr-plugin</artifactId>
-			<classifier>sources</classifier>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>trailmap</artifactId>
-		</dependency>
-	</dependencies>
-
-
-	<properties>
-		<PRODUCT_NAME>jbossjts</PRODUCT_NAME>
-		<HOME_DIRECTORY>JBOSSTS_HOME</HOME_DIRECTORY>
-	</properties>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.jbossts</groupId>
+    <artifactId>jbossts-full</artifactId>
+    <packaging>pom</packaging>
+    <name>JBossJTS distribution</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                    </descriptors>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjunacore-services</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossts-tools</artifactId>
+            <classifier>sar</classifier>
+            <type>sar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-tools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-jmxbrowser</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>osbv-defaults</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-perfgraph</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>txoj</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossjts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossjts</artifactId>
+            <classifier>javadoc</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossjts</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-jts-objectstorebrowser</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossjts-integration</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossts-jopr-plugin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossts-jopr-plugin</artifactId>
+            <classifier>javadoc</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossts-jopr-plugin</artifactId>
+            <classifier>sources</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>trailmap</artifactId>
+        </dependency>
+    </dependencies>
+    <properties>
+        <PRODUCT_NAME>jbossjts</PRODUCT_NAME>
+        <HOME_DIRECTORY>JBOSSTS_HOME</HOME_DIRECTORY>
+    </properties>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Development_Guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Development_Guide/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Development_Guide/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,54 +11,49 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jbossts-dev-guide</artifactId>
-	<name>JBossJTS devguide module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<outputDirectory>target/publican</outputDirectory>
-		<plugins>
-
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<configuration>
-							<target unless="skipPublican">
-								<exec dir="." executable="publican">
-									<arg value="build" />
-									<arg value="--langs=en-US" />
-									<arg value="--formats=pdf" />
-									<arg value="--config=publican-maven.cfg" />
-								</exec>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>**/*.pdf</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jbossts-dev-guide</artifactId>
+    <name>JBossJTS devguide module</name>
+    <packaging>jar</packaging>
+    <build>
+        <outputDirectory>target/publican</outputDirectory>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target unless="skipPublican">
+                                <exec dir="." executable="publican">
+                                    <arg value="build"/>
+                                    <arg value="--langs=en-US"/>
+                                    <arg value="--formats=pdf"/>
+                                    <arg value="--config=publican-maven.cfg"/>
+                                </exec>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*.pdf</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Installation_And_Administration_Guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Installation_And_Administration_Guide/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTS/docs/ArjunaJTS_Installation_And_Administration_Guide/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,53 +11,49 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jbossts-iaa-guide</artifactId>
-	<name>JBossJTS Installation and Administration Guide module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<outputDirectory>target/publican</outputDirectory>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<configuration>
-							<target unless="skipPublican">
-								<exec dir="." executable="publican">
-									<arg value="build" />
-									<arg value="--langs=en-US" />
-									<arg value="--formats=pdf" />
-									<arg value="--config=publican-maven.cfg" />
-								</exec>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>**/*.pdf</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jbossts-iaa-guide</artifactId>
+    <name>JBossJTS Installation and Administration Guide module</name>
+    <packaging>jar</packaging>
+    <build>
+        <outputDirectory>target/publican</outputDirectory>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target unless="skipPublican">
+                                <exec dir="." executable="publican">
+                                    <arg value="build"/>
+                                    <arg value="--langs=en-US"/>
+                                    <arg value="--formats=pdf"/>
+                                    <arg value="--config=publican-maven.cfg"/>
+                                </exec>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*.pdf</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/docs/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/docs/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTS/docs/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,22 +12,18 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-
-
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>jbossjts-docs</artifactId>
-	<packaging>pom</packaging>
-	<name>JBossJTS Documentation</name>
-
-	<modules>
-		<module>ArjunaJTS_Development_Guide</module>
-		<module>ArjunaJTS_Installation_And_Administration_Guide</module>
-	</modules>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.jbossts</groupId>
+    <artifactId>jbossjts-docs</artifactId>
+    <packaging>pom</packaging>
+    <name>JBossJTS Documentation</name>
+    <modules>
+        <module>ArjunaJTS_Development_Guide</module>
+        <module>ArjunaJTS_Installation_And_Administration_Guide</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTS/integration/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,83 +11,78 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jbossjts-integration</artifactId>
-	<name>JBossJTS ATX module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../../atsintegration/classes</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0-beta-4</version>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>create</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<doCheck>true</doCheck>
-					<doUpdate>false</doUpdate>
-					<scmBranchPropertyName>buildScmBranch</scmBranchPropertyName>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestEntries>
-							<arjuna-scm-revision>${buildScmBranch} (revision: ${buildNumber})</arjuna-scm-revision>
-							<arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
-							<arjuna-builder>JBoss Inc. [${user.name}] ${os.name} ${os.version} ${buildproperty.date}</arjuna-builder>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jta</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jts</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jtax</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>orbportability</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.integration</groupId>
-			<artifactId>jboss-integration</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jacorb</groupId>
-			<artifactId>jacorb</artifactId>
-			<version>2.3.1jboss.patch01-brew</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jbossjts-integration</artifactId>
+    <name>JBossJTS ATX module</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../../atsintegration/classes</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>1.0-beta-4</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <doCheck>true</doCheck>
+                    <doUpdate>false</doUpdate>
+                    <scmBranchPropertyName>buildScmBranch</scmBranchPropertyName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <arjuna-scm-revision>${buildScmBranch} (revision: ${buildNumber})</arjuna-scm-revision>
+                            <arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
+                            <arjuna-builder>JBoss Inc. [${user.name}] ${os.name} ${os.version} ${buildproperty.date}</arjuna-builder>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jtax</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>orbportability</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.integration</groupId>
+            <artifactId>jboss-integration</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jacorb</groupId>
+            <artifactId>jacorb</artifactId>
+            <version>2.3.1jboss.patch01-brew</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTS/jbossjts/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,230 +11,223 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jbossjts</artifactId>
-	<name>JBossJTS packaged module</name>
-	<packaging>jar</packaging>
-
-
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0-beta-4</version>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>create</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<doCheck>true</doCheck>
-					<doUpdate>false</doUpdate>
-					<scmBranchPropertyName>buildScmBranch</scmBranchPropertyName>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestEntries>
-							<arjuna-scm-revision>${buildScmBranch} (revision: ${buildNumber})</arjuna-scm-revision>
-							<arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
-							<arjuna-builder>JBoss Inc. [${user.name}] ${os.name} ${os.version} ${buildproperty.date}</arjuna-builder>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<detectOfflineLinks>false</detectOfflineLinks>
-					<excludePackageNames>*.internal.*</excludePackageNames>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>../../common/classes</source>
-								<source>../../ArjunaCore/arjuna/classes</source>
-								<source>../../ArjunaCore/txoj/classes</source>
-								<source>../../ArjunaCore/tsmx/classes</source>
-								<source>../../ArjunaCore/tsmx/bin</source>
-								<source>../../ArjunaJTA/jta/classes</source>
-								<source>../../ArjunaJTA/jdbc/classes</source>
-								<source>../orbportability/classes</source>
-								<source>../jts/classes</source>
-								<source>../jts/services/classes</source>
-								<source>../jtax/classes</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/jts/services/**/*.java</include>
-						<include>com/arjuna/ats/internal/tsmx/**/*.java</include>
-					</includes>
-				</configuration>
-				<executions>
-					<execution>
-						<id>comp</id>
-						<phase>compile</phase>
-						<goals></goals>
-						<configuration>
-							<excludes>
-								<exclude>**/*.*</exclude>
-							</excludes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>1.4</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<artifactSet>
-								<includes>
-									<include>org.jboss.jbossts:common</include>
-									<include>org.jboss.jbossts:arjuna</include>
-									<include>org.jboss.jbossts:tsmx-tools</include>
-									<include>org.jboss.jbossts:tsmx-jmxbrowser</include>
-									<include>org.jboss.jbossts:osbv-defaults</include>
-									<include>org.jboss.jbossts:tsmx-perfgraph</include>
-									<include>org.jboss.jbossts:txoj</include>
-									<include>org.jboss.jbossts:jta</include>
-									<include>org.jboss.jbossts:jdbc</include>
-									<include>org.jboss.jbossts:orbportability</include>
-									<include>org.jboss.jbossts:jts</include>
-									<include>org.jboss.jbossts:jtax</include>
-								</includes>
-							</artifactSet>
-<filters>
-  <filter>
-    <artifact>org.jboss.jbossts:tsmx-jmxbrowser</artifact>
-    <excludes>
-      <exclude>**/tools.properties</exclude>
-      <exclude>**/*.gif</exclude>
-    </excludes>
-  </filter>
-  <filter>
-    <artifact>org.jboss.jbossts:tsmx-perfgraph</artifact>
-    <excludes>
-      <exclude>**/tools.properties</exclude>
-      <exclude>**/*.gif</exclude>
-    </excludes>
-  </filter>
-  <filter>
-    <artifact>org.jboss.jbossts:tsmx-tools</artifact>
-    <excludes>
-      <exclude>**/tools.properties</exclude>
-      <exclude>**/*.gif</exclude>
-    </excludes>
-  </filter>
-</filters>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-tools</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-jmxbrowser</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>osbv-defaults</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-perfgraph</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>txoj</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jta</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>orbportability</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jts</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jtax</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>tanukisoft</groupId>
-			<artifactId>wrapper</artifactId>
-			<version>3.2.3</version>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jbossjts</artifactId>
+    <name>JBossJTS packaged module</name>
+    <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>1.0-beta-4</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <doCheck>true</doCheck>
+                    <doUpdate>false</doUpdate>
+                    <scmBranchPropertyName>buildScmBranch</scmBranchPropertyName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <arjuna-scm-revision>${buildScmBranch} (revision: ${buildNumber})</arjuna-scm-revision>
+                            <arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
+                            <arjuna-builder>JBoss Inc. [${user.name}] ${os.name} ${os.version} ${buildproperty.date}</arjuna-builder>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <detectOfflineLinks>false</detectOfflineLinks>
+                    <excludePackageNames>*.internal.*</excludePackageNames>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>../../common/classes</source>
+                                <source>../../ArjunaCore/arjuna/classes</source>
+                                <source>../../ArjunaCore/txoj/classes</source>
+                                <source>../../ArjunaCore/tsmx/classes</source>
+                                <source>../../ArjunaCore/tsmx/bin</source>
+                                <source>../../ArjunaJTA/jta/classes</source>
+                                <source>../../ArjunaJTA/jdbc/classes</source>
+                                <source>../orbportability/classes</source>
+                                <source>../jts/classes</source>
+                                <source>../jts/services/classes</source>
+                                <source>../jtax/classes</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/jts/services/**/*.java</include>
+                        <include>com/arjuna/ats/internal/tsmx/**/*.java</include>
+                    </includes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>comp</id>
+                        <phase>compile</phase>
+                        <goals/>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/*.*</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.jboss.jbossts:common</include>
+                                    <include>org.jboss.jbossts:arjuna</include>
+                                    <include>org.jboss.jbossts:tsmx-tools</include>
+                                    <include>org.jboss.jbossts:tsmx-jmxbrowser</include>
+                                    <include>org.jboss.jbossts:osbv-defaults</include>
+                                    <include>org.jboss.jbossts:tsmx-perfgraph</include>
+                                    <include>org.jboss.jbossts:txoj</include>
+                                    <include>org.jboss.jbossts:jta</include>
+                                    <include>org.jboss.jbossts:jdbc</include>
+                                    <include>org.jboss.jbossts:orbportability</include>
+                                    <include>org.jboss.jbossts:jts</include>
+                                    <include>org.jboss.jbossts:jtax</include>
+                                </includes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>org.jboss.jbossts:tsmx-jmxbrowser</artifact>
+                                    <excludes>
+                                        <exclude>**/tools.properties</exclude>
+                                        <exclude>**/*.gif</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.jboss.jbossts:tsmx-perfgraph</artifact>
+                                    <excludes>
+                                        <exclude>**/tools.properties</exclude>
+                                        <exclude>**/*.gif</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>org.jboss.jbossts:tsmx-tools</artifact>
+                                    <excludes>
+                                        <exclude>**/tools.properties</exclude>
+                                        <exclude>**/*.gif</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-tools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-jmxbrowser</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>osbv-defaults</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-perfgraph</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>txoj</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>orbportability</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jtax</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>tanukisoft</groupId>
+            <artifactId>wrapper</artifactId>
+            <version>3.2.3</version>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -11,133 +11,127 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jtax</artifactId>
-	<name>JBossJTS jtax module</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>classes</sourceDirectory>
-		<testSourceDirectory>tests/classes</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>idlj-maven-plugin</artifactId>
-				<dependencies>
-					<dependency>
-						<groupId>org.jacorb</groupId>
-						<artifactId>jacorb-idl-compiler</artifactId>
-						<version>2.2.3</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<goals>
-							<goal>generate-test</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<compiler>jacorb</compiler>
-					<sourceDirectory>tests/idl/</sourceDirectory>
-					<sources>
-						<source>
-							<includes>
-								<include>test.idl</include>
-							</includes>
-							<additionalArguments>
-								<additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
-								<additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
-							</additionalArguments>
-						</source>
-					</sources>
-					<includeDirs>
-						<includeDir>../jts/idl/omg</includeDir>
-						<includeDir>../jts/idl/arjuna</includeDir>
-						<includeDir>../jts/../jacorb/idl/omg</includeDir>
-					</includeDirs>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-test-source</id>
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
-								<source>${basedir}/../../ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/subordinate</source>
-								<source>${basedir}/../../ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/common</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<excludes>
-						<exclude>**/common/**</exclude>
-						<exclude>**/ExampleXAResource.java</exclude>
-						<exclude>**/JTSTestCase.java</exclude>
-						<exclude>**/LastOnePhaseResource.java</exclude>
-
-						<exclude>**/implicit/**</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jta</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jts</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.spec.javax.transaction</groupId>
-			<artifactId>jboss-transaction-api_1.1_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.spec.javax.resource</groupId>
-			<artifactId>jboss-connector-api_1.5_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jacorb</groupId>
-			<artifactId>jacorb</artifactId>
-			<version>2.3.1jboss.patch01-brew</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.slf4j</groupId>
-			<artifactId>slf4j-jboss-logging</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jtax</artifactId>
+    <name>JBossJTS jtax module</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>classes</sourceDirectory>
+        <testSourceDirectory>tests/classes</testSourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>idlj-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jacorb</groupId>
+                        <artifactId>jacorb-idl-compiler</artifactId>
+                        <version>2.2.3</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate-test</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <compiler>jacorb</compiler>
+                    <sourceDirectory>tests/idl/</sourceDirectory>
+                    <sources>
+                        <source>
+                            <includes>
+                                <include>test.idl</include>
+                            </includes>
+                            <additionalArguments>
+                                <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
+                                <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
+                            </additionalArguments>
+                        </source>
+                    </sources>
+                    <includeDirs>
+                        <includeDir>../jts/idl/omg</includeDir>
+                        <includeDir>../jts/idl/arjuna</includeDir>
+                        <includeDir>../jts/../jacorb/idl/omg</includeDir>
+                    </includeDirs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
+                                <source>${basedir}/../../ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/subordinate</source>
+                                <source>${basedir}/../../ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/common</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/common/**</exclude>
+                        <exclude>**/ExampleXAResource.java</exclude>
+                        <exclude>**/JTSTestCase.java</exclude>
+                        <exclude>**/LastOnePhaseResource.java</exclude>
+                        <exclude>**/implicit/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.transaction</groupId>
+            <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.resource</groupId>
+            <artifactId>jboss-connector-api_1.5_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jacorb</groupId>
+            <artifactId>jacorb</artifactId>
+            <version>2.3.1jboss.patch01-brew</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.slf4j</groupId>
+            <artifactId>slf4j-jboss-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -11,187 +11,177 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jts</artifactId>
-	<name>JBossJTS jts</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>classes</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>etc</directory>
-			</resource>
-		</resources>
-		<testSourceDirectory>tests/classes</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>idlj-maven-plugin</artifactId>
-				<dependencies>
-					<dependency>
-						<groupId>org.jacorb</groupId>
-						<artifactId>jacorb-idl-compiler</artifactId>
-						<version>2.2.3</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>generate-sources</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<compiler>jacorb</compiler>
-							<sourceDirectory>idl/</sourceDirectory>
-							<outputDirectory>target/generated-sources/idl</outputDirectory>
-							<sources>
-								<source>
-									<includes>
-										<include>omg/CosTransactions.idl</include>
-										<include>arjuna/ArjunaOTS.idl</include>
-										<include>omg/XA.idl</include>
-									</includes>
-									<additionalArguments>
-										<additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
-										<additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
-										<additionalArgument>-i2jpackage</additionalArgument>
-										<additionalArgument>CosTransactions:org.omg.CosTransactions</additionalArgument>
-										<additionalArgument>-i2jpackage</additionalArgument>
-										<additionalArgument>XA:org.omg.XA</additionalArgument>
-										<additionalArgument>-i2jpackage</additionalArgument>
-										<additionalArgument>ArjunaOTS:com.arjuna.ArjunaOTS</additionalArgument>
-									</additionalArguments>
-								</source>
-							</sources>
-							<includeDirs>
-								<includeDir>../jacorb/idl/omg</includeDir>
-							</includeDirs>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate-test-sources</id>
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>generate-test</goal>
-						</goals>
-						<configuration>
-							<compiler>jacorb</compiler>
-							<sourceDirectory>tests/idl/</sourceDirectory>
-							<outputDirectory>target/generated-test-sources/idl</outputDirectory>
-							<sources>
-								<source>
-									<includes>
-										<include>TestModule.idl</include>
-									</includes>
-									<additionalArguments>
-										<additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
-										<additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
-										<additionalArgument>-i2jpackage</additionalArgument>
-										<additionalArgument>TestModule:com.hp.mwtests.ts.jts.TestModule</additionalArgument>
-									</additionalArguments>
-								</source>
-							</sources>
-							<includeDirs>
-								<includeDir>idl/omg</includeDir>
-								<includeDir>../jacorb/idl/omg</includeDir>
-							</includeDirs>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-test-source</id>
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<excludes>
-						<!-- exclude tests which we don't want to run -->
-						<exclude>**/common/**</exclude>
-
-						<exclude>**/exceptions/**</exclude>
-						<exclude>**/orbspecific/resources/**</exclude>
-						<exclude>**/resources/**</exclude>
-						<exclude>**/utils/ResourceTrace.java</exclude>
-						<exclude>**/utils/Util.java</exclude>
-
-						<exclude>**/TransactionTest2.java</exclude>
-						<exclude>**/CheckedTransactions.java</exclude>
-						<exclude>**/GridTest.java</exclude>
-						<exclude>**/remote/**</exclude>
-
-						<exclude>**/DefaultTimeout.java</exclude>
-
-						<!-- <exclude>**/RecoveryEnablementUnitTest.java</exclude> -->
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>jacorb</groupId>
-			<artifactId>jacorb</artifactId>
-			<version>2.3.1jboss.patch01-brew</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>orbportability</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>txoj</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.slf4j</groupId>
-			<artifactId>slf4j-jboss-logging</artifactId>
-			<scope>provided</scope>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jts</artifactId>
+    <name>JBossJTS jts</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>classes</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>etc</directory>
+            </resource>
+        </resources>
+        <testSourceDirectory>tests/classes</testSourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>idlj-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jacorb</groupId>
+                        <artifactId>jacorb-idl-compiler</artifactId>
+                        <version>2.2.3</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>generate-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <compiler>jacorb</compiler>
+                            <sourceDirectory>idl/</sourceDirectory>
+                            <outputDirectory>target/generated-sources/idl</outputDirectory>
+                            <sources>
+                                <source>
+                                    <includes>
+                                        <include>omg/CosTransactions.idl</include>
+                                        <include>arjuna/ArjunaOTS.idl</include>
+                                        <include>omg/XA.idl</include>
+                                    </includes>
+                                    <additionalArguments>
+                                        <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
+                                        <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
+                                        <additionalArgument>-i2jpackage</additionalArgument>
+                                        <additionalArgument>CosTransactions:org.omg.CosTransactions</additionalArgument>
+                                        <additionalArgument>-i2jpackage</additionalArgument>
+                                        <additionalArgument>XA:org.omg.XA</additionalArgument>
+                                        <additionalArgument>-i2jpackage</additionalArgument>
+                                        <additionalArgument>ArjunaOTS:com.arjuna.ArjunaOTS</additionalArgument>
+                                    </additionalArguments>
+                                </source>
+                            </sources>
+                            <includeDirs>
+                                <includeDir>../jacorb/idl/omg</includeDir>
+                            </includeDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>generate-test-sources</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>generate-test</goal>
+                        </goals>
+                        <configuration>
+                            <compiler>jacorb</compiler>
+                            <sourceDirectory>tests/idl/</sourceDirectory>
+                            <outputDirectory>target/generated-test-sources/idl</outputDirectory>
+                            <sources>
+                                <source>
+                                    <includes>
+                                        <include>TestModule.idl</include>
+                                    </includes>
+                                    <additionalArguments>
+                                        <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
+                                        <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
+                                        <additionalArgument>-i2jpackage</additionalArgument>
+                                        <additionalArgument>TestModule:com.hp.mwtests.ts.jts.TestModule</additionalArgument>
+                                    </additionalArguments>
+                                </source>
+                            </sources>
+                            <includeDirs>
+                                <includeDir>idl/omg</includeDir>
+                                <includeDir>../jacorb/idl/omg</includeDir>
+                            </includeDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <excludes>
+                        <!-- exclude tests which we don't want to run -->
+                        <exclude>**/common/**</exclude>
+                        <exclude>**/exceptions/**</exclude>
+                        <exclude>**/orbspecific/resources/**</exclude>
+                        <exclude>**/resources/**</exclude>
+                        <exclude>**/utils/ResourceTrace.java</exclude>
+                        <exclude>**/utils/Util.java</exclude>
+                        <exclude>**/TransactionTest2.java</exclude>
+                        <exclude>**/CheckedTransactions.java</exclude>
+                        <exclude>**/GridTest.java</exclude>
+                        <exclude>**/remote/**</exclude>
+                        <exclude>**/DefaultTimeout.java</exclude>
+                        <!-- <exclude>**/RecoveryEnablementUnitTest.java</exclude> -->
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>jacorb</groupId>
+            <artifactId>jacorb</artifactId>
+            <version>2.3.1jboss.patch01-brew</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>orbportability</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>txoj</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.slf4j</groupId>
+            <artifactId>slf4j-jboss-logging</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -11,145 +11,137 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>orbportability</artifactId>
-	<name>JBossJTS orb portability</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>classes</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>etc</directory>
-			</resource>
-			<resource>
-				<directory>config</directory>
-			</resource>
-		</resources>
-		<testSourceDirectory>tests/classes</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-test-source</id>
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>idlj-maven-plugin</artifactId>
-				<dependencies>
-					<dependency>
-						<groupId>org.jacorb</groupId>
-						<artifactId>jacorb-idl-compiler</artifactId>
-						<version>2.2.3</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<goals>
-							<goal>generate-test</goal>
-						</goals>
-						<configuration>
-							<sourceDirectory>tests/idl/</sourceDirectory>
-						</configuration>
-					</execution>
-				</executions>
-				<configuration>
-					<compiler>jacorb</compiler>
-					<sources>
-						<source>
-							<includes>
-								<include>orbtests.idl</include>
-							</includes>
-							<additionalArguments>
-								<additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
-								<additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>orbtests:com.hp.mwtests.orbportability.orbspecific.orbtests</additionalArgument>
-							</additionalArguments>
-						</source>
-					</sources>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<excludes>
-						<!-- exclude tests which we don't want to run -->
-						<exclude>**/common/**</exclude>
-
-						<exclude>**/initialisation/postinit/**</exclude>
-						<exclude>**/initialisation/postset/**</exclude>
-						<exclude>**/initialisation/preinit/**</exclude>
-						<exclude>**/initialisation/TestAttributeCallback.java</exclude>
-						<exclude>**/SimpleObjectImpl.java</exclude>
-						<exclude>**/TestAttributeCallback.java</exclude>
-						<exclude>**/PrePostTestCallback.java</exclude>
-
-
-						<!-- these ones need fixing -->
-						<exclude>**/PropertyInitTest.java</exclude>
-						<exclude>**/PropertyInitTest3.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jacorb</groupId>
-			<artifactId>jacorb</artifactId>
-			<version>2.3.1jboss.patch01-brew</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.slf4j</groupId>
-			<artifactId>slf4j-jboss-logging</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-					<dependency>
-						<groupId>org.apache.ant</groupId>
-						<artifactId>ant</artifactId>
-						<version>1.7.1</version>
-						<scope>provided</scope>
-					</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>orbportability</artifactId>
+    <name>JBossJTS orb portability</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>classes</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>etc</directory>
+            </resource>
+            <resource>
+                <directory>config</directory>
+            </resource>
+        </resources>
+        <testSourceDirectory>tests/classes</testSourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${basedir}/../../common/tests/com/arjuna/common/tests/simple</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>idlj-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jacorb</groupId>
+                        <artifactId>jacorb-idl-compiler</artifactId>
+                        <version>2.2.3</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate-test</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirectory>tests/idl/</sourceDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <compiler>jacorb</compiler>
+                    <sources>
+                        <source>
+                            <includes>
+                                <include>orbtests.idl</include>
+                            </includes>
+                            <additionalArguments>
+                                <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
+                                <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>orbtests:com.hp.mwtests.orbportability.orbspecific.orbtests</additionalArgument>
+                            </additionalArguments>
+                        </source>
+                    </sources>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <excludes>
+                        <!-- exclude tests which we don't want to run -->
+                        <exclude>**/common/**</exclude>
+                        <exclude>**/initialisation/postinit/**</exclude>
+                        <exclude>**/initialisation/postset/**</exclude>
+                        <exclude>**/initialisation/preinit/**</exclude>
+                        <exclude>**/initialisation/TestAttributeCallback.java</exclude>
+                        <exclude>**/SimpleObjectImpl.java</exclude>
+                        <exclude>**/TestAttributeCallback.java</exclude>
+                        <exclude>**/PrePostTestCallback.java</exclude>
+                        <!-- these ones need fixing -->
+                        <exclude>**/PropertyInitTest.java</exclude>
+                        <exclude>**/PropertyInitTest3.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jacorb</groupId>
+            <artifactId>jacorb</artifactId>
+            <version>2.3.1jboss.patch01-brew</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.slf4j</groupId>
+            <artifactId>slf4j-jboss-logging</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.7.1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTS/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,36 +12,34 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jbossjts-all</artifactId>
-	<packaging>pom</packaging>
-	<name>JBossJTS everything</name>
-
-	<modules>
-		<module>../common</module>
-		<module>../ArjunaCore/arjuna</module>
-		<module>../ArjunaCore/txoj</module>
-		<module>../ArjunaCore/tsmx</module>
-		<module>../ArjunaCore/arjuna/services</module>
-		<module>../ArjunaJTA/jta</module>
-		<module>../ArjunaJTA/jdbc</module>
-		<module>../ArjunaJTA/tsmx</module>
-		<module>orbportability</module>
-		<module>jts</module>
-		<module>jtax</module>
-		<module>tsmx-sar</module>
-		<module>jbossjts</module>
-		<module>tsmx</module>
-		<module>integration</module>
- 		<module>trailmap</module>
-		<module>docs</module>
-		<module>../rhq-plugin</module>
-		<module>dist</module>
-	</modules>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jbossjts-all</artifactId>
+    <packaging>pom</packaging>
+    <name>JBossJTS everything</name>
+    <modules>
+        <module>../common</module>
+        <module>../ArjunaCore/arjuna</module>
+        <module>../ArjunaCore/txoj</module>
+        <module>../ArjunaCore/tsmx</module>
+        <module>../ArjunaCore/arjuna/services</module>
+        <module>../ArjunaJTA/jta</module>
+        <module>../ArjunaJTA/jdbc</module>
+        <module>../ArjunaJTA/tsmx</module>
+        <module>orbportability</module>
+        <module>jts</module>
+        <module>jtax</module>
+        <module>tsmx-sar</module>
+        <module>jbossjts</module>
+        <module>tsmx</module>
+        <module>integration</module>
+        <module>trailmap</module>
+        <module>docs</module>
+        <module>../rhq-plugin</module>
+        <module>dist</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTS/trailmap/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,71 +12,63 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-
-
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>trailmap</artifactId>
-	<packaging>jar</packaging>
-	<name>JBossJTS Trailmap documentation</name>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<configuration>
-							<target>
-								<property name="docs.dir" value="docs" />
-								<property name="xsl.dir" value="xsl" />
-								<property name="html.dir" value="target/classes/html" />
-								<property name="xsl.file" value="ATL_LookAndFeel.xsl" />
-								<copy todir="${html.dir}">
-									<fileset dir="${docs.dir}">
-										<include name="**/*.css" />
-										<include name="**/*.gif" />
-										<include name="**/*.jpg" />
-										<include name="**/*.GIF" />
-									</fileset>
-								</copy>
-								<style processor="trax" style="${xsl.dir}/${xsl.file}"
-									basedir="${docs.dir}" includes="*.xml" destdir="${html.dir}"
-									extension=".html">
-									<param name="rootpath" expression="." />
-								</style>
-
-        <copy todir="target/classes/">
-            <fileset dir=".">
-		<include name="src/"/>
-		<include name="build.xml"/>
-		<include name="README.txt"/>
-            </fileset>
-        </copy>
-
-							</target>
-							<dependencies>
-								<dependency>
-									<groupId>org.apache.ant</groupId>
-									<artifactId>ant-trax</artifactId>
-									<version>1.8.0</version>
-								</dependency>
-							</dependencies>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.jbossts</groupId>
+    <artifactId>trailmap</artifactId>
+    <packaging>jar</packaging>
+    <name>JBossJTS Trailmap documentation</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target>
+                                <property name="docs.dir" value="docs"/>
+                                <property name="xsl.dir" value="xsl"/>
+                                <property name="html.dir" value="target/classes/html"/>
+                                <property name="xsl.file" value="ATL_LookAndFeel.xsl"/>
+                                <copy todir="${html.dir}">
+                                    <fileset dir="${docs.dir}">
+                                        <include name="**/*.css"/>
+                                        <include name="**/*.gif"/>
+                                        <include name="**/*.jpg"/>
+                                        <include name="**/*.GIF"/>
+                                    </fileset>
+                                </copy>
+                                <style processor="trax" style="${xsl.dir}/${xsl.file}" basedir="${docs.dir}" includes="*.xml" destdir="${html.dir}" extension=".html">
+                                    <param name="rootpath" expression="."/>
+                                </style>
+                                <copy todir="target/classes/">
+                                    <fileset dir=".">
+                                        <include name="src/"/>
+                                        <include name="build.xml"/>
+                                        <include name="README.txt"/>
+                                    </fileset>
+                                </copy>
+                            </target>
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.apache.ant</groupId>
+                                    <artifactId>ant-trax</artifactId>
+                                    <version>1.8.0</version>
+                                </dependency>
+                            </dependencies>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/tsmx/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/tsmx/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTS/tsmx/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,92 +11,87 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>tsmx-jts-objectstorebrowser</artifactId>
-	<name>JBossJTS tsmx-jts-objectstorebrowser module</name>
-	<packaging>jar</packaging>
-
-
-	<build>
-		<resources>
-			<resource>
-				<directory>../../ArjunaCore/tsmx/etc/objectstorebrowser</directory>
-			</resource>
-		</resources>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/objectstorebrowser/**</include>
-					</includes>
-					<!-- TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tsmx-jts-objectstorebrowser</artifactId>
+    <name>JBossJTS tsmx-jts-objectstorebrowser module</name>
+    <packaging>jar</packaging>
+    <build>
+        <resources>
+            <resource>
+                <directory>../../ArjunaCore/tsmx/etc/objectstorebrowser</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/objectstorebrowser/**</include>
+                    </includes>
+                    <!-- TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO 
 						A TYPO <excludes> <exclude>com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/**</exclude> 
 						</excludes> -->
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>com/arjuna/ats/tools/objectstorebrowser/**</include>
-						<include>**/*.properties</include>
-						<include>**/*.gif</include>
-					</includes>
-					<!-- TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO 
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>com/arjuna/ats/tools/objectstorebrowser/**</include>
+                        <include>**/*.properties</include>
+                        <include>**/*.gif</include>
+                    </includes>
+                    <!-- TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO 
 						A TYPO <excludes> <exclude>com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/**</exclude> 
 						</excludes> -->
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>../../ArjunaCore/tsmx/bin</source>
-								<source>../../ArjunaJTA/tsmx/bin</source>
-								<source>bin</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-tools</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jta</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jts</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.spec.javax.transaction</groupId>
-			<artifactId>jboss-transaction-api_1.1_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>../../ArjunaCore/tsmx/bin</source>
+                                <source>../../ArjunaJTA/tsmx/bin</source>
+                                <source>bin</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-tools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jta</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.transaction</groupId>
+            <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/ArjunaJTS/tsmx-sar/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/tsmx-sar/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/ArjunaJTS/tsmx-sar/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,70 +11,65 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jbossts-tools</artifactId>
-	<name>JBossJTS tsmx tools sar</name>
-	<packaging>jar</packaging>
-
-
-	<build>
-		<sourceDirectory>../../ArjunaCore/tsmx/sar/src</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2</version>
-				<extensions>true</extensions>
-				<executions>
-					<execution>
-						<id>my-sar</id>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<descriptors>
-								<descriptor>src/assembly/sar.xml</descriptor>
-							</descriptors>
-							<archive>
-								<manifestEntries>
-									<Class-Path>tsmx-tools.jar tools/tsmx-objectstorebrowser.jar</Class-Path>
-								</manifestEntries>
-							</archive>
-						</configuration>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>jboss-packaging-maven-plugin</artifactId>
-						<version>2.2</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-tools</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>tsmx-jta-objectstorebrowser</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>osbv-defaults</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jbossts-tools</artifactId>
+    <name>JBossJTS tsmx tools sar</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../../ArjunaCore/tsmx/sar/src</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>my-sar</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/assembly/sar.xml</descriptor>
+                            </descriptors>
+                            <archive>
+                                <manifestEntries>
+                                    <Class-Path>tsmx-tools.jar tools/tsmx-objectstorebrowser.jar</Class-Path>
+                                </manifestEntries>
+                            </archive>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>jboss-packaging-maven-plugin</artifactId>
+                        <version>2.2</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-tools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>tsmx-jta-objectstorebrowser</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>osbv-defaults</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/WS-C/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WS-C/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,22 +11,18 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>ws-c-all</artifactId>
-	<packaging>pom</packaging>
-	
-	<modules>
-		<module>ws-c</module>
-		<module>ws-c10</module>
-		<module>ws-c11</module>
-	</modules>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>ws-c-all</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>ws-c</module>
+        <module>ws-c10</module>
+        <module>ws-c11</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WS-C/ws-c/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,46 +11,42 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>ws-c</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../dev/src</sourceDirectory>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<classifier>api</classifier>
-							<includes>
-								<include>com/arjuna/wsc/AlreadyRegisteredException.class</include>
-							</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>common</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>ws-c</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../dev/src</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>api</classifier>
+                            <includes>
+                                <include>com/arjuna/wsc/AlreadyRegisteredException.class</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/WS-C/ws-c10/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/ws-c10/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WS-C/ws-c10/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,53 +11,50 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>ws-c10</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../dev/src10</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<classifier>api</classifier>
-							<includes>
-								<include>com/arjuna/webservices/wscoor/CoordinationConstants.class</include>
-							</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.spec.javax.servlet</groupId>
-			<artifactId>jboss-servlet-api_3.0_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>ws-c</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>ws-c10</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../dev/src10</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>api</classifier>
+                            <includes>
+                                <include>com/arjuna/webservices/wscoor/CoordinationConstants.class</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.servlet</groupId>
+            <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WS-C/ws-c11/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,38 +11,35 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>ws-c11</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../dev/src11</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.spec.javax.servlet</groupId>
-			<artifactId>jboss-servlet-api_3.0_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.ws</groupId>
-			<artifactId>jbossws-common</artifactId>
-			<version>2.0.0.Alpha3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>ws-c</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>ws-c11</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../dev/src11</sourceDirectory>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.servlet</groupId>
+            <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.ws</groupId>
+            <artifactId>jbossws-common</artifactId>
+            <version>2.0.0.Alpha3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/WS-T/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WS-T/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,21 +11,18 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>ws-t-all</artifactId>
-	<packaging>pom</packaging>
-
-	<modules>
-		<module>ws-t</module>
-		<module>ws-t10</module>
-		<module>ws-t11</module>
-	</modules>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>ws-t-all</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>ws-t</module>
+        <module>ws-t10</module>
+        <module>ws-t11</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/XTS/WS-T/ws-t/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/ws-t/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WS-T/ws-t/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,63 +11,59 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>ws-t</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../dev/src</sourceDirectory>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<classifier>api</classifier>
-							<includes>
-								<include>com/arjuna/wst/Vote.class</include>
-								<include>com/arjuna/wst/Prepared.class</include>
-								<include>com/arjuna/wst/ReadOnly.class</include>
-								<include>com/arjuna/wst/Aborted.class</include>
-								<include>com/arjuna/wst/Participant.class</include>
-								<include>com/arjuna/wst/Durable2PCParticipant.class</include>
-								<include>com/arjuna/wst/Volatile2PCParticipant.class</include>
-								<include>com/arjuna/wst/BusinessAgreementWithParticipantCompletionParticipant.class</include>
-								<include>com/arjuna/wst/BusinessAgreementWithCoordinatorCompletionParticipant.class</include>
-								<include>com/arjuna/wst/WrongStateException.class</include>
-								<include>com/arjuna/wst/SystemException.class</include>
-								<include>com/arjuna/wst/TransactionRolledBackException.class</include>
-								<include>com/arjuna/wst/UnknownTransactionException.class</include>
-								<include>com/arjuna/wst/FaultedException.class</include>
-								<include>org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryModule.class</include>
-								<include>org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManager.class</include>
-								<include>org/jboss/jbossts/xts/recovery/participant/ba/XTSBARecoveryModule.class</include>
-								<include>org/jboss/jbossts/xts/recovery/participant/ba/XTSBARecoveryManager.class</include>
-							</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>ws-t</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../dev/src</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>api</classifier>
+                            <includes>
+                                <include>com/arjuna/wst/Vote.class</include>
+                                <include>com/arjuna/wst/Prepared.class</include>
+                                <include>com/arjuna/wst/ReadOnly.class</include>
+                                <include>com/arjuna/wst/Aborted.class</include>
+                                <include>com/arjuna/wst/Participant.class</include>
+                                <include>com/arjuna/wst/Durable2PCParticipant.class</include>
+                                <include>com/arjuna/wst/Volatile2PCParticipant.class</include>
+                                <include>com/arjuna/wst/BusinessAgreementWithParticipantCompletionParticipant.class</include>
+                                <include>com/arjuna/wst/BusinessAgreementWithCoordinatorCompletionParticipant.class</include>
+                                <include>com/arjuna/wst/WrongStateException.class</include>
+                                <include>com/arjuna/wst/SystemException.class</include>
+                                <include>com/arjuna/wst/TransactionRolledBackException.class</include>
+                                <include>com/arjuna/wst/UnknownTransactionException.class</include>
+                                <include>com/arjuna/wst/FaultedException.class</include>
+                                <include>org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryModule.class</include>
+                                <include>org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManager.class</include>
+                                <include>org/jboss/jbossts/xts/recovery/participant/ba/XTSBARecoveryModule.class</include>
+                                <include>org/jboss/jbossts/xts/recovery/participant/ba/XTSBARecoveryManager.class</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/WS-T/ws-t10/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/ws-t10/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WS-T/ws-t10/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,42 +11,39 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>ws-t10</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../dev/src10</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<classifier>api</classifier>
-							<includes>
-								<include>com/arjuna/wst/BAParticipantManager.class</include>
-							</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>ws-t10</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../dev/src10</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>api</classifier>
+                            <includes>
+                                <include>com/arjuna/wst/BAParticipantManager.class</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
         <dependency>
             <groupId>org.jboss.jbossts</groupId>
             <artifactId>ws-c10</artifactId>
@@ -64,5 +60,5 @@
             <groupId>org.jboss.spec.javax.servlet</groupId>
             <artifactId>jboss-servlet-api_3.0_spec</artifactId>
         </dependency>
-	</dependencies>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WS-T/ws-t11/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,54 +11,51 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>ws-t11</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../dev/src11</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<classifier>api</classifier>
-							<includes>
-								<include>com/arjuna/wst11/BAParticipantManager.class</include>
-								<include>com/arjuna/wst11/ConfirmCompletedParticipant.class</include>
-							</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>ws-c11</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>ws-t</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wscf</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>ws-t11</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../dev/src11</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>api</classifier>
+                            <includes>
+                                <include>com/arjuna/wst11/BAParticipantManager.class</include>
+                                <include>com/arjuna/wst11/ConfirmCompletedParticipant.class</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c11</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wscf</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/WSAS/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WSAS/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,25 +11,22 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>wsas</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>classes</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wsas</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>classes</sourceDirectory>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/WSCF/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WSCF/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,23 +11,18 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>wscf-all</artifactId>
-	<packaging>pom</packaging>
-
-
-	<modules>
-		<module>wscf</module>
-		<module>wscf10</module>
-		<module>wscf11</module>
-	</modules>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wscf-all</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>wscf</module>
+        <module>wscf10</module>
+        <module>wscf11</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/XTS/WSCF/wscf/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/wscf/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WSCF/wscf/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,33 +11,30 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>wscf</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../classes</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wsas</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>arjuna</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>ws-c</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wscf</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../classes</sourceDirectory>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wsas</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>arjuna</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/WSCF/wscf10/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/wscf10/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WSCF/wscf10/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,35 +11,30 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>wscf10</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../classes10</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wscf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>ws-c10</artifactId>
-		</dependency>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wscf10</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../classes10</sourceDirectory>
+    </build>
+    <dependencies>
         <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wscf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c10</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.jboss.spec.javax.servlet</groupId>
             <artifactId>jboss-servlet-api_3.0_spec</artifactId>
         </dependency>
-	</dependencies>
-
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/WSCF/wscf11/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/wscf11/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WSCF/wscf11/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,30 +11,26 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>wscf11</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../classes11</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wscf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>ws-c11</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wscf11</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../classes11</sourceDirectory>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wscf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c11</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/WSTX/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WSTX/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,21 +11,18 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>wstx-all</artifactId>
-	<packaging>pom</packaging>
-
-	<modules>
-		<module>wstx</module>
-		<module>wstx10</module>
-		<module>wstx11</module>
-	</modules>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wstx-all</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>wstx</module>
+        <module>wstx10</module>
+        <module>wstx11</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/XTS/WSTX/wstx/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/wstx/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WSTX/wstx/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,54 +11,50 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>wstx</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../classes</sourceDirectory>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<classifier>api</classifier>
-							<includes>
-								<include>com/arjuna/mw/wst/TxContext.class</include>
-							</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wsas</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>ws-t</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wscf</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wstx</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../classes</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>api</classifier>
+                            <includes>
+                                <include>com/arjuna/mw/wst/TxContext.class</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wsas</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wscf</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/WSTX/wstx10/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/wstx10/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WSTX/wstx10/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,75 +11,72 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>wstx10</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../classes10</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<classifier>api</classifier>
-							<includes>
-								<include>com/arjuna/mw/wst/UserTransaction.class</include>
-								<include>com/arjuna/mw/wst/UserTransactionFactory.class</include>
-								<include>com/arjuna/mw/wst/TransactionManager.class</include>
-								<include>com/arjuna/mw/wst/TransactionManagerFactory.class</include>
-								<include>com/arjuna/mw/wst/UserBusinessActivity.class</include>
-								<include>com/arjuna/mw/wst/UserBusinessActivityFactory.class</include>
-								<include>com/arjuna/mw/wst/BusinessActivityManager.class</include>
-								<include>com/arjuna/mw/wst/BusinessActivityManagerFactory.class</include>
-								<include>com/arjuna/mw/wst/client/JaxWSHeaderContextProcessor.class</include>
-								<include>com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.class</include>
-								<include>com/arjuna/mw/wst/client/JaxBaseHeaderContextProcessor.class</include>
-								<include>com/arjuna/mw/wst/service/JaxWSHeaderContextProcessor.class</include>
-								<include>com/arjuna/mw/wst/service/JaxWSSubordinateHeaderContextProcessor.class</include>
-								<include>com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.class</include>
-								<include>com/arjuna/mw/wst/service/JaxBaseHeaderContextProcessor.class</include>
-							</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>ws-c10</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>ws-t10</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wstx</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wscf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wscf10</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wstx10</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../classes10</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>api</classifier>
+                            <includes>
+                                <include>com/arjuna/mw/wst/UserTransaction.class</include>
+                                <include>com/arjuna/mw/wst/UserTransactionFactory.class</include>
+                                <include>com/arjuna/mw/wst/TransactionManager.class</include>
+                                <include>com/arjuna/mw/wst/TransactionManagerFactory.class</include>
+                                <include>com/arjuna/mw/wst/UserBusinessActivity.class</include>
+                                <include>com/arjuna/mw/wst/UserBusinessActivityFactory.class</include>
+                                <include>com/arjuna/mw/wst/BusinessActivityManager.class</include>
+                                <include>com/arjuna/mw/wst/BusinessActivityManagerFactory.class</include>
+                                <include>com/arjuna/mw/wst/client/JaxWSHeaderContextProcessor.class</include>
+                                <include>com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.class</include>
+                                <include>com/arjuna/mw/wst/client/JaxBaseHeaderContextProcessor.class</include>
+                                <include>com/arjuna/mw/wst/service/JaxWSHeaderContextProcessor.class</include>
+                                <include>com/arjuna/mw/wst/service/JaxWSSubordinateHeaderContextProcessor.class</include>
+                                <include>com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.class</include>
+                                <include>com/arjuna/mw/wst/service/JaxBaseHeaderContextProcessor.class</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c10</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t10</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wstx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wscf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wscf10</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/WSTX/wstx11/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,65 +11,62 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>wstx11</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>../classes11</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<classifier>api</classifier>
-							<includes>
-								<include>com/arjuna/mw/wst11/UserTransaction.class</include>
-								<include>com/arjuna/mw/wst11/UserTransactionFactory.class</include>
-								<include>com/arjuna/mw/wst11/TransactionManager.class</include>
-								<include>com/arjuna/mw/wst11/TransactionManagerFactory.class</include>
-								<include>com/arjuna/mw/wst11/UserBusinessActivity.class</include>
-								<include>com/arjuna/mw/wst11/UserBusinessActivityFactory.class</include>
-								<include>com/arjuna/mw/wst11/BusinessActivityManager.class</include>
-								<include>com/arjuna/mw/wst11/BusinessActivityManagerFactory.class</include>
-								<include>com/arjuna/mw/wst11/client/JaxWSHeaderContextProcessor.class</include>
-								<include>com/arjuna/mw/wst11/client/JaxBaseHeaderContextProcessor.class</include>
-								<include>com/arjuna/mw/wst11/service/JaxWSHeaderContextProcessor.class</include>
-								<include>com/arjuna/mw/wst11/service/JaxWSSubordinateHeaderContextProcessor.class</include>
-								<include>com/arjuna/mw/wst11/service/JaxBaseHeaderContextProcessor.class</include>
-							</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wscf11</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>ws-t11</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wstx</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wstx11</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>../classes11</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>api</classifier>
+                            <includes>
+                                <include>com/arjuna/mw/wst11/UserTransaction.class</include>
+                                <include>com/arjuna/mw/wst11/UserTransactionFactory.class</include>
+                                <include>com/arjuna/mw/wst11/TransactionManager.class</include>
+                                <include>com/arjuna/mw/wst11/TransactionManagerFactory.class</include>
+                                <include>com/arjuna/mw/wst11/UserBusinessActivity.class</include>
+                                <include>com/arjuna/mw/wst11/UserBusinessActivityFactory.class</include>
+                                <include>com/arjuna/mw/wst11/BusinessActivityManager.class</include>
+                                <include>com/arjuna/mw/wst11/BusinessActivityManagerFactory.class</include>
+                                <include>com/arjuna/mw/wst11/client/JaxWSHeaderContextProcessor.class</include>
+                                <include>com/arjuna/mw/wst11/client/JaxBaseHeaderContextProcessor.class</include>
+                                <include>com/arjuna/mw/wst11/service/JaxWSHeaderContextProcessor.class</include>
+                                <include>com/arjuna/mw/wst11/service/JaxWSSubordinateHeaderContextProcessor.class</include>
+                                <include>com/arjuna/mw/wst11/service/JaxBaseHeaderContextProcessor.class</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wscf11</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t11</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wstx</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/bridge/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/bridge/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/bridge/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,48 +11,45 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>bridge</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<classifier>api</classifier>
-							<includes>
-								<include>org/jboss/jbossts/xts/bridge/at/BridgeWrapper.class</include>
-							</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wscf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wstx11</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>bridge</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>api</classifier>
+                            <includes>
+                                <include>org/jboss/jbossts/xts/bridge/at/BridgeWrapper.class</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wscf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wstx11</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/demo/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/demo/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,75 +12,71 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-
-
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>xts-demo</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<configuration>
-							<target>
-	<property name="selected-distrib-dir" location="target/classes"/>
-    <property name="docs.dir" location="docs"/>
-    <property name="xsl.dir"  location="xsl"/>
-    <property name="html.dir" location="target/classes/html"/>
-    <property name="xsl.file" value="ATL_LookAndFeel.xsl"/>
-        <copy todir="${html.dir}">
-            <fileset dir="${docs.dir}">
-                <include name="**/*.css"/>
-                <include name="**/*.gif"/>
-                <include name="**/*.jpg"/>
-            </fileset>
-        </copy>
-        <style processor="trax" style="${xsl.dir}/${xsl.file}" basedir="${docs.dir}" includes="*.xml" destdir="${html.dir}" extension=".html">
-            <param name="rootpath" expression="."/>
-        </style>
-        <!-- copy everything (CVS dirs are auto-ignored) -->
-        <copy todir="${selected-distrib-dir}">
-            <fileset dir=".">
-                <include name="src/**"/>
-                <include name="srcrpc/**"/>
-                <include name="dd/**"/>
-                <include name="ddrpc/**"/>
-                <include name="web/**"/>
-                <include name="*.properties"/>
-                <include name="build.sh"/>
-                <include name="build.bat"/>
-                <include name="BUILDING"/>
-            </fileset>
-        </copy>
-        <!-- remove our dirty laundry -->
-        <copy file="xts-build.xml" tofile="${selected-distrib-dir}/build.xml"/>
-							</target>
-							<dependencies>
-								<dependency>
-									<groupId>org.apache.ant</groupId>
-									<artifactId>ant-trax</artifactId>
-									<version>1.8.0</version>
-								</dependency>
-							</dependencies>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.jbossts</groupId>
+    <artifactId>xts-demo</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target>
+                                <property name="selected-distrib-dir" location="target/classes"/>
+                                <property name="docs.dir" location="docs"/>
+                                <property name="xsl.dir" location="xsl"/>
+                                <property name="html.dir" location="target/classes/html"/>
+                                <property name="xsl.file" value="ATL_LookAndFeel.xsl"/>
+                                <copy todir="${html.dir}">
+                                    <fileset dir="${docs.dir}">
+                                        <include name="**/*.css"/>
+                                        <include name="**/*.gif"/>
+                                        <include name="**/*.jpg"/>
+                                    </fileset>
+                                </copy>
+                                <style processor="trax" style="${xsl.dir}/${xsl.file}" basedir="${docs.dir}" includes="*.xml" destdir="${html.dir}" extension=".html">
+                                    <param name="rootpath" expression="."/>
+                                </style>
+                                <!-- copy everything (CVS dirs are auto-ignored) -->
+                                <copy todir="${selected-distrib-dir}">
+                                    <fileset dir=".">
+                                        <include name="src/**"/>
+                                        <include name="srcrpc/**"/>
+                                        <include name="dd/**"/>
+                                        <include name="ddrpc/**"/>
+                                        <include name="web/**"/>
+                                        <include name="*.properties"/>
+                                        <include name="build.sh"/>
+                                        <include name="build.bat"/>
+                                        <include name="BUILDING"/>
+                                    </fileset>
+                                </copy>
+                                <!-- remove our dirty laundry -->
+                                <copy file="xts-build.xml" tofile="${selected-distrib-dir}/build.xml"/>
+                            </target>
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.apache.ant</groupId>
+                                    <artifactId>ant-trax</artifactId>
+                                    <version>1.8.0</version>
+                                </dependency>
+                            </dependencies>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: labs/jbosstm/trunk/XTS/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/dist/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/dist/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,171 +12,159 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-
-
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>xts-full</artifactId>
-	<packaging>pom</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<descriptors>
-						<descriptor>src/main/assembly/bin.xml</descriptor>
-					</descriptors>
-					<tarLongFileMode>gnu</tarLongFileMode>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wsas</artifactId>
-			</dependency>
-
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-c</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-c10</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-c11</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-c</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-c10</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t10</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t11</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t10</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t11</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wscf</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wscf10</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wscf11</artifactId>
-			</dependency>
-
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx10</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx11</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx10</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx11</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>recovery</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>bridge</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossxts-api</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossxts-api</artifactId>
-				<classifier>javadoc</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>xts-guide</artifactId>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>xts-demo</artifactId>
-			</dependency>
-	</dependencies>
-
-
-	<properties>
-		<PRODUCT_NAME>xts</PRODUCT_NAME>
-		<HOME_DIRECTORY>XTS_HOME</HOME_DIRECTORY>
-	</properties>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.jbossts</groupId>
+    <artifactId>xts-full</artifactId>
+    <packaging>pom</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                    </descriptors>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wsas</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c10</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c11</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c10</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t10</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t11</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t10</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t11</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wscf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wscf10</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wscf11</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wstx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wstx10</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wstx11</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wstx</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wstx10</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wstx11</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>recovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>bridge</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossxts-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossxts-api</artifactId>
+            <classifier>javadoc</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>xts-guide</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>xts-demo</artifactId>
+        </dependency>
+    </dependencies>
+    <properties>
+        <PRODUCT_NAME>xts</PRODUCT_NAME>
+        <HOME_DIRECTORY>XTS_HOME</HOME_DIRECTORY>
+    </properties>
 </project>

Modified: labs/jbosstm/trunk/XTS/docs/Transactions_XTS_Administration_And_Development_Guide/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/docs/Transactions_XTS_Administration_And_Development_Guide/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/docs/Transactions_XTS_Administration_And_Development_Guide/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,54 +11,49 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>xts-guide</artifactId>
-	<name>XTS Administration and Development Guide</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<outputDirectory>target/publican</outputDirectory>
-		<plugins>
-
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<configuration>
-							<target unless="skipPublican">
-								<exec dir="." executable="publican">
-									<arg value="build" />
-									<arg value="--langs=en-US" />
-									<arg value="--formats=pdf" />
-									<arg value="--config=publican-maven.cfg" />
-								</exec>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<includes>
-						<include>**/*.pdf</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>xts-guide</artifactId>
+    <name>XTS Administration and Development Guide</name>
+    <packaging>jar</packaging>
+    <build>
+        <outputDirectory>target/publican</outputDirectory>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target unless="skipPublican">
+                                <exec dir="." executable="publican">
+                                    <arg value="build"/>
+                                    <arg value="--langs=en-US"/>
+                                    <arg value="--formats=pdf"/>
+                                    <arg value="--config=publican-maven.cfg"/>
+                                </exec>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*.pdf</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: labs/jbosstm/trunk/XTS/docs/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/docs/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/docs/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,21 +12,17 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-
-
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>xts-docs</artifactId>
-	<packaging>pom</packaging>
-	<name>XTS Documentation</name>
-
-	<modules>
-		<module>Transactions_XTS_Administration_And_Development_Guide</module>
-	</modules>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.jbossts</groupId>
+    <artifactId>xts-docs</artifactId>
+    <packaging>pom</packaging>
+    <name>XTS Documentation</name>
+    <modules>
+        <module>Transactions_XTS_Administration_And_Development_Guide</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/XTS/jbossxts-api/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/jbossxts-api/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/jbossxts-api/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,177 +11,173 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jbossxts-api</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<version>1.0-beta-4</version>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>create</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<doCheck>true</doCheck>
-					<doUpdate>false</doUpdate>
-					<scmBranchPropertyName>buildScmBranch</scmBranchPropertyName>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestEntries>
-							<arjuna-scm-revision>${buildScmBranch} (revision: ${buildNumber})</arjuna-scm-revision>
-							<arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
-							<arjuna-builder>JBoss Inc. [${user.name}] ${os.name} ${os.version} ${buildproperty.date}</arjuna-builder>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<detectOfflineLinks>false</detectOfflineLinks>	<excludePackageNames>org.*:com.arjuna.services.*:com.arjuna.webservices*:com.arjuna.mwlabs.*:com.arjuna.webservices11*:com.arjuna.schemas:com.arjuna.mw.wstx</excludePackageNames>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>../WS-C/dev/src</source>
-								<source>../WS-T/dev/src</source>
-								<source>../WSTX/classes</source>
-								<source>../WS-C/dev/src11</source>
-								<source>../WS-T/dev/src11</source>
-								<source>../WSTX/classes11</source>
-								<source>../WS-C/dev/src10</source>
-								<source>../WS-T/dev/src10</source>
-								<source>../WSTX/classes10</source>
-								<source>../recovery/src</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>**/*.*</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>1.4</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<artifactSet>
-								<includes>
-									<include>org.jboss.jbossts:ws-c:api</include>
-									<include>org.jboss.jbossts:ws-c10:api</include>
-									<include>org.jboss.jbossts:ws-t:api</include>
-									<include>org.jboss.jbossts:ws-t10:api</include>
-									<include>org.jboss.jbossts:wstx:api</include>
-									<include>org.jboss.jbossts:wstx10:api</include>
-									<include>org.jboss.jbossts:wstx11:api</include>
-									<include>org.jboss.jbossts:bridge:api</include>
-								</includes>
-							</artifactSet>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-c</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-c10</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t10</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t11</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx10</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx11</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>bridge</artifactId>
-				<classifier>api</classifier>
-			</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jbossxts-api</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>1.0-beta-4</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <doCheck>true</doCheck>
+                    <doUpdate>false</doUpdate>
+                    <scmBranchPropertyName>buildScmBranch</scmBranchPropertyName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <arjuna-scm-revision>${buildScmBranch} (revision: ${buildNumber})</arjuna-scm-revision>
+                            <arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
+                            <arjuna-builder>JBoss Inc. [${user.name}] ${os.name} ${os.version} ${buildproperty.date}</arjuna-builder>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <detectOfflineLinks>false</detectOfflineLinks>
+                    <excludePackageNames>org.*:com.arjuna.services.*:com.arjuna.webservices*:com.arjuna.mwlabs.*:com.arjuna.webservices11*:com.arjuna.schemas:com.arjuna.mw.wstx</excludePackageNames>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>../WS-C/dev/src</source>
+                                <source>../WS-T/dev/src</source>
+                                <source>../WSTX/classes</source>
+                                <source>../WS-C/dev/src11</source>
+                                <source>../WS-T/dev/src11</source>
+                                <source>../WSTX/classes11</source>
+                                <source>../WS-C/dev/src10</source>
+                                <source>../WS-T/dev/src10</source>
+                                <source>../WSTX/classes10</source>
+                                <source>../recovery/src</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*.*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.jboss.jbossts:ws-c:api</include>
+                                    <include>org.jboss.jbossts:ws-c10:api</include>
+                                    <include>org.jboss.jbossts:ws-t:api</include>
+                                    <include>org.jboss.jbossts:ws-t10:api</include>
+                                    <include>org.jboss.jbossts:wstx:api</include>
+                                    <include>org.jboss.jbossts:wstx10:api</include>
+                                    <include>org.jboss.jbossts:wstx11:api</include>
+                                    <include>org.jboss.jbossts:bridge:api</include>
+                                </includes>
+                            </artifactSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-c10</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t10</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t11</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wstx</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wstx10</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wstx11</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>bridge</artifactId>
+            <classifier>api</classifier>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,29 +12,27 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>xts-all</artifactId>
-	<packaging>pom</packaging>
-	<name>JBossJTS everything</name>
-
-	<modules>
-		<module>WSAS</module>
-		<module>WS-C</module>
-		<module>WSCF</module>
-		<module>WS-T</module>
-		<module>WSTX</module>
-		<module>recovery</module>
-		<module>bridge</module>
-		<!--<module>sar</module>-->
-		<module>demo</module>
-		<module>docs</module>
-		<module>jbossxts-api</module>
-		<module>dist</module>
-	</modules>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>xts-all</artifactId>
+    <packaging>pom</packaging>
+    <name>JBossJTS everything</name>
+    <modules>
+        <module>WSAS</module>
+        <module>WS-C</module>
+        <module>WSCF</module>
+        <module>WS-T</module>
+        <module>WSTX</module>
+        <module>recovery</module>
+        <module>bridge</module>
+        <!--<module>sar</module>-->
+        <module>demo</module>
+        <module>docs</module>
+        <module>jbossxts-api</module>
+        <module>dist</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/XTS/recovery/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/recovery/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware 
 	LLC, and others contributors as indicated by the @authors tag. All rights 
 	reserved. See the copyright.txt in the distribution for a full listing of 
@@ -12,29 +11,26 @@
 	should have received a copy of the GNU Lesser General Public License, v.2.1 
 	along with this distribution; if not, write to the Free Software Foundation, 
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>recovery</artifactId>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>ws-t</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>wscf</artifactId>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>recovery</artifactId>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>ws-t</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>wscf</artifactId>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/XTS/sar/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/XTS/sar/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -24,6 +24,23 @@
         <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target>
+                                <copy file="META-INF/application11.xml" tofile="target/archive-tmp/foo"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.2</version>

Modified: labs/jbosstm/trunk/common/pom.xml
===================================================================
--- labs/jbosstm/trunk/common/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/common/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,64 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated by the @authors tag. All rights reserved. See the copyright.txt in the distribution 
 	for a full listing of individual contributors. This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU Lesser 
 	General Public License, v. 2.1. This program is distributed in the hope that it will be useful, but WITHOUT A WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
 	PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License, v.2.1 along with this distribution; if not, write to the Free 
 	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>common</artifactId>
-	<name>Arjuna core common</name>
-	<packaging>jar</packaging>
-
-	<build>
-		<sourceDirectory>classes</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>etc</directory>
-			</resource>
-		</resources>
-		<testSourceDirectory>tests</testSourceDirectory>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestEntries>
-							<arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
-						</manifestEntries>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<excludes>
-						<exclude>**/DummyProperties.java</exclude>
-						<exclude>**/DummyEnvironmentBean.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<!-- START TEST -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
-		<!-- END TEST -->
-	</dependencies>
-
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>common</artifactId>
+    <name>Arjuna core common</name>
+    <packaging>jar</packaging>
+    <build>
+        <sourceDirectory>classes</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>etc</directory>
+            </resource>
+        </resources>
+        <testSourceDirectory>tests</testSourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <arjuna-properties-file>jbossts-properties.xml</arjuna-properties-file>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/DummyProperties.java</exclude>
+                        <exclude>**/DummyEnvironmentBean.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <!-- START TEST -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- END TEST -->
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/narayana-parent/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-parent/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/narayana-parent/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,187 +12,171 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-	<parent>
-		<groupId>org.jboss.jbossas</groupId>
-		<artifactId>jboss-as-component-matrix</artifactId>
-		<version>6.0.0.Final</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>narayana-parent</artifactId>
-	<packaging>pom</packaging>
-	<version>4.15.0.M1-SNAPSHOT</version>
-	<name>narayana-parent</name>
-
-	<description>narayana-parent</description>
-
-	<url>http://www.jboss.org/jbosstm/</url>
-	<issueManagement>
-		<system>JIRA</system>
-		<url>https://jira.jboss.org/jira/browse/JBTM/</url>
-	</issueManagement>
-	<ciManagement>
-		<system>hudson</system>
-		<url>http://hudson.qa.jboss.com/hudson/view/JBossTS/</url>
-	</ciManagement>
-
-	<developers>
-
-		<developer>
-			<id>jhalliday</id>
-			<name>Jonathan Halliday</name>
-			<email>jonathan.halliday at redhat.com</email>
-			<organization>JBoss</organization>
-			<organizationUrl>http://www.jboss.org/</organizationUrl>
-			<roles>
-				<role>project lead</role>
-			</roles>
-			<timezone>0</timezone>
-		</developer>
-
-		<developer>
-			<id>adinn</id>
-			<name>Andrew Dinn</name>
-			<email>adinn at redhat.com</email>
-			<organization>JBoss</organization>
-			<organizationUrl>http://www.jboss.org/</organizationUrl>
-			<roles>
-				<role>XTS lead</role>
-			</roles>
-			<timezone>0</timezone>
-		</developer>
-
-		<developer>
-			<id>mmusgrov</id>
-			<name>Michael Musgrove</name>
-			<email>mmusgrov at redhat.com</email>
-			<organization>JBoss</organization>
-			<organizationUrl>http://www.jboss.org/</organizationUrl>
-			<roles>
-				<role>Core Developer</role>
-			</roles>
-			<timezone>0</timezone>
-		</developer>
-
-		<developer>
-			<id>mark.little at jboss.com</id>
-			<name>Mark Little</name>
-			<email>mlittle at redhat.com</email>
-			<organization>JBoss</organization>
-			<organizationUrl>http://www.jboss.org/</organizationUrl>
-			<roles>
-				<role>JBoss CTO</role>
-			</roles>
-			<timezone>0</timezone>
-		</developer>
-
-		<developer>
-			<id>istudens at redhat.com</id>
-			<name>Ivo Studensky</name>
-			<email>istudens at redhat.com</email>
-			<organization>JBoss</organization>
-			<organizationUrl>http://www.jboss.org/</organizationUrl>
-			<roles>
-				<role>QA lead</role>
-			</roles>
-			<timezone>0</timezone>
-		</developer>
-
-	</developers>
-
-	<licenses>
-		<license>
-			<name>LGPL 2.1</name>
-			<url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
-		</license>
-	</licenses>
-
-	<scm>
-		<connection>scm:svn:http://anonsvn.jboss.org/repos/labs/labs/jbosstm/</connection>
-		<developerConnection>scm:svn:https://svn.jboss.org/repos/labs/labs/jbosstm/</developerConnection>
-		<url>http://fisheye.jboss.org/browse/JBossTS/</url>
-	</scm>
-
-	<repositories>
-		<repository>
-			<id>jbossThirdParty</id>
-			<url>https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/</url>
-		</repository>
-		<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>
-
-	<distributionManagement>
-		<repository>
-			<id>jboss-releases-repository</id>
-			<name>JBoss Release Repository</name>
-			<url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
-		</repository>
-
-		<snapshotRepository>
-			<id>jboss-snapshots-repository</id>
-			<name>JBoss Snapshot Repository</name>
-			<url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<build>
-		<plugins>
+    <parent>
+        <groupId>org.jboss.jbossas</groupId>
+        <artifactId>jboss-as-component-matrix</artifactId>
+        <version>6.0.0.Final</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.jbossts</groupId>
+    <artifactId>narayana-parent</artifactId>
+    <packaging>pom</packaging>
+    <version>4.15.0.M1-SNAPSHOT</version>
+    <name>narayana-parent</name>
+    <description>narayana-parent</description>
+    <url>http://www.jboss.org/jbosstm/</url>
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://jira.jboss.org/jira/browse/JBTM/</url>
+    </issueManagement>
+    <ciManagement>
+        <system>hudson</system>
+        <url>http://hudson.qa.jboss.com/hudson/view/JBossTS/</url>
+    </ciManagement>
+    <developers>
+        <developer>
+            <id>jhalliday</id>
+            <name>Jonathan Halliday</name>
+            <email>jonathan.halliday at redhat.com</email>
+            <organization>JBoss</organization>
+            <organizationUrl>http://www.jboss.org/</organizationUrl>
+            <roles>
+                <role>project lead</role>
+            </roles>
+            <timezone>0</timezone>
+        </developer>
+        <developer>
+            <id>adinn</id>
+            <name>Andrew Dinn</name>
+            <email>adinn at redhat.com</email>
+            <organization>JBoss</organization>
+            <organizationUrl>http://www.jboss.org/</organizationUrl>
+            <roles>
+                <role>XTS lead</role>
+            </roles>
+            <timezone>0</timezone>
+        </developer>
+        <developer>
+            <id>mmusgrov</id>
+            <name>Michael Musgrove</name>
+            <email>mmusgrov at redhat.com</email>
+            <organization>JBoss</organization>
+            <organizationUrl>http://www.jboss.org/</organizationUrl>
+            <roles>
+                <role>Core Developer</role>
+            </roles>
+            <timezone>0</timezone>
+        </developer>
+        <developer>
+            <id>mark.little at jboss.com</id>
+            <name>Mark Little</name>
+            <email>mlittle at redhat.com</email>
+            <organization>JBoss</organization>
+            <organizationUrl>http://www.jboss.org/</organizationUrl>
+            <roles>
+                <role>JBoss CTO</role>
+            </roles>
+            <timezone>0</timezone>
+        </developer>
+        <developer>
+            <id>istudens at redhat.com</id>
+            <name>Ivo Studensky</name>
+            <email>istudens at redhat.com</email>
+            <organization>JBoss</organization>
+            <organizationUrl>http://www.jboss.org/</organizationUrl>
+            <roles>
+                <role>QA lead</role>
+            </roles>
+            <timezone>0</timezone>
+        </developer>
+    </developers>
+    <licenses>
+        <license>
+            <name>LGPL 2.1</name>
+            <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+        </license>
+    </licenses>
+    <scm>
+        <connection>scm:svn:http://anonsvn.jboss.org/repos/labs/labs/jbosstm/</connection>
+        <developerConnection>scm:svn:https://svn.jboss.org/repos/labs/labs/jbosstm/</developerConnection>
+        <url>http://fisheye.jboss.org/browse/JBossTS/</url>
+    </scm>
+    <repositories>
+        <repository>
+            <id>jbossThirdParty</id>
+            <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/</url>
+        </repository>
+        <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>
+    <distributionManagement>
+        <repository>
+            <id>jboss-releases-repository</id>
+            <name>JBoss Release Repository</name>
+            <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
+        </repository>
+        <snapshotRepository>
+            <id>jboss-snapshots-repository</id>
+            <name>JBoss Snapshot Repository</name>
+            <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>emma-maven-plugin</artifactId>
+                <version>1.0-alpha-3</version>
+                <inherited>true</inherited>
+                <configuration>
+                    <metadataFile>${project.build.directory}/test-classes/coverage.em</metadataFile>
+                    <metrics>method:70,block:70,line:80,class:100</metrics>
+                    <dataFiles>
+                        <dataFile>${project.build.directory}/test-classes/coverage.em</dataFile>
+                        <dataFile>${project.build.directory}/test-classes/coverage.ec</dataFile>
+                    </dataFiles>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>emma</groupId>
+                        <artifactId>emma</artifactId>
+                        <version>2.1.5320</version>
+                        <scope>system</scope>
+                        <systemPath>${TS_EMMA_JAR}</systemPath>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <!--
 			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>emma-maven-plugin</artifactId>
-				<version>1.0-alpha-3</version>
 				<inherited>true</inherited>
-				<configuration>
-					<metadataFile>${project.build.directory}/test-classes/coverage.em</metadataFile>
-					<metrics>method:70,block:70,line:80,class:100</metrics>
-					<dataFiles>
-						<dataFile>${project.build.directory}/test-classes/coverage.em</dataFile>
-						<dataFile>${project.build.directory}/test-classes/coverage.ec</dataFile>
-					</dataFiles>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>emma</groupId>
-						<artifactId>emma</artifactId>
-						<version>2.1.5320</version>
-						<scope>system</scope>
-						<systemPath>${TS_EMMA_JAR}</systemPath>
-					</dependency>
-				</dependencies>
-			</plugin>
-<!--
-			<plugin>
-				<inherited>true</inherited>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
 				<version>1.0-beta-1</version>
@@ -216,421 +199,414 @@
 				</executions>
 			</plugin>
 -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<forkMode>pertest</forkMode>
-					<workingDirectory>target/test-classes</workingDirectory>
-					<runOrder>alphabetical</runOrder>
-					<redirectTestOutputToFile>true</redirectTestOutputToFile>
-					<inherited>true</inherited>
-					<includes>
-						<include>**/*.java</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencyManagement>
-		<dependencies>
-        	    <dependency>
-        	        <!-- https://repository.jboss.org/nexus/content/groups/public-jboss/org/jboss/as/jboss-as-parent/7.0.0.Alpha1/jboss-as-parent-7.0.0.Alpha1.pom -->
-        	        <groupId>org.jboss.as</groupId>
-        	        <artifactId>jboss-as-parent</artifactId>
-        	        <version>7.0.0.Beta1</version>
-        	        <type>pom</type>
-        	        <scope>import</scope>
-	            </dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>common</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>arjuna</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>arjunacore-services</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>arjunacore</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>arjunacore</artifactId>
-				<version>${project.version}</version>
-				<classifier>sources</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>arjunacore</artifactId>
-				<version>${project.version}</version>
-				<classifier>javadoc</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>tsmx-core</artifactId>
-				<version>${project.version}</version>
-				<type>pom</type>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>tsmx-jmxbrowser</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossts-tools</artifactId>
-				<version>${project.version}</version>
-				<classifier>sar</classifier>
-				<type>sar</type>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>tsmx-tools</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>tsmx-core-objectstorebrowser</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>osbv-defaults</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>tsmx-perfgraph</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>txoj</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jta</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jdbc</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>tsmx-jta-objectstorebrowser</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossjta</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossjta</artifactId>
-				<version>${project.version}</version>
-				<classifier>javadoc</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossjta</artifactId>
-				<version>${project.version}</version>
-				<classifier>sources</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossjta-integration</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>orbportability</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jts</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jtax</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossjts</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossjts</artifactId>
-				<version>${project.version}</version>
-				<classifier>javadoc</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossjts</artifactId>
-				<version>${project.version}</version>
-				<classifier>sources</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossjts-integration</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>tsmx-jts-objectstorebrowser</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossts-jopr-plugin</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossts-jopr-plugin</artifactId>
-				<version>${project.version}</version>
-				<classifier>javadoc</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossts-jopr-plugin</artifactId>
-				<version>${project.version}</version>
-				<classifier>sources</classifier>
-			</dependency>
-
-
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wsas</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-c-all</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-c</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-c10</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-c11</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-c</artifactId>
-				<version>${project.version}</version>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-c10</artifactId>
-				<version>${project.version}</version>
-				<classifier>api</classifier>
-			</dependency>
-
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t-all</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t10</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t11</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t</artifactId>
-				<version>${project.version}</version>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t10</artifactId>
-				<version>${project.version}</version>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>ws-t11</artifactId>
-				<version>${project.version}</version>
-				<classifier>api</classifier>
-			</dependency>
-
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wscf-all</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wscf</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wscf10</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wscf11</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx-all</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx10</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx11</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx</artifactId>
-				<version>${project.version}</version>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx10</artifactId>
-				<version>${project.version}</version>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>wstx11</artifactId>
-				<version>${project.version}</version>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>recovery</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>bridge</artifactId>
-				<version>${project.version}</version>
-				<classifier>api</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossxts-api</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>jbossxts-api</artifactId>
-				<version>${project.version}</version>
-				<classifier>javadoc</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>xts-docs</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>xts-guide</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>xts-demo</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.jbossts</groupId>
-				<artifactId>trailmap</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-		<dependency>
-			<groupId>org.jboss.logging</groupId>
-			<artifactId>jboss-logging</artifactId>
-			<version>3.0.0.Beta5</version><!-- TODO AS7 -->
-		</dependency>
-	        <dependency>
-	            <groupId>org.jboss.logging</groupId>
-           	    <artifactId>jboss-logging-processor</artifactId>
-	            <version>1.0.0.Beta5</version><!-- TODO AS7 -->
-	        </dependency>
-        	<dependency>
-	            <groupId>org.jboss.logging</groupId>
-	            <artifactId>jboss-logging-generator</artifactId>
-	            <version>1.0.0.Beta5</version><!-- TODO AS7 -->
-        	</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>
-	</properties>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkMode>pertest</forkMode>
+                    <workingDirectory>target/test-classes</workingDirectory>
+                    <runOrder>alphabetical</runOrder>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <inherited>true</inherited>
+                    <includes>
+                        <include>**/*.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <!-- https://repository.jboss.org/nexus/content/groups/public-jboss/org/jboss/as/jboss-as-parent/7.0.0.Alpha1/jboss-as-parent-7.0.0.Alpha1.pom -->
+                <groupId>org.jboss.as</groupId>
+                <artifactId>jboss-as-parent</artifactId>
+                <version>7.0.0.Beta1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>arjuna</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>arjunacore-services</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>arjunacore</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>arjunacore</artifactId>
+                <version>${project.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>arjunacore</artifactId>
+                <version>${project.version}</version>
+                <classifier>javadoc</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>tsmx-core</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>tsmx-jmxbrowser</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossts-tools</artifactId>
+                <version>${project.version}</version>
+                <classifier>sar</classifier>
+                <type>sar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>tsmx-tools</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>tsmx-core-objectstorebrowser</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>osbv-defaults</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>tsmx-perfgraph</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>txoj</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jta</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jdbc</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>tsmx-jta-objectstorebrowser</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossjta</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossjta</artifactId>
+                <version>${project.version}</version>
+                <classifier>javadoc</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossjta</artifactId>
+                <version>${project.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossjta-integration</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>orbportability</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jts</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jtax</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossjts</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossjts</artifactId>
+                <version>${project.version}</version>
+                <classifier>javadoc</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossjts</artifactId>
+                <version>${project.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossjts-integration</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>tsmx-jts-objectstorebrowser</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossts-jopr-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossts-jopr-plugin</artifactId>
+                <version>${project.version}</version>
+                <classifier>javadoc</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossts-jopr-plugin</artifactId>
+                <version>${project.version}</version>
+                <classifier>sources</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>wsas</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>ws-c-all</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>ws-c</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>ws-c10</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>ws-c11</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>ws-c</artifactId>
+                <version>${project.version}</version>
+                <classifier>api</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>ws-c10</artifactId>
+                <version>${project.version}</version>
+                <classifier>api</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>ws-t-all</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>ws-t</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>ws-t10</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>ws-t11</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>ws-t</artifactId>
+                <version>${project.version}</version>
+                <classifier>api</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>ws-t10</artifactId>
+                <version>${project.version}</version>
+                <classifier>api</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>ws-t11</artifactId>
+                <version>${project.version}</version>
+                <classifier>api</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>wscf-all</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>wscf</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>wscf10</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>wscf11</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>wstx-all</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>wstx</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>wstx10</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>wstx11</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>wstx</artifactId>
+                <version>${project.version}</version>
+                <classifier>api</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>wstx10</artifactId>
+                <version>${project.version}</version>
+                <classifier>api</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>wstx11</artifactId>
+                <version>${project.version}</version>
+                <classifier>api</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>recovery</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>bridge</artifactId>
+                <version>${project.version}</version>
+                <classifier>api</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossxts-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>jbossxts-api</artifactId>
+                <version>${project.version}</version>
+                <classifier>javadoc</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>xts-docs</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>xts-guide</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>xts-demo</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.jbossts</groupId>
+                <artifactId>trailmap</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.logging</groupId>
+                <artifactId>jboss-logging</artifactId>
+                <version>3.0.0.Beta5</version>
+                <!-- TODO AS7 -->
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.logging</groupId>
+                <artifactId>jboss-logging-processor</artifactId>
+                <version>1.0.0.Beta5</version>
+                <!-- TODO AS7 -->
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.logging</groupId>
+                <artifactId>jboss-logging-generator</artifactId>
+                <version>1.0.0.Beta5</version>
+                <!-- TODO AS7 -->
+            </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>
+    </properties>
 </project>

Modified: labs/jbosstm/trunk/pom.xml
===================================================================
--- labs/jbosstm/trunk/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,44 +12,42 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-	<parent>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>narayana-parent</artifactId>
-		<version>4.15.0.M1-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>narayana</artifactId>
-	<packaging>pom</packaging>
-	<name>Narayana build everything</name>
-
-	<modules>
-		<module>common</module>
-		<module>ArjunaCore/arjuna</module>
-		<module>ArjunaCore/txoj</module>
-		<module>ArjunaCore/tsmx</module>
-		<module>ArjunaCore/arjuna/services</module>
-		<module>ArjunaCore/arjunacore</module>
-		<module>ArjunaCore/docs</module>
-		<module>ArjunaCore/dist</module>
-		<module>ArjunaJTA/jta</module>
-		<module>ArjunaJTA/jdbc</module>
-		<module>ArjunaJTA/tsmx</module>
-		<module>ArjunaJTA/jbossjta</module>
-		<module>ArjunaJTA/docs</module>
-		<module>ArjunaJTA/integration</module>
-		<module>ArjunaJTA/dist</module>
-		<module>ArjunaJTS/orbportability</module>
-		<module>ArjunaJTS/jts</module>
-		<module>ArjunaJTS/jtax</module>
-		<module>ArjunaJTS/tsmx-sar</module>
-		<module>ArjunaJTS/jbossjts</module>
-		<module>ArjunaJTS/tsmx</module>
-		<module>ArjunaJTS/integration</module>
-		<module>ArjunaJTS/trailmap</module>
-		<module>ArjunaJTS/docs</module>
-		<module>rhq-plugin</module>
-		<module>XTS</module>
-		<module>ArjunaJTS/dist</module>
-	</modules>
+    <parent>
+        <groupId>org.jboss.jbossts</groupId>
+        <artifactId>narayana-parent</artifactId>
+        <version>4.15.0.M1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>narayana</artifactId>
+    <packaging>pom</packaging>
+    <name>Narayana build everything</name>
+    <modules>
+        <module>common</module>
+        <module>ArjunaCore/arjuna</module>
+        <module>ArjunaCore/txoj</module>
+        <module>ArjunaCore/tsmx</module>
+        <module>ArjunaCore/arjuna/services</module>
+        <module>ArjunaCore/arjunacore</module>
+        <module>ArjunaCore/docs</module>
+        <module>ArjunaCore/dist</module>
+        <module>ArjunaJTA/jta</module>
+        <module>ArjunaJTA/jdbc</module>
+        <module>ArjunaJTA/tsmx</module>
+        <module>ArjunaJTA/jbossjta</module>
+        <module>ArjunaJTA/docs</module>
+        <module>ArjunaJTA/integration</module>
+        <module>ArjunaJTA/dist</module>
+        <module>ArjunaJTS/orbportability</module>
+        <module>ArjunaJTS/jts</module>
+        <module>ArjunaJTS/jtax</module>
+        <module>ArjunaJTS/tsmx-sar</module>
+        <module>ArjunaJTS/jbossjts</module>
+        <module>ArjunaJTS/tsmx</module>
+        <module>ArjunaJTS/integration</module>
+        <module>ArjunaJTS/trailmap</module>
+        <module>ArjunaJTS/docs</module>
+        <module>rhq-plugin</module>
+        <module>XTS</module>
+        <module>ArjunaJTS/dist</module>
+    </modules>
 </project>

Modified: labs/jbosstm/trunk/qa/pom.xml
===================================================================
--- labs/jbosstm/trunk/qa/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/qa/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,7 +1,6 @@
-<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">
-
-	<!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
+<?xml version="1.0"?>
+<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">
+    <!-- JBoss, Home of Professional Open Source Copyright 2009, Red Hat Middleware 
 		LLC, and individual contributors as indicated by the @author tags. See the 
 		copyright.txt in the distribution for a full listing of individual contributors. 
 		This copyrighted material is made available to anyone wishing to use, modify, 
@@ -13,117 +12,113 @@
 		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, @author JBoss Inc. (jonathan.halliday at redhat.com) -->
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossts</groupId>
-	<artifactId>narayana-qa</artifactId>
-	<version>4.15.0.M1-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>QA module</name>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.2</version>
-				<executions>
-					<execution>
-						<id>unpack-dist</id>
-						<phase>initialize</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.jboss.jbossts</groupId>
-									<artifactId>jbossts-full</artifactId>
-									<version>${project.version}</version>
-									<classifier>bin</classifier>
-									<type>zip</type>
-									<overWrite>false</overWrite>
-									<outputDirectory>${project.build.directory}/</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-junit</id>
-						<phase>initialize</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>junit</groupId>
-									<artifactId>junit</artifactId>
-									<version>4.8.1</version>
-									<type>jar</type>
-									<outputDirectory>${basedir}/../build/extlib</outputDirectory>
-									<destFileName>junit.jar</destFileName>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<id>compile-qa-tests</id>
-						<phase>compile</phase>
-						<configuration>
-							<target>
-								<ant>
-									<property name="org.jboss.jbossts.qa.ts.home"
-										value="${project.build.directory}/jbossts-full-${project.version}" />
-								</ant>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>run-qa-tests</id>
-						<phase>test</phase>
-						<configuration>
-							<target>
-								<ant antfile="run-tests.xml">
-									<property name="org.jboss.jbossts.qa.ts.home"
-										value="${project.build.directory}/jbossts-full-${project.version}" />
-								</ant>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>sun.jdk</groupId>
-						<artifactId>tools</artifactId>
-						<version>1.4.2</version>
-						<scope>system</scope>
-						<systemPath>${java.home}/../lib/tools.jar</systemPath>
-					</dependency>
-					<dependency>
-						<groupId>junit</groupId>
-						<artifactId>junit</artifactId>
-						<version>4.8.1</version>
-					</dependency>
-					<dependency>
-						<groupId>ant</groupId>
-						<artifactId>ant-junit</artifactId>
-						<version>1.6.5</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-		</plugins>
-	</build>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.jbossts</groupId>
+    <artifactId>narayana-qa</artifactId>
+    <version>4.15.0.M1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>QA module</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.2</version>
+                <executions>
+                    <execution>
+                        <id>unpack-dist</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.jboss.jbossts</groupId>
+                                    <artifactId>jbossts-full</artifactId>
+                                    <version>${project.version}</version>
+                                    <classifier>bin</classifier>
+                                    <type>zip</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-junit</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>junit</groupId>
+                                    <artifactId>junit</artifactId>
+                                    <version>4.8.1</version>
+                                    <type>jar</type>
+                                    <outputDirectory>${basedir}/../build/extlib</outputDirectory>
+                                    <destFileName>junit.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <id>compile-qa-tests</id>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target>
+                                <ant>
+                                    <property name="org.jboss.jbossts.qa.ts.home" value="${project.build.directory}/jbossts-full-${project.version}"/>
+                                </ant>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>run-qa-tests</id>
+                        <phase>test</phase>
+                        <configuration>
+                            <target>
+                                <ant antfile="run-tests.xml">
+                                    <property name="org.jboss.jbossts.qa.ts.home" value="${project.build.directory}/jbossts-full-${project.version}"/>
+                                </ant>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>sun.jdk</groupId>
+                        <artifactId>tools</artifactId>
+                        <version>1.4.2</version>
+                        <scope>system</scope>
+                        <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                    </dependency>
+                    <dependency>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                        <version>4.8.1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-junit</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: labs/jbosstm/trunk/qa/tests/pom.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/qa/tests/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-	<!--
+<!--
 		JBoss, Home of Professional Open Source Copyright 2008, Red Hat
 		Middleware LLC, and others contributors as indicated by the @authors
 		tag. All rights reserved. See the copyright.txt in the distribution
@@ -15,169 +15,162 @@
 		Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 		02110-1301, USA.
 	-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.narayana</groupId>
-	<artifactId>qa-tests</artifactId>
-	<name>QA tests</name>
-	<version>4.15.0.M1-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<developers>
-		<developer>
-			<id>tomjenkinson</id>
-			<name>Thomas Jenkinson</name>
-			<email>tom.jenkinson at redhat.com</email>
-			<organization>JBoss</organization>
-			<organizationUrl>http://www.jboss.org/</organizationUrl>
-			<roles>
-				<role>Project Lead</role>
-			</roles>
-			<timezone>0</timezone>
-		</developer>
-	</developers>
-
-	<licenses>
-		<license>
-			<name>LGPL 2.1</name>
-			<url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
-		</license>
-	</licenses>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>idlj-maven-plugin</artifactId>
-				<dependencies>
-					<dependency>
-						<groupId>org.jacorb</groupId>
-						<artifactId>jacorb-idl-compiler</artifactId>
-						<version>2.2.3</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<compiler>jacorb</compiler>
-					<sourceDirectory>idl/</sourceDirectory>
-					<sources>
-						<source>
-							<includes>								
-								<include>AITResources01.idl</include>
-								<include>AITResources02.idl</include>
-								<include>CrashRecovery01.idl</include>
-								<include>CrashRecovery02.idl</include>
-								<include>CrashRecovery03.idl</include>
-								<include>CrashRecovery04.idl</include>
-								<include>CrashRecovery05.idl</include>
-								<include>CrashRecovery06.idl</include>
-								<include>CrashRecovery07.idl</include>
-								<include>CrashRecovery08.idl</include>
-								<include>CrashRecovery09.idl</include>
-								<include>CrashRecovery10.idl</include>
-								<include>CrashRecovery11.idl</include>
-								<include>EnlistDelistEnlist01.idl</include>
-								<include>Hammer01.idl</include>
-								<include>Hammer02.idl</include>
-								<include>Issues0001.idl</include>
-								<include>JDBCResources01.idl</include>
-								<include>JDBCResources02.idl</include>
-								<include>JDBCResources03.idl</include>
-								<include>JDBCResources04.idl</include>
-								<include>performance.idl</include>
-								<include>PerfProfile01.idl</include>
-								<include>RawResources01.idl</include>
-								<include>RawResources02.idl</include>
-								<include>RawSubtransactionAwareResources01.idl</include>
-								<include>RawSubtransactionAwareResources02.idl</include>
-								<include>SupportTests01.idl</include>
-							</includes>
-							<additionalArguments>
-								<additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
-								<additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>								
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>AITResources01:org.jboss.jbossts.qa.AITResources01</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>AITResources02:org.jboss.jbossts.qa.AITResources02</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>CrashRecovery01:org.jboss.jbossts.qa.CrashRecovery01</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>CrashRecovery02:org.jboss.jbossts.qa.CrashRecovery02</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>CrashRecovery03:org.jboss.jbossts.qa.CrashRecovery03</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>CrashRecovery04:org.jboss.jbossts.qa.CrashRecovery04</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>CrashRecovery05:org.jboss.jbossts.qa.CrashRecovery05</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>CrashRecovery06:org.jboss.jbossts.qa.CrashRecovery06</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>CrashRecovery07:org.jboss.jbossts.qa.CrashRecovery07</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>CrashRecovery08:org.jboss.jbossts.qa.CrashRecovery08</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>CrashRecovery09:org.jboss.jbossts.qa.CrashRecovery09</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>CrashRecovery10:org.jboss.jbossts.qa.CrashRecovery10</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>CrashRecovery11:org.jboss.jbossts.qa.CrashRecovery11</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>EnlistDelistEnlist01:org.jboss.jbossts.qa.EnlistDelistEnlist01</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>Hammer01:org.jboss.jbossts.qa.Hammer01</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>Hammer02:org.jboss.jbossts.qa.Hammer02</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>Issues0001:org.jboss.jbossts.qa.Issues0001</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>JDBCResources01:org.jboss.jbossts.qa.JDBCResources01</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>JDBCResources02:org.jboss.jbossts.qa.JDBCResources02</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>JDBCResources03:org.jboss.jbossts.qa.JDBCResources03</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>JDBCResources04:org.jboss.jbossts.qa.JDBCResources04</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>performance:org.jboss.jbossts.qa.performance</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>PerfProfile01:org.jboss.jbossts.qa.PerfProfile01</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>RawResources01:org.jboss.jbossts.qa.RawResources01</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>RawResources02:org.jboss.jbossts.qa.RawResources02</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>RawSubtransactionAwareResources01:org.jboss.jbossts.qa.RawSubtransactionAwareResources01</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>RawSubtransactionAwareResources02:org.jboss.jbossts.qa.RawSubtransactionAwareResources02</additionalArgument>
-								<additionalArgument>-i2jpackage</additionalArgument>
-								<additionalArgument>SupportTests01:org.jboss.jbossts.qa.SupportTests01</additionalArgument>
-							</additionalArguments>
-						</source>
-					</sources>
-					<includeDirs>
-						<includeDir>../../ArjunaJTS/jts/idl/omg</includeDir>
-						<includeDir>../../ArjunaJTS/jts/idl/arjuna</includeDir>
-						<includeDir>../../ArjunaJTS/jts/../jacorb/idl/omg</includeDir>
-					</includeDirs>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.jboss.jbossts</groupId>
-			<artifactId>jts</artifactId>
-			<version>4.15.0.M1-SNAPSHOT</version>
-		</dependency>
-	</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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.narayana</groupId>
+    <artifactId>qa-tests</artifactId>
+    <name>QA tests</name>
+    <version>4.15.0.M1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <developers>
+        <developer>
+            <id>tomjenkinson</id>
+            <name>Thomas Jenkinson</name>
+            <email>tom.jenkinson at redhat.com</email>
+            <organization>JBoss</organization>
+            <organizationUrl>http://www.jboss.org/</organizationUrl>
+            <roles>
+                <role>Project Lead</role>
+            </roles>
+            <timezone>0</timezone>
+        </developer>
+    </developers>
+    <licenses>
+        <license>
+            <name>LGPL 2.1</name>
+            <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+        </license>
+    </licenses>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>idlj-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jacorb</groupId>
+                        <artifactId>jacorb-idl-compiler</artifactId>
+                        <version>2.2.3</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <compiler>jacorb</compiler>
+                    <sourceDirectory>idl/</sourceDirectory>
+                    <sources>
+                        <source>
+                            <includes>
+                                <include>AITResources01.idl</include>
+                                <include>AITResources02.idl</include>
+                                <include>CrashRecovery01.idl</include>
+                                <include>CrashRecovery02.idl</include>
+                                <include>CrashRecovery03.idl</include>
+                                <include>CrashRecovery04.idl</include>
+                                <include>CrashRecovery05.idl</include>
+                                <include>CrashRecovery06.idl</include>
+                                <include>CrashRecovery07.idl</include>
+                                <include>CrashRecovery08.idl</include>
+                                <include>CrashRecovery09.idl</include>
+                                <include>CrashRecovery10.idl</include>
+                                <include>CrashRecovery11.idl</include>
+                                <include>EnlistDelistEnlist01.idl</include>
+                                <include>Hammer01.idl</include>
+                                <include>Hammer02.idl</include>
+                                <include>Issues0001.idl</include>
+                                <include>JDBCResources01.idl</include>
+                                <include>JDBCResources02.idl</include>
+                                <include>JDBCResources03.idl</include>
+                                <include>JDBCResources04.idl</include>
+                                <include>performance.idl</include>
+                                <include>PerfProfile01.idl</include>
+                                <include>RawResources01.idl</include>
+                                <include>RawResources02.idl</include>
+                                <include>RawSubtransactionAwareResources01.idl</include>
+                                <include>RawSubtransactionAwareResources02.idl</include>
+                                <include>SupportTests01.idl</include>
+                            </includes>
+                            <additionalArguments>
+                                <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
+                                <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>AITResources01:org.jboss.jbossts.qa.AITResources01</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>AITResources02:org.jboss.jbossts.qa.AITResources02</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>CrashRecovery01:org.jboss.jbossts.qa.CrashRecovery01</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>CrashRecovery02:org.jboss.jbossts.qa.CrashRecovery02</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>CrashRecovery03:org.jboss.jbossts.qa.CrashRecovery03</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>CrashRecovery04:org.jboss.jbossts.qa.CrashRecovery04</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>CrashRecovery05:org.jboss.jbossts.qa.CrashRecovery05</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>CrashRecovery06:org.jboss.jbossts.qa.CrashRecovery06</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>CrashRecovery07:org.jboss.jbossts.qa.CrashRecovery07</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>CrashRecovery08:org.jboss.jbossts.qa.CrashRecovery08</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>CrashRecovery09:org.jboss.jbossts.qa.CrashRecovery09</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>CrashRecovery10:org.jboss.jbossts.qa.CrashRecovery10</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>CrashRecovery11:org.jboss.jbossts.qa.CrashRecovery11</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>EnlistDelistEnlist01:org.jboss.jbossts.qa.EnlistDelistEnlist01</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>Hammer01:org.jboss.jbossts.qa.Hammer01</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>Hammer02:org.jboss.jbossts.qa.Hammer02</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>Issues0001:org.jboss.jbossts.qa.Issues0001</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>JDBCResources01:org.jboss.jbossts.qa.JDBCResources01</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>JDBCResources02:org.jboss.jbossts.qa.JDBCResources02</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>JDBCResources03:org.jboss.jbossts.qa.JDBCResources03</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>JDBCResources04:org.jboss.jbossts.qa.JDBCResources04</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>performance:org.jboss.jbossts.qa.performance</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>PerfProfile01:org.jboss.jbossts.qa.PerfProfile01</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>RawResources01:org.jboss.jbossts.qa.RawResources01</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>RawResources02:org.jboss.jbossts.qa.RawResources02</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>RawSubtransactionAwareResources01:org.jboss.jbossts.qa.RawSubtransactionAwareResources01</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>RawSubtransactionAwareResources02:org.jboss.jbossts.qa.RawSubtransactionAwareResources02</additionalArgument>
+                                <additionalArgument>-i2jpackage</additionalArgument>
+                                <additionalArgument>SupportTests01:org.jboss.jbossts.qa.SupportTests01</additionalArgument>
+                            </additionalArguments>
+                        </source>
+                    </sources>
+                    <includeDirs>
+                        <includeDir>../../ArjunaJTS/jts/idl/omg</includeDir>
+                        <includeDir>../../ArjunaJTS/jts/idl/arjuna</includeDir>
+                        <includeDir>../../ArjunaJTS/jts/../jacorb/idl/omg</includeDir>
+                    </includeDirs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jts</artifactId>
+            <version>4.15.0.M1-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
 </project>

Modified: labs/jbosstm/trunk/rest-tx/pom.xml
===================================================================
--- labs/jbosstm/trunk/rest-tx/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/rest-tx/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -15,25 +15,21 @@
 		Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 		02110-1301, USA.
 		-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.jbossts.rts</groupId>
-	<artifactId>rest-tx</artifactId>
-	<version>1.0-M1-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>RESTful Transactions</name>
-	<url>http://www.jboss.org/jbosstm</url>
-
-	<modules>
-		<module>tx</module>
-		<module>webservice</module>
-	</modules>
-
-	<properties>
-		<version.artifactId>1.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 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.jbossts.rts</groupId>
+    <artifactId>rest-tx</artifactId>
+    <version>1.0-M1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>RESTful Transactions</name>
+    <url>http://www.jboss.org/jbosstm</url>
+    <modules>
+        <module>tx</module>
+        <module>webservice</module>
+    </modules>
+    <properties>
+        <version.artifactId>1.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/tx/pom.xml
===================================================================
--- labs/jbosstm/trunk/rest-tx/tx/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/rest-tx/tx/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -15,30 +15,24 @@
 	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 	02110-1301, USA.
 -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.jboss.jbossts.rts</groupId>
         <artifactId>rest-tx</artifactId>
         <version>1.0-M1-SNAPSHOT</version>
     </parent>
-
-   <modelVersion>4.0.0</modelVersion>
-   <artifactId>rest-tx-api</artifactId>
-   <packaging>jar</packaging>
-   <name>RESTful API for Atomic Transactions</name>
-   <description>Provides Transactions for web applications</description>
-
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>rest-tx-api</artifactId>
+    <packaging>jar</packaging>
+    <name>RESTful API for Atomic Transactions</name>
+    <description>Provides Transactions for web applications</description>
     <properties>
         <version.org.jboss.resteasy>2.0.0.GA</version.org.jboss.resteasy>
         <version.artifactId>1.0-M1-SNAPSHOT</version.artifactId>
         <artifactId.name>rest-tx</artifactId.name>
         <version.org.jboss.jbossas>6.0.0.20100721-M4</version.org.jboss.jbossas>
     </properties>
-
-   <repositories>
+    <repositories>
         <repository>
             <id>jboss-public-repository-group</id>
             <name>JBoss Public Maven Repository Group</name>
@@ -50,16 +44,15 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
-<!-- Jersey -->
+        <!-- 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>
-
+        <!-- end Jersey -->
+    </repositories>
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -71,23 +64,19 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-   <dependencies>
-
-<!-- Jersey -->
-
-	<dependency>
-    	<groupId>asm</groupId>
-    	<artifactId>asm-all</artifactId>
-    	<version>3.1</version>
-    	<scope>test</scope>
-	</dependency>
-       
+    <dependencies>
+        <!-- Jersey -->
         <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-all</artifactId>
+            <version>3.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-server</artifactId>
             <version>1.5-SNAPSHOT</version>
-    		<scope>test</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>
@@ -99,122 +88,115 @@
             <groupId>com.sun.grizzly</groupId>
             <artifactId>grizzly-servlet-webserver</artifactId>
             <version>1.9.18-i</version>
-    		<scope>test</scope>
+            <scope>test</scope>
         </dependency>
-
-<!-- end Jersey -->
-	  <dependency>
-		<groupId>org.jboss.jbossts</groupId>
-		<artifactId>jbossjts</artifactId>
-		<scope>provided</scope>
-	  </dependency>
-	<dependency>
-	  <groupId>commons-logging</groupId>
-	  <artifactId>commons-logging</artifactId>
-	  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>junit</groupId>
-	  <artifactId>junit</artifactId>
-	  <scope>test</scope>
-	</dependency>
-
-    <dependency>
-      <groupId>org.codehaus.jettison</groupId>
-      <artifactId>jettison</artifactId>
-	  <scope>provided</scope>
-	</dependency>
-
-	<dependency>
-		 <groupId>org.jboss.resteasy</groupId>
-		 <artifactId>resteasy-jaxrs</artifactId>
-		 <version>${version.org.jboss.resteasy}</version>
-	     <scope>provided</scope>
-
-		 <!-- filter out unwanted jars -->
-		 <exclusions>
-			<exclusion>
-			   <groupId>commons-httpclient</groupId>
-			   <artifactId>commons-httpclient</artifactId>
-			</exclusion>
-			<exclusion>
-			   <groupId>javax.servlet</groupId>
-			   <artifactId>servlet-api</artifactId>
-			</exclusion>
-		 </exclusions>
-	</dependency>
-	<dependency>
-		  <groupId>org.jboss.resteasy</groupId>
-		  <artifactId>resteasy-jaxb-provider</artifactId>
-		  <version>${version.org.jboss.resteasy}</version>
-		  <scope>provided</scope>
-	</dependency>
-	<dependency>
-		  <groupId>org.jboss.resteasy</groupId>
-		  <artifactId>resteasy-jettison-provider</artifactId>
-		  <version>${version.org.jboss.resteasy}</version>
-		  <scope>provided</scope>
-	</dependency>
-	<dependency>
-		 <groupId>org.jboss.resteasy</groupId>
-		 <artifactId>jaxrs-api</artifactId>
-		 <version>${version.org.jboss.resteasy}</version>
-		  <scope>provided</scope>
-	</dependency>
-	<dependency>
-	  <groupId>commons-httpclient</groupId>
-	  <artifactId>commons-httpclient</artifactId>
-		  <scope>provided</scope>
-	</dependency>
-	<dependency>
-		<groupId>org.jboss.resteasy</groupId>
-		<artifactId>tjws</artifactId>
-		<version>${version.org.jboss.resteasy}</version>
-		  <scope>provided</scope>
-	</dependency>
-
-   </dependencies>
-
-   <build>
-	  <plugins>
-		 <plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-compiler-plugin</artifactId>
-			<configuration>
-			   <source>1.6</source>
-			   <target>1.6</target>
-			</configuration>
-		 </plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>create_sources_jar</id>
-						<goals> <goal>jar</goal> </goals>
-						<phase>prepare-package</phase>
-					</execution>
-				</executions>
-				<configuration>
-					<forceCreation>true</forceCreation>
-					<includePom>true</includePom>
-				</configuration>
-			</plugin>
-
-     <plugin>
-       <groupId>org.apache.maven.plugins</groupId>
-       <artifactId>maven-jar-plugin</artifactId>
-       <version>2.2</version>
-       <executions>
-         <execution>
-           <goals>
-             <goal>test-jar</goal>
-           </goals>
-         </execution>
-       </executions>
-     </plugin>
-
-	  </plugins>
-   </build>
+        <!-- end Jersey -->
+        <dependency>
+            <groupId>org.jboss.jbossts</groupId>
+            <artifactId>jbossjts</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jettison</groupId>
+            <artifactId>jettison</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <version>${version.org.jboss.resteasy}</version>
+            <scope>provided</scope>
+            <!-- filter out unwanted jars -->
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-httpclient</groupId>
+                    <artifactId>commons-httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxb-provider</artifactId>
+            <version>${version.org.jboss.resteasy}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jettison-provider</artifactId>
+            <version>${version.org.jboss.resteasy}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>jaxrs-api</artifactId>
+            <version>${version.org.jboss.resteasy}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>tjws</artifactId>
+            <version>${version.org.jboss.resteasy}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>create_sources_jar</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <forceCreation>true</forceCreation>
+                    <includePom>true</includePom>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: labs/jbosstm/trunk/rest-tx/webservice/pom.xml
===================================================================
--- labs/jbosstm/trunk/rest-tx/webservice/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/rest-tx/webservice/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -15,29 +15,23 @@
 	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 	02110-1301, USA.
 -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.jboss.jbossts.rts</groupId>
         <artifactId>rest-tx</artifactId>
         <version>1.0-M1-SNAPSHOT</version>
     </parent>
-
     <modelVersion>4.0.0</modelVersion>
     <artifactId>rest-tx-web</artifactId>
     <packaging>war</packaging>
     <name>RESTful Atomic Transactions War Packaging</name>
     <description>Provides Transactions for web applications</description>
-
     <properties>
         <version.org.jboss.resteasy>2.0.0.GA</version.org.jboss.resteasy>
         <version.artifactId>1.0-M1-SNAPSHOT</version.artifactId>
         <artifactId.name>rest-tx</artifactId.name>
         <version.org.jboss.jbossas>6.0.0.20100721-M4</version.org.jboss.jbossas>
     </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -49,10 +43,8 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
     <dependencies>
-
-<!--
+        <!--
 		<dependency>
 			<groupId>org.jboss.jbossas</groupId>
 			<artifactId>jboss-as-depchain</artifactId>
@@ -60,7 +52,6 @@
 			<type>pom</type>
 		</dependency>
 		-->
-
         <dependency>
             <groupId>org.jboss.jbossts.rts</groupId>
             <artifactId>rest-tx-api</artifactId>
@@ -78,22 +69,18 @@
             <artifactId>jbossjts</artifactId>
             <scope>test</scope>
         </dependency>
-
-		<dependency>
-			<groupId>asm</groupId>
-			<artifactId>asm-all</artifactId>
-			<version>3.1</version>
-			<scope>test</scope>
-		</dependency>
-
         <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-all</artifactId>
+            <version>3.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>
             <artifactId>jersey-test-framework-grizzly</artifactId>
             <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -109,7 +96,6 @@
             <artifactId>log4j</artifactId>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
@@ -135,7 +121,6 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -146,14 +131,15 @@
                     <target>1.6</target>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>create_sources_jar</id>
-                        <goals> <goal>jar</goal> </goals>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
                         <phase>prepare-package</phase>
                     </execution>
                 </executions>
@@ -162,69 +148,67 @@
                     <includePom>true</includePom>
                 </configuration>
             </plugin>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<redirectTestOutputToFile>true</redirectTestOutputToFile>
-					<trimStackTrace>false</trimStackTrace>
-					<printSummary>true</printSummary>
-					<includes>
-						<include>**/*UnitTest.java</include>
-					</includes>
-					<forkMode>always</forkMode>
-				</configuration>
-			</plugin>
-            
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <trimStackTrace>false</trimStackTrace>
+                    <printSummary>true</printSummary>
+                    <includes>
+                        <include>**/*UnitTest.java</include>
+                    </includes>
+                    <forkMode>always</forkMode>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-
     <profiles>
-		<profile>
-			<id>bust</id>
-			<!-- eventually starts but fails because it can't get a JMX connection
+        <profile>
+            <id>bust</id>
+            <!-- eventually starts but fails because it can't get a JMX connection
 			     so the stop goal isn't executed leaving the server running
 			     -->
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<build>
-			<plugins>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>jboss-maven-plugin</artifactId>
-					<version>1.4.1</version>
-					<executions>
-						<execution>
-							<id>start-container</id>
-							<phase>pre-integration-test</phase>
-							<goals>
-								<goal>configure</goal>
-								<goal>startAndWait</goal>
-								<goal>deploy</goal>
-							</goals>
-						</execution>
-						<execution>
-							<id>stop-container</id>
-							<phase>post-integration-test</phase>
-							<goals>
-								<goal>undeploy</goal>
-								<goal>stop</goal>
-							</goals>
-						</execution>
-					</executions>
-					<configuration>
-						<!--
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>jboss-maven-plugin</artifactId>
+                        <version>1.4.1</version>
+                        <executions>
+                            <execution>
+                                <id>start-container</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>configure</goal>
+                                    <goal>startAndWait</goal>
+                                    <goal>deploy</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>stop-container</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy</goal>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <!--
 						<jbossHome>${project.build.directory}/jboss-${version.org.jboss.jbossas}</jbossHome>
 						-->
-						<jbossHome>${env.JBOSS_HOME}</jbossHome>
-						<fileName>${basedir}/target/${artifactId.name}-web-${version.artifactId}.war</fileName>
-						<serverName>default</serverName>
-						<port>8080</port>
-					</configuration>
-				</plugin>
-			</plugins>
-			</build>
-		</profile>
+                            <jbossHome>${env.JBOSS_HOME}</jbossHome>
+                            <fileName>${basedir}/target/${artifactId.name}-web-${version.artifactId}.war</fileName>
+                            <serverName>default</serverName>
+                            <port>8080</port>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>remote</id>
             <activation>
@@ -295,11 +279,10 @@
                 </plugins>
             </build>
         </profile>
- 
         <profile>
             <id>embedded</id>
             <activation>
-            <!-- TODO cant get this profile to work either - needs more investigation -->
+                <!-- TODO cant get this profile to work either - needs more investigation -->
                 <activeByDefault>false</activeByDefault>
             </activation>
             <build>
@@ -314,14 +297,14 @@
                                     <goal>test</goal>
                                 </goals>
                                 <configuration>
-									<systemProperties>
-										<property>
-											<name>resttx.war</name>
-											<value>${basedir}/target/${artifactId.name}-web-${version.artifactId}.war</value>
-										</property>
-									</systemProperties>
+                                    <systemProperties>
+                                        <property>
+                                            <name>resttx.war</name>
+                                            <value>${basedir}/target/${artifactId.name}-web-${version.artifactId}.war</value>
+                                        </property>
+                                    </systemProperties>
                                     <environmentVariables>
-                                        <resttx.war>${basedir}/target/${artifactId.name}-web-${version.artifactId}.war</resttx.war>    
+                                        <resttx.war>${basedir}/target/${artifactId.name}-web-${version.artifactId}.war</resttx.war>
                                     </environmentVariables>
                                     <additionalClasspathElements>
                                         <additionalClasspathElement>${JBOSS_HOME}/client/jbossws-native-client.jar</additionalClasspathElement>
@@ -356,7 +339,8 @@
                         <executions>
                             <execution>
                                 <id>unpack</id>
-                                <phase>pre-integration-test</phase> <!-- So run before testing -->
+                                <phase>pre-integration-test</phase>
+                                <!-- So run before testing -->
                                 <goals>
                                     <goal>unpack</goal>
                                 </goals>
@@ -379,5 +363,4 @@
             </build>
         </profile>
     </profiles>
-
 </project>

Modified: labs/jbosstm/trunk/rhq-plugin/pom.xml
===================================================================
--- labs/jbosstm/trunk/rhq-plugin/pom.xml	2011-03-17 11:56:35 UTC (rev 36838)
+++ labs/jbosstm/trunk/rhq-plugin/pom.xml	2011-03-17 12:02:38 UTC (rev 36839)
@@ -1,153 +1,145 @@
+<?xml version="1.0"?>
 <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>
-
-
     <parent>
         <groupId>org.jboss.jbossts</groupId>
         <artifactId>narayana-parent</artifactId>
         <version>4.15.0.M1-SNAPSHOT</version>
     </parent>
-
     <artifactId>jbossts-jopr-plugin</artifactId>
     <packaging>jar</packaging>
-
     <name>Jopr Test Plugin</name>
     <description>A plugin for managing services</description>
-
-	<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-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>create_javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<phase>prepare-package</phase>
-					</execution>
-				</executions>
-				<configuration>
-					<detectOfflineLinks>false</detectOfflineLinks>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
+    <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-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>create_javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <detectOfflineLinks>false</detectOfflineLinks>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <dependencies>
-		<!-- Below are the core modules that are required dependencies of all plugins -->
-		<dependency>
-			<groupId>org.rhq</groupId>
-			<artifactId>rhq-core-domain</artifactId>
-			<version>${rhq.version}</version>
-			<scope>provided</scope> <!-- provided by the agent/plugin-container -->
-			<exclusions>
-				<exclusion>
-					<groupId>javax.xml.bind</groupId>
-					<artifactId>jaxb-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.xml.bind</groupId>
-					<artifactId>jaxb-impl</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.xml.stream</groupId>
-					<artifactId>stax-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.rhq</groupId>
-			<artifactId>rhq-core-plugin-api</artifactId>
-			<version>${rhq.version}</version>
-			<scope>provided</scope> <!-- provided by the agent/plugin-container -->
-			<exclusions>
-				<exclusion>
-					<groupId>javax.xml.bind</groupId>
-					<artifactId>jaxb-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.xml.bind</groupId>
-					<artifactId>jaxb-impl</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.xml.stream</groupId>
-					<artifactId>stax-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.rhq</groupId>
-			<artifactId>rhq-core-native-system</artifactId>
-			<version>${rhq.version}</version>
-			<scope>provided</scope> <!-- provided by the agent/plugin-container -->
-		</dependency>
-
+        <!-- Below are the core modules that are required dependencies of all plugins -->
         <dependency>
- 			<groupId>org.rhq</groupId>
-           <artifactId>rhq-jmx-plugin</artifactId>
-			<version>${rhq.version}</version>
+            <groupId>org.rhq</groupId>
+            <artifactId>rhq-core-domain</artifactId>
+            <version>${rhq.version}</version>
             <scope>provided</scope>
+            <!-- provided by the agent/plugin-container -->
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.xml.stream</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-
-		<!-- Fix for the Javac bug requiring annotations to be available when compiling classes. (fixed in JDK 6) -->
-		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>persistence-api</artifactId>
-			<version>1.0</version>
-			<scope>provided</scope> <!-- provided by the agent/plugin-container -->
-		</dependency>
-
-		<!-- Fix for the Javac bug requiring annotations to be available when compiling classes. (fixed in JDK 6) -->
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-annotations</artifactId>
-			<version>3.5.6-Final</version>
-			<scope>provided</scope> <!-- provided by the agent/plugin-container -->
-			<exclusions>
-				<exclusion>
-					<groupId>javax.transaction</groupId>
-					<artifactId>jta</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!--
+        <dependency>
+            <groupId>org.rhq</groupId>
+            <artifactId>rhq-core-plugin-api</artifactId>
+            <version>${rhq.version}</version>
+            <scope>provided</scope>
+            <!-- provided by the agent/plugin-container -->
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.xml.stream</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.rhq</groupId>
+            <artifactId>rhq-core-native-system</artifactId>
+            <version>${rhq.version}</version>
+            <scope>provided</scope>
+            <!-- provided by the agent/plugin-container -->
+        </dependency>
+        <dependency>
+            <groupId>org.rhq</groupId>
+            <artifactId>rhq-jmx-plugin</artifactId>
+            <version>${rhq.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Fix for the Javac bug requiring annotations to be available when compiling classes. (fixed in JDK 6) -->
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>persistence-api</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+            <!-- provided by the agent/plugin-container -->
+        </dependency>
+        <!-- Fix for the Javac bug requiring annotations to be available when compiling classes. (fixed in JDK 6) -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-annotations</artifactId>
+            <version>3.5.6-Final</version>
+            <scope>provided</scope>
+            <!-- provided by the agent/plugin-container -->
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.transaction</groupId>
+                    <artifactId>jta</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--
 		Uncomment the one of the three logging systems your plugin uses: log4j, commons-logging or i18nlog
 		All three are provided to your plugin by the agent/plugin-container.
 		-->
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1</version>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.servlet</groupId>
-					<artifactId>servlet-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-    <!--
         <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--
+        <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-jmx-plugin</artifactId>
             <version>1.3.0.EmbJopr.1.3.0-4</version>
@@ -163,11 +155,8 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
         -->
-
     </dependencies>
-
-
-	<properties>
-    <rhq.version>1.3.0.EmbJopr.1.3.0-4</rhq.version>
-	</properties>
+    <properties>
+        <rhq.version>1.3.0.EmbJopr.1.3.0-4</rhq.version>
+    </properties>
 </project>



More information about the jboss-svn-commits mailing list