[jboss-svn-commits] JBL Code SVN: r36821 - in labs/jbosstm/trunk: ArjunaJTS/dist/src/main/assembly and 17 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 16 12:18:13 EDT 2011
Author: tomjenkinson
Date: 2011-03-16 12:18:12 -0400 (Wed, 16 Mar 2011)
New Revision: 36821
Added:
labs/jbosstm/trunk/XTS/dist/
labs/jbosstm/trunk/XTS/dist/pom.xml
labs/jbosstm/trunk/XTS/dist/src/
labs/jbosstm/trunk/XTS/dist/src/main/
labs/jbosstm/trunk/XTS/dist/src/main/assembly/
labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/XTS/jbossxts-api/
labs/jbosstm/trunk/XTS/jbossxts-api/pom.xml
Removed:
labs/jbosstm/trunk/XTS/docs/htdocs/
labs/jbosstm/trunk/narayana-build-all/
Modified:
labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.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/XTS/docs/Transactions_XTS_Administration_And_Development_Guide/publican-maven.cfg
labs/jbosstm/trunk/XTS/docs/pom.xml
labs/jbosstm/trunk/XTS/pom.xml
labs/jbosstm/trunk/common/pom.xml
labs/jbosstm/trunk/narayana-parent/pom.xml
labs/jbosstm/trunk/qa/tests/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 updated to add XTS
Modified: labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml 2011-03-16 14:09:21 UTC (rev 36820)
+++ labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -26,7 +26,7 @@
<excludes>
<exclude>org.jboss.jbossts:jbossjts:*</exclude>
</excludes>
- <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}
+ <outputFileNameMapping>${artifact.artifactId}-javadoc.${artifact.extension}
</outputFileNameMapping>
<outputDirectory>bin</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml 2011-03-16 14:09:21 UTC (rev 36820)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -1,143 +1,143 @@
-<?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>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>
+<?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>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-16 14:09:21 UTC (rev 36820)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -1,197 +1,197 @@
-<?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>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>
+<?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>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-16 14:09:21 UTC (rev 36820)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -1,160 +1,160 @@
-<?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>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>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <version>3.0.0.Beta4</version>
- </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>
+<?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>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>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.0.0.Beta4</version>
+ </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>
Added: labs/jbosstm/trunk/XTS/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/dist/pom.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/dist/pom.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -0,0 +1,179 @@
+<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,
+ copy, or redistribute it subject to the terms and conditions of the GNU Lesser
+ General Public License, v. 2.1. This program is distributed in the hope that
+ it will be useful, but WITHOUT A WARRANTY; without even the implied warranty
+ of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
+ General Public License for more details. You should have received a copy
+ of the GNU Lesser General Public License, v.2.1 along with this distribution;
+ if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA 02110-1301, USA. (C) 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>
+ </dependencies>
+
+
+ <properties>
+ <PRODUCT_NAME>xts</PRODUCT_NAME>
+ <HOME_DIRECTORY>XTS_HOME</HOME_DIRECTORY>
+ </properties>
+</project>
Added: labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated by the @authors tag. All rights reserved. See the copyright.txt in the distribution
+ for a full listing of individual contributors. This copyrighted material is made available to anyone wishing to use, modify, copy, or redistribute it subject to the terms and conditions of the GNU Lesser
+ General Public License, v. 2.1. This program is distributed in the hope that it will be useful, but WITHOUT A WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License, v.2.1 along with this distribution; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
+<assembly>
+ <id>bin</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>*:javadoc</include>
+ </includes>
+ <outputDirectory>docs/api</outputDirectory>
+ <useProjectAttachments>true</useProjectAttachments>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>*:api</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ <dependencySet>
+ <excludes>
+ <exclude>*:api</exclude>
+ <exclude>*:xts-guide:*</exclude>
+ </excludes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+ <files>
+ <file>
+ <source>../third_party_licenses.txt</source>
+ <fileMode>0644</fileMode>
+ <outputDirectory>lib/ext</outputDirectory>
+ </file>
+ </files>
+ <fileSets>
+ <fileSet>
+ <directory>../config</directory>
+ <outputDirectory>conf</outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>../docs/Transactions_XTS_Administration_And_Development_Guide/target/publican/Transactions_XTS_Administration_And_Development_Guide/en-US/pdf/</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../demo/</directory>
+ <outputDirectory>demo</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: labs/jbosstm/trunk/XTS/docs/Transactions_XTS_Administration_And_Development_Guide/publican-maven.cfg
===================================================================
--- labs/jbosstm/trunk/XTS/docs/Transactions_XTS_Administration_And_Development_Guide/publican-maven.cfg 2011-03-16 14:09:21 UTC (rev 36820)
+++ labs/jbosstm/trunk/XTS/docs/Transactions_XTS_Administration_And_Development_Guide/publican-maven.cfg 2011-03-16 16:18:12 UTC (rev 36821)
@@ -4,4 +4,4 @@
xml_lang: en-US
type: Book
brand: jboss-community
-tmp_dir: target/publican/ArjunaJTS_Development_Guide
+tmp_dir: target/publican/Transactions_XTS_Administration_And_Development_Guide
Modified: labs/jbosstm/trunk/XTS/docs/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/docs/pom.xml 2011-03-16 14:09:21 UTC (rev 36820)
+++ labs/jbosstm/trunk/XTS/docs/pom.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -28,7 +28,6 @@
<name>XTS Documentation</name>
<modules>
- <module>htdocs</module>
<module>Transactions_XTS_Administration_And_Development_Guide</module>
</modules>
</project>
Added: labs/jbosstm/trunk/XTS/jbossxts-api/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/jbossxts-api/pom.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/jbossxts-api/pom.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -0,0 +1,188 @@
+<?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>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>
+ <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-16 14:09:21 UTC (rev 36820)
+++ labs/jbosstm/trunk/XTS/pom.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -32,7 +32,10 @@
<module>WSTX</module>
<module>recovery</module>
<module>bridge</module>
- <module>sar</module>
+ <!--<module>sar</module>-->
+<!-- <module>demo</module>-->
<module>docs</module>
+ <module>jbossxts-api</module>
+ <module>dist</module>
</modules>
</project>
Modified: labs/jbosstm/trunk/common/pom.xml
===================================================================
--- labs/jbosstm/trunk/common/pom.xml 2011-03-16 14:09:21 UTC (rev 36820)
+++ labs/jbosstm/trunk/common/pom.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -1,19 +1,11 @@
<?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">
+<!-- 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>
Modified: labs/jbosstm/trunk/narayana-parent/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-parent/pom.xml 2011-03-16 14:09:21 UTC (rev 36820)
+++ labs/jbosstm/trunk/narayana-parent/pom.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -445,13 +445,13 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
- <artifactId>ws-c10</artifactId>
+ <artifactId>ws-c</artifactId>
<version>${project.version}</version>
<classifier>api</classifier>
</dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
- <artifactId>ws-c11</artifactId>
+ <artifactId>ws-c10</artifactId>
<version>${project.version}</version>
<classifier>api</classifier>
</dependency>
@@ -478,6 +478,12 @@
</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>
@@ -532,6 +538,12 @@
</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>
@@ -555,12 +567,17 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
- <artifactId>jbossxts</artifactId>
+ <artifactId>jbossxts-api</artifactId>
<version>${project.version}</version>
- <classifier>api</classifier>
</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>
Modified: labs/jbosstm/trunk/qa/tests/pom.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/pom.xml 2011-03-16 14:09:21 UTC (rev 36820)
+++ labs/jbosstm/trunk/qa/tests/pom.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -1,183 +1,183 @@
-<?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">
-
- <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>
+<?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">
+
+ <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/tx/pom.xml
===================================================================
--- labs/jbosstm/trunk/rest-tx/tx/pom.xml 2011-03-16 14:09:21 UTC (rev 36820)
+++ labs/jbosstm/trunk/rest-tx/tx/pom.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -1,220 +1,220 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss, Home of Professional Open Source Copyright 2010, 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.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>
-
- <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>
- <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>
-<!-- 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>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-component-matrix</artifactId>
- <version>6.0.0.20100721-M4</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <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>
- </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>com.sun.grizzly</groupId>
- <artifactId>grizzly-servlet-webserver</artifactId>
- <version>1.9.18-i</version>
- <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>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, 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.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>
+
+ <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>
+ <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>
+<!-- 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>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-component-matrix</artifactId>
+ <version>6.0.0.20100721-M4</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <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>
+ </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>com.sun.grizzly</groupId>
+ <artifactId>grizzly-servlet-webserver</artifactId>
+ <version>1.9.18-i</version>
+ <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>
+</project>
Modified: labs/jbosstm/trunk/rest-tx/webservice/pom.xml
===================================================================
--- labs/jbosstm/trunk/rest-tx/webservice/pom.xml 2011-03-16 14:09:21 UTC (rev 36820)
+++ labs/jbosstm/trunk/rest-tx/webservice/pom.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -1,383 +1,383 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- JBoss, Home of Professional Open Source Copyright 2009, 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.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>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-component-matrix</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
-
-<!--
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-depchain</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- <type>pom</type>
- </dependency>
- -->
-
- <dependency>
- <groupId>org.jboss.jbossts.rts</groupId>
- <artifactId>rest-tx-api</artifactId>
- <version>${version.artifactId}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossts.rts</groupId>
- <artifactId>rest-tx-api</artifactId>
- <version>${version.artifactId}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossts</groupId>
- <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>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>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</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>org.jboss.resteasy</groupId>
- <artifactId>tjws</artifactId>
- <version>${version.org.jboss.resteasy}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>test</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>
- <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
- 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>
- <!--
- <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>
- <profile>
- <id>remote</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <version>1.3.1</version>
- <configuration>
- <jbossHome>${env.JBOSS_HOME}</jbossHome>
- </configuration>
- <executions>
- <execution>
- <id>jboss-deploy</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- <configuration>
- <fileName>${basedir}/target/${artifactId.name}-web-${version.artifactId}.war</fileName>
- <serverName>default</serverName>
- <skip>false</skip>
- </configuration>
- </execution>
- <execution>
- <id>jboss-undeploy</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy</goal>
- </goals>
- <configuration>
- <fileName>${basedir}/target/${artifactId.name}-web-${version.artifactId}.war</fileName>
- <serverName>default</serverName>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <trimStackTrace>false</trimStackTrace>
- <printSummary>true</printSummary>
- <includes>
- <include>**/*IntegrationTest.java</include>
- </includes>
- <forkMode>always</forkMode>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>embedded</id>
- <activation>
- <!-- TODO cant get this profile to work either - needs more investigation -->
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <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>
- </environmentVariables>
- <additionalClasspathElements>
- <additionalClasspathElement>${JBOSS_HOME}/client/jbossws-native-client.jar</additionalClasspathElement>
- <!--
- Because jbossweb.sar contains shared web.xml,
- which must be visible from same CL as
- TomcatDeployer.class.getClassLoader
- -->
- <additionalClasspathElement>${JBOSS_HOME}/server/default/deploy/jbossweb.sar</additionalClasspathElement>
- </additionalClasspathElements>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <trimStackTrace>false</trimStackTrace>
- <printSummary>true</printSummary>
- <includes>
- <include>**/*IntegrationTest.java</include>
- </includes>
- <forkMode>always</forkMode>
- <!--
- MaxPermSize Required to bump the space for relective
- data like classes, methods, etc. EMB-41. Endorsed
- required for things like WS support (EMB-61)
- -->
- <argLine>-Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Djava.endorsed.dirs=${JBOSS_HOME}/lib/endorsed -Djboss.home=${JBOSS_HOME} -Djboss.boot.server.log.dir=${JBOSS_HOME}</argLine>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Get AS and put into "target" -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>pre-integration-test</phase> <!-- So run before testing -->
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-distribution</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- <type>zip</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.build.directory}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2009, 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.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>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-component-matrix</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+
+<!--
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-depchain</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ <type>pom</type>
+ </dependency>
+ -->
+
+ <dependency>
+ <groupId>org.jboss.jbossts.rts</groupId>
+ <artifactId>rest-tx-api</artifactId>
+ <version>${version.artifactId}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts.rts</groupId>
+ <artifactId>rest-tx-api</artifactId>
+ <version>${version.artifactId}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <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>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>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</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>org.jboss.resteasy</groupId>
+ <artifactId>tjws</artifactId>
+ <version>${version.org.jboss.resteasy}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>test</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>
+ <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
+ 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>
+ <!--
+ <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>
+ <profile>
+ <id>remote</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-maven-plugin</artifactId>
+ <version>1.3.1</version>
+ <configuration>
+ <jbossHome>${env.JBOSS_HOME}</jbossHome>
+ </configuration>
+ <executions>
+ <execution>
+ <id>jboss-deploy</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ <configuration>
+ <fileName>${basedir}/target/${artifactId.name}-web-${version.artifactId}.war</fileName>
+ <serverName>default</serverName>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>jboss-undeploy</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy</goal>
+ </goals>
+ <configuration>
+ <fileName>${basedir}/target/${artifactId.name}-web-${version.artifactId}.war</fileName>
+ <serverName>default</serverName>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <trimStackTrace>false</trimStackTrace>
+ <printSummary>true</printSummary>
+ <includes>
+ <include>**/*IntegrationTest.java</include>
+ </includes>
+ <forkMode>always</forkMode>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>embedded</id>
+ <activation>
+ <!-- TODO cant get this profile to work either - needs more investigation -->
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <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>
+ </environmentVariables>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${JBOSS_HOME}/client/jbossws-native-client.jar</additionalClasspathElement>
+ <!--
+ Because jbossweb.sar contains shared web.xml,
+ which must be visible from same CL as
+ TomcatDeployer.class.getClassLoader
+ -->
+ <additionalClasspathElement>${JBOSS_HOME}/server/default/deploy/jbossweb.sar</additionalClasspathElement>
+ </additionalClasspathElements>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <trimStackTrace>false</trimStackTrace>
+ <printSummary>true</printSummary>
+ <includes>
+ <include>**/*IntegrationTest.java</include>
+ </includes>
+ <forkMode>always</forkMode>
+ <!--
+ MaxPermSize Required to bump the space for relective
+ data like classes, methods, etc. EMB-41. Endorsed
+ required for things like WS support (EMB-61)
+ -->
+ <argLine>-Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Djava.endorsed.dirs=${JBOSS_HOME}/lib/endorsed -Djboss.home=${JBOSS_HOME} -Djboss.boot.server.log.dir=${JBOSS_HOME}</argLine>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Get AS and put into "target" -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>pre-integration-test</phase> <!-- So run before testing -->
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-distribution</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ <type>zip</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Modified: labs/jbosstm/trunk/rhq-plugin/pom.xml
===================================================================
--- labs/jbosstm/trunk/rhq-plugin/pom.xml 2011-03-16 14:09:21 UTC (rev 36820)
+++ labs/jbosstm/trunk/rhq-plugin/pom.xml 2011-03-16 16:18:12 UTC (rev 36821)
@@ -1,170 +1,170 @@
-<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>
- </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>
-
- <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>org.rhq</groupId>
- <artifactId>rhq-jmx-plugin</artifactId>
- <version>1.3.0.EmbJopr.1.3.0-4</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- -->
-
- </dependencies>
-
-
- <properties>
- <rhq.version>1.3.0.EmbJopr.1.3.0-4</rhq.version>
- </properties>
-</project>
+<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>
+ </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>
+
+ <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>org.rhq</groupId>
+ <artifactId>rhq-jmx-plugin</artifactId>
+ <version>1.3.0.EmbJopr.1.3.0-4</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ -->
+
+ </dependencies>
+
+
+ <properties>
+ <rhq.version>1.3.0.EmbJopr.1.3.0-4</rhq.version>
+ </properties>
+</project>
More information about the jboss-svn-commits
mailing list