[jboss-svn-commits] JBL Code SVN: r36848 - in labs/jbosstm/trunk/XTS: WSAS/wsas and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 18 12:32:17 EDT 2011
Author: tomjenkinson
Date: 2011-03-18 12:32:17 -0400 (Fri, 18 Mar 2011)
New Revision: 36848
Added:
labs/jbosstm/trunk/XTS/WSAS/wsas/
labs/jbosstm/trunk/XTS/WSAS/wsas/pom.xml
labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet/
labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet/pom.xml
Removed:
labs/jbosstm/trunk/XTS/WSAS/pom.xml
Modified:
labs/jbosstm/trunk/XTS/dist/pom.xml
labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml
Log:
JBTM-574 updated to build the xts-test-servlet
Deleted: labs/jbosstm/trunk/XTS/WSAS/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/pom.xml 2011-03-18 16:14:38 UTC (rev 36847)
+++ labs/jbosstm/trunk/XTS/WSAS/pom.xml 2011-03-18 16:32:17 UTC (rev 36848)
@@ -1,32 +0,0 @@
-<?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>wsas</artifactId>
- <packaging>jar</packaging>
- <build>
- <sourceDirectory>classes</sourceDirectory>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossts</groupId>
- <artifactId>arjuna</artifactId>
- </dependency>
- </dependencies>
-</project>
Property changes on: labs/jbosstm/trunk/XTS/WSAS/wsas
___________________________________________________________________
Added: svn:ignore
+ target
.project
.classpath
.settings
Copied: labs/jbosstm/trunk/XTS/WSAS/wsas/pom.xml (from rev 36839, labs/jbosstm/trunk/XTS/WSAS/pom.xml)
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/wsas/pom.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/WSAS/wsas/pom.xml 2011-03-18 16:32:17 UTC (rev 36848)
@@ -0,0 +1,32 @@
+<?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>wsas</artifactId>
+ <packaging>jar</packaging>
+ <build>
+ <sourceDirectory>../classes</sourceDirectory>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>arjuna</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Property changes on: labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet
___________________________________________________________________
Added: svn:ignore
+ target
.project
.classpath
.settings
Added: labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet/pom.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/WSAS/xts-test-servlet/pom.xml 2011-03-18 16:32:17 UTC (rev 36848)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
+ LLC, and others contributors as indicated by the @authors tag. All rights
+ reserved. See the copyright.txt in the distribution for a full listing of
+ individual contributors. This copyrighted material is made available to anyone
+ wishing to use, modify, copy, or redistribute it subject to the terms and
+ conditions of the GNU Lesser General Public License, v. 2.1. This program
+ is distributed in the hope that it will be useful, but WITHOUT A WARRANTY;
+ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU Lesser General Public License for more details. You
+ should have received a copy of the GNU Lesser General Public License, v.2.1
+ along with this distribution; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>narayana-parent</artifactId>
+ <version>4.15.0.M1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>xts-test-servlet</artifactId>
+ <packaging>jar</packaging>
+ <build>
+ <sourceDirectory>../tests/classes</sourceDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>com/arjuna/qa/junit/*.*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>arjuna</artifactId>
+ </dependency>
+ <!-- XTS: -->
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ </dependency>
+
+ <!-- test time dep only - XTS TestRunnerXMLServlet -->
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ </dependencies>
+</project>
Modified: labs/jbosstm/trunk/XTS/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/dist/pom.xml 2011-03-18 16:14:38 UTC (rev 36847)
+++ labs/jbosstm/trunk/XTS/dist/pom.xml 2011-03-18 16:32:17 UTC (rev 36848)
@@ -216,6 +216,10 @@
<classifier>sar</classifier>
<type>sar</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>localjunit</artifactId>
+ </dependency>
</dependencies>
<properties>
<PRODUCT_NAME>xts</PRODUCT_NAME>
Modified: labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml 2011-03-18 16:14:38 UTC (rev 36847)
+++ labs/jbosstm/trunk/XTS/dist/src/main/assembly/bin.xml 2011-03-18 16:32:17 UTC (rev 36848)
@@ -37,6 +37,26 @@
</dependencySet>
<dependencySet>
<includes>
+ <include>org.jboss.jbossts:localjunit</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>interop-tests</outputDirectory>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.jbossts:localjunit</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>tests</outputDirectory>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ <dependencySet>
+ <includes>
<include>*:api</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
@@ -51,6 +71,7 @@
<exclude>*:xts-guide:*</exclude>
<exclude>*:xts-demo:*</exclude>
<exclude>*:war:*</exclude>
+ <exclude>*localjunit*</exclude>
</excludes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
@@ -101,6 +122,16 @@
<fileMode>0644</fileMode>
<outputDirectory>lib/ext</outputDirectory>
</file>
+ <file>
+ <source>../localjunit/run-tests.xml</source>
+ <fileMode>0644</fileMode>
+ <outputDirectory>tests</outputDirectory>
+ </file>
+ <file>
+ <source>../localjunit/run-interop-tests.xml</source>
+ <fileMode>0644</fileMode>
+ <outputDirectory>interop-tests</outputDirectory>
+ </file>
</files>
<fileSets>
<fileSet>
More information about the jboss-svn-commits
mailing list