[jboss-svn-commits] JBL Code SVN: r36676 - in labs/jbosstm/trunk: ArjunaJTS/dist and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 24 05:44:24 EST 2011
Author: tomjenkinson
Date: 2011-02-24 05:44:24 -0500 (Thu, 24 Feb 2011)
New Revision: 36676
Added:
labs/jbosstm/trunk/ArjunaJTS/tsmx/pom.xml
Modified:
labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml
labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/ArjunaJTS/pom.xml
labs/jbosstm/trunk/ArjunaJTS/tsmx/
labs/jbosstm/trunk/narayana-build-common/pom.xml
Log:
JBTM-574 updates for the JTS dist
Modified: labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml 2011-02-23 16:18:07 UTC (rev 36675)
+++ labs/jbosstm/trunk/ArjunaJTS/dist/pom.xml 2011-02-24 10:44:24 UTC (rev 36676)
@@ -73,10 +73,6 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
- <artifactId>arjuna</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossts</groupId>
<artifactId>tsmx-tools</artifactId>
</dependency>
<dependency>
@@ -97,30 +93,26 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
+ <artifactId>jbossjts</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
+ <artifactId>jbossjts</artifactId>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
+ <artifactId>jbossjts</artifactId>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
- <artifactId>jdbc</artifactId>
+ <artifactId>tsmx-jts-objectstorebrowser</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
- <artifactId>tsmx-jta-objectstorebrowser</artifactId>
+ <artifactId>jbossjts-integration</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.jbossts</groupId>
- <artifactId>jbossjta-integration</artifactId>
- </dependency>
</dependencies>
Modified: labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml 2011-02-23 16:18:07 UTC (rev 36675)
+++ labs/jbosstm/trunk/ArjunaJTS/dist/src/main/assembly/bin.xml 2011-02-24 10:44:24 UTC (rev 36676)
@@ -89,7 +89,7 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.jbossts:jbossjta</include>
+ <include>org.jboss.jbossts:jbossjts</include>
</includes>
<excludes>
<exclude>*:sources</exclude>
@@ -102,7 +102,7 @@
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.jbossts:jbossjta-integration</include>
+ <include>org.jboss.jbossts:jbossjts-integration</include>
</includes>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
@@ -111,8 +111,8 @@
</dependencySet>
<dependencySet>
<excludes>
- <exclude>org.jboss.jbossts:jbossjta</exclude>
- <exclude>org.jboss.jbossts:jbossjta-integration</exclude>
+ <exclude>org.jboss.jbossts:jbossjts</exclude>
+ <exclude>org.jboss.jbossts:jbossjts-integration</exclude>
<exclude>org.jboss.jbossts:arjunacore-services</exclude>
<exclude>org.jboss.jbossts:common</exclude>
<exclude>org.jboss.jbossts:arjuna</exclude>
@@ -125,6 +125,9 @@
<exclude>org.jboss.jbossts:jta</exclude>
<exclude>org.jboss.jbossts:jdbc</exclude>
<exclude>org.jboss.jbossts:tsmx-jta-objectstorebrowser</exclude>
+ <exclude>org.jboss.jbossts:orbportability</exclude>
+ <exclude>org.jboss.jbossts:jts</exclude>
+ <exclude>org.jboss.jbossts:jtax</exclude>
</excludes>
<outputDirectory>lib/ext</outputDirectory>
<unpack>false</unpack>
@@ -134,7 +137,7 @@
<include>org.jboss.jbossts:arjunacore-services</include>
</includes>
<outputDirectory>services/lib</outputDirectory>
- <outputFileNameMapping>jbossjta-services.jar
+ <outputFileNameMapping>jbossjts-services.jar
</outputFileNameMapping>
<unpack>false</unpack>
</dependencySet>
@@ -160,26 +163,26 @@
<outputDirectory>lib/ext</outputDirectory>
</file>
<file>
- <source>../../ArjunaCore/scripts/withoutorb-setup-env.sh</source>
+ <source>../../ArjunaCore/scripts/withorb-setup-env.sh</source>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
<destName>setup-env.sh</destName>
<filtered>true</filtered>
</file>
<file>
- <source>../../ArjunaCore/scripts/withoutorb-setup-env.bat</source>
+ <source>../../ArjunaCore/scripts/withorb-setup-env.bat</source>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
<destName>setup-env.bat</destName>
<filtered>true</filtered>
</file>
<file>
- <source>../jbossts-properties-arjunajta.xml</source>
+ <source>../jbossts-properties-arjunajts.xml</source>
<fileMode>0644</fileMode>
<destName>default-jbossts-properties.xml</destName>
</file>
<file>
- <source>../jbossts-properties-arjunajta.xml</source>
+ <source>../jbossts-properties-arjunajts.xml</source>
<fileMode>0644</fileMode>
<outputDirectory>etc</outputDirectory>
<destName>jbossts-properties.xml</destName>
@@ -188,6 +191,10 @@
<source>../INSTALL</source>
<fileMode>0644</fileMode>
</file>
+ <file>
+ <source>../docs/index.html</source>
+ <fileMode>0644</fileMode>
+ </file>
</files>
<fileSets>
<fileSet>
@@ -200,7 +207,8 @@
</includes>
</fileSet>
<fileSet>
- <directory>../../ArjunaCore/arjuna/services/scripts/windows</directory>
+ <directory>../../ArjunaCore/arjuna/services/scripts/windows
+ </directory>
<outputDirectory>services/bin/windows</outputDirectory>
</fileSet>
<fileSet>
@@ -220,6 +228,11 @@
<outputDirectory>services/config</outputDirectory>
</fileSet>
<fileSet>
+ <directory>../docs/images/
+ </directory>
+ <outputDirectory>docs/images</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>../docs/ArjunaTA_Installation_And_Administration_Guide/target/publican/ArjunaTA_Installation_And_Administration_Guide/en-US/pdf/
</directory>
<outputDirectory>docs</outputDirectory>
@@ -229,5 +242,27 @@
</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>../docs/user_guide/
+ </directory>
+ <outputDirectory>docs</outputDirectory>
+ <includes>
+ <include>**/*.pdf</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../orbportability/docs/programmers_guide</directory>
+ <outputDirectory>docs/user_guide</outputDirectory>
+ <includes>
+ <include>**/*.pdf</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../ArjunaCore/docs/user_guide</directory>
+ <outputDirectory>docs/user_guide/transaction_core</outputDirectory>
+ <includes>
+ <include>**/*.pdf</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
Modified: labs/jbosstm/trunk/ArjunaJTS/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/pom.xml 2011-02-23 16:18:07 UTC (rev 36675)
+++ labs/jbosstm/trunk/ArjunaJTS/pom.xml 2011-02-24 10:44:24 UTC (rev 36676)
@@ -48,11 +48,13 @@
<module>../ArjunaCore/arjuna/services</module>
<module>../ArjunaJTA/jta</module>
<module>../ArjunaJTA/jdbc</module>
+ <module>../ArjunaJTA/tsmx</module>
<module>orbportability</module>
<module>jts</module>
<module>jtax</module>
<module>tsmx-sar</module>
<module>jbossjts</module>
+ <module>tsmx</module>
<module>integration</module>
<module>trailmap</module>
<module>docs</module>
Property changes on: labs/jbosstm/trunk/ArjunaJTS/tsmx
___________________________________________________________________
Added: svn:ignore
+ target
build
.project
.classpath
.settings
Added: labs/jbosstm/trunk/ArjunaJTS/tsmx/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/tsmx/pom.xml (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTS/tsmx/pom.xml 2011-02-24 10:44:24 UTC (rev 36676)
@@ -0,0 +1,90 @@
+<?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-build-common</artifactId>
+ <version>5.0.0.M1-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>tsmx-jts-objectstorebrowser</artifactId>
+ <name>JBossJTS tsmx-jts-objectstorebrowser module</name>
+ <packaging>jar</packaging>
+
+
+ <build>
+ <resources>
+ <resource>
+ <directory>../../ArjunaCore/tsmx/etc/objectstorebrowser</directory>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>com/arjuna/ats/tools/objectstorebrowser/**</include>
+ </includes>
+ <!-- TODO THIS WAS NOT ACTUALLY EXCLUDED IN THE ORIGINAL BUILD DUE TO
+ A TYPO <excludes> <exclude>com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/**</exclude>
+ </excludes> -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>../../ArjunaCore/tsmx/bin</source>
+ <source>../../ArjunaJTA/tsmx/bin</source>
+ <source>bin</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>tsmx-tools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>jta</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>jts</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: labs/jbosstm/trunk/narayana-build-common/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-build-common/pom.xml 2011-02-23 16:18:07 UTC (rev 36675)
+++ labs/jbosstm/trunk/narayana-build-common/pom.xml 2011-02-24 10:44:24 UTC (rev 36676)
@@ -324,6 +324,11 @@
<artifactId>jbossjts-integration</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>tsmx-jts-objectstorebrowser</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
More information about the jboss-svn-commits
mailing list