[jboss-svn-commits] JBL Code SVN: r37395 - in labs/jbosstm/trunk: ArjunaCore/scripts and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Aug 12 07:02:29 EDT 2011
Author: tomjenkinson
Date: 2011-08-12 07:02:29 -0400 (Fri, 12 Aug 2011)
New Revision: 37395
Modified:
labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.bat
labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.sh
labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.bat
labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.sh
labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml
labs/jbosstm/trunk/build-release-pkgs.xml
labs/jbosstm/trunk/narayana-full/pom.xml
labs/jbosstm/trunk/narayana-full/readme.txt
labs/jbosstm/trunk/narayana-full/src/main/assembly/bin.xml
labs/jbosstm/trunk/pom.xml
labs/jbosstm/trunk/qa/build.xml
labs/jbosstm/trunk/txbridge/pom.xml
Log:
updated to move the documentation to be consistent names and to put the jars in seperate folders
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.bat 2011-08-12 09:31:48 UTC (rev 37394)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.bat 2011-08-12 11:02:29 UTC (rev 37395)
@@ -35,7 +35,7 @@
echo Setting up environment
-set PRODUCT_CLASSPATH=%NARAYANA_HOME%\lib\narayana-jta.jar
+set PRODUCT_CLASSPATH=%NARAYANA_HOME%\lib\jta\narayana-jta.jar
set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%NARAYANA_HOME%\etc\
setlocal ENABLEDELAYEDEXPANSION
@@ -45,8 +45,6 @@
set CLASSPATH=.;%PRODUCT_CLASSPATH%;%EXT_CLASSPATH%
-echo You MUST ensure you have renamed the files NARAYANA_HOME\lib\narayana-jta* to remove the .jta suffix
-
goto end
:java_home_error
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.sh 2011-08-12 09:31:48 UTC (rev 37394)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.sh 2011-08-12 11:02:29 UTC (rev 37395)
@@ -60,7 +60,7 @@
echo Setting up environment
-PRODUCT_CLASSPATH="$NARAYANA_HOME/lib/narayana-jta.jar"
+PRODUCT_CLASSPATH="$NARAYANA_HOME/lib/jta/narayana-jta.jar"
PRODUCT_CLASSPATH="$PRODUCT_CLASSPATH$CPS$NARAYANA_HOME/etc/"
for i in $NARAYANA_HOME/lib/ext/*.jar
@@ -71,6 +71,4 @@
CLASSPATH=".$CPS$PRODUCT_CLASSPATH$CPS$EXT_CLASSPATH"
export CLASSPATH
-echo You MUST ensure you have renamed the files NARAYANA_HOME/lib/narayana-jta* to remove the .jta suffix
-
fi
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.bat 2011-08-12 09:31:48 UTC (rev 37394)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.bat 2011-08-12 11:02:29 UTC (rev 37395)
@@ -37,7 +37,7 @@
echo Setting up environment
-set PRODUCT_CLASSPATH=%NARAYANA_HOME%\lib\narayana-jts.jar
+set PRODUCT_CLASSPATH=%NARAYANA_HOME%\lib\jts\narayana-jts.jar
set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%NARAYANA_HOME%\etc\
setlocal ENABLEDELAYEDEXPANSION
@@ -55,8 +55,6 @@
set CLASSPATH=.;%PRODUCT_CLASSPATH%;%EXT_CLASSPATH%;%JACORB_CLASSPATH%
-echo You MUST ensure you have renamed the files NARAYANA_HOME\lib\narayana-jts* to remove the .jts suffix
-
goto end
:java_home_error
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.sh 2011-08-12 09:31:48 UTC (rev 37394)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.sh 2011-08-12 11:02:29 UTC (rev 37395)
@@ -67,7 +67,7 @@
echo Setting up environment
-PRODUCT_CLASSPATH="$NARAYANA_HOME/lib/narayana-jts.jar"
+PRODUCT_CLASSPATH="$NARAYANA_HOME/lib/jts/narayana-jts.jar"
PRODUCT_CLASSPATH="$PRODUCT_CLASSPATH$CPS$NARAYANA_HOME/etc/"
@@ -85,6 +85,4 @@
CLASSPATH=".$CPS$PRODUCT_CLASSPATH$CPS$EXT_CLASSPATH$CPS$JACORB_CLASSPATH"
export CLASSPATH
-echo You MUST ensure you have renamed the files NARAYANA_HOME/lib/narayana-jts* to remove the .jts suffix
-
fi
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml 2011-08-12 09:31:48 UTC (rev 37394)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/pom.xml 2011-08-12 11:02:29 UTC (rev 37395)
@@ -86,12 +86,14 @@
<dependency>
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<!-- JCA API -->
<groupId>org.jboss.ironjacamar</groupId>
<artifactId>ironjacamar-spec-api</artifactId>
<version>1.0.0.Beta5</version>
+ <scope>provided</scope>
<!-- TODO AS7 -->
</dependency>
<dependency>
Modified: labs/jbosstm/trunk/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/trunk/build-release-pkgs.xml 2011-08-12 09:31:48 UTC (rev 37394)
+++ labs/jbosstm/trunk/build-release-pkgs.xml 2011-08-12 11:02:29 UTC (rev 37395)
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
<!--
JBoss, Home of Professional Open Source
Copyright 2009, Red Hat Middleware LLC, and individual contributors
@@ -183,9 +182,10 @@
</fileset>
</copy>
<copy file="${workdir}/${tag}/rhq-plugin/target/jbossts-jopr-plugin-5.0.0.M1-SNAPSHOT-javadoc.jar" todir="tmp-downloads-dir/api/admin"/>
- <copy file="${workdir}/${tag}/ArjunaJTS/narayana-jts/target/narayana-jts-5.0.0.M1-SNAPSHOT-javadoc.jar" todir="tmp-downloads-dir/api/JTA"/>
- <copy file="${workdir}/${tag}/ArjunaJTA/narayana-jta/target/narayana-jta-5.0.0.M1-SNAPSHOT-javadoc.jar" todir="tmp-downloads-dir/api/JTS"/>
- <copy file="${workdir}/${tag}/XTS/jbossxts/target/jbossxts-5.0.0.M1-SNAPSHOT-javadoc.jar" todir="tmp-downloads-dir/api/XTS"/>
+ <copy file="${workdir}/${tag}/ArjunaJTS/narayana-jts/target/narayana-jts-5.0.0.M1-SNAPSHOT-javadoc.jar" todir="tmp-downloads-dir/api/jta"/>
+ <copy file="${workdir}/${tag}/ArjunaJTA/narayana-jta/target/narayana-jta-5.0.0.M1-SNAPSHOT-javadoc.jar" todir="tmp-downloads-dir/api/jts"/>
+ <copy file="${workdir}/${tag}/rest-tx/tx/target/rest-tx-api-5.0.0.M1-SNAPSHOT-javadoc.jar" todir="tmp-downloads-dir/api/rts"/>
+ <copy file="${workdir}/${tag}/XTS/jbossxts/target/jbossxts-5.0.0.M1-SNAPSHOT-javadoc.jar" todir="tmp-downloads-dir/api/xts"/>
<copy todir="tmp-docs-dir/guides/narayana-jts-orbportability">
<fileset dir="${workdir}/${tag}/ArjunaJTS/docs/orbportability/target/docbook/publish/en-US/html"/>
</copy>
@@ -235,9 +235,10 @@
<fileset dir="${workdir}/${tag}/docs/txbridge_guide/target/docbook/publish/en-US/html"/>
</copy>
<unzip src="${workdir}/${tag}/rhq-plugin/target/jbossts-jopr-plugin-5.0.0.M1-SNAPSHOT-javadoc.jar" dest="tmp-docs-dir/api/admin"/>
- <unzip src="${workdir}/${tag}/ArjunaJTS/narayana-jts/target/narayana-jts-5.0.0.M1-SNAPSHOT-javadoc.jar" dest="tmp-docs-dir/api/JTA"/>
- <unzip src="${workdir}/${tag}/ArjunaJTA/narayana-jta/target/narayana-jta-5.0.0.M1-SNAPSHOT-javadoc.jar" dest="tmp-docs-dir/api/JTS"/>
- <unzip src="${workdir}/${tag}/XTS/jbossxts/target/jbossxts-5.0.0.M1-SNAPSHOT-javadoc.jar" dest="tmp-docs-dir/api/XTS"/>
+ <unzip src="${workdir}/${tag}/ArjunaJTS/narayana-jts/target/narayana-jts-5.0.0.M1-SNAPSHOT-javadoc.jar" dest="tmp-docs-dir/api/jta"/>
+ <unzip src="${workdir}/${tag}/ArjunaJTA/narayana-jta/target/narayana-jta-5.0.0.M1-SNAPSHOT-javadoc.jar" dest="tmp-docs-dir/api/jts"/>
+ <unzip src="${workdir}/${tag}/rest-tx/tx/target/rest-tx-api-5.0.0.M1-SNAPSHOT-javadoc.jar" dest="tmp-docs-dir/api/rts"/>
+ <unzip src="${workdir}/${tag}/XTS/jbossxts/target/jbossxts-5.0.0.M1-SNAPSHOT-javadoc.jar" dest="tmp-docs-dir/api/xts"/>
<move todir="${downloads.dir}/${version}" verbose="true">
<fileset dir="tmp-downloads-dir"/>
</move>
Modified: labs/jbosstm/trunk/narayana-full/pom.xml
===================================================================
--- labs/jbosstm/trunk/narayana-full/pom.xml 2011-08-12 09:31:48 UTC (rev 37394)
+++ labs/jbosstm/trunk/narayana-full/pom.xml 2011-08-12 11:02:29 UTC (rev 37395)
@@ -115,6 +115,15 @@
<type>war</type>
</dependency>
<dependency>
+ <groupId>org.jboss.narayana.rts</groupId>
+ <artifactId>rest-tx-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.rts</groupId>
+ <artifactId>rest-tx-api</artifactId>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
<groupId>org.jboss.narayana.xts</groupId>
<artifactId>jbossxts</artifactId>
<classifier>api</classifier>
Modified: labs/jbosstm/trunk/narayana-full/readme.txt
===================================================================
--- labs/jbosstm/trunk/narayana-full/readme.txt 2011-08-12 09:31:48 UTC (rev 37394)
+++ labs/jbosstm/trunk/narayana-full/readme.txt 2011-08-12 11:02:29 UTC (rev 37395)
@@ -5,7 +5,7 @@
JTS and XTS are not currently available in AS7.
Integration with JBossAS 6 or earlier is no longer supported.
-This version of Narayana contains a JTA/JTS/XTS and RTS. If you want to use either JTA/JTS or XTS standalone, you should follow the instructions below where the scripts to execute are detailed and the files you MUST rename are defined.
+This version of Narayana contains a JTA/JTS/XTS and RTS. You should never include both lib/jts/*.jar and lib/jta/*.jar as they will conflict with each other.
WHATS INCLUDED
--------------
@@ -20,9 +20,9 @@
api - The various project components javadocs
guides - PDF versions of the projects documentation
idl - The IDL files for integration with the JTS
- JTS/
+ jts/
trailmap - A trailmap for the project
- XTS/
+ xts/
demo - A trailmap for the project
etc/
@@ -33,10 +33,11 @@
lib/
ext/ - All the dependencies required to run Narayana JTA/JTS/XTS
- jbosstxbridge.jar.txbridge - After removing the .txbridge suffix, deploy this into a server running JTA and XTS to enable transactional bridging
- jbossxts*.jar.xts - Remove the .xts suffix and deploy into a server to enable XTS, more details are available in the XTS guide.
- narayana-jta*.jar.jta - Remove the .jta suffix to enable Narayana JTA
- narayana-jts*.jar.jts - Remove the .jts suffix to enable Narayana JTS
+ txbridge/jbosstxbridge.jar - After removing the .txbridge suffix, deploy this into a server running JTA and XTS to enable transactional bridging
+ xts/jbossxts*.jar - More details are available in the XTS guide.
+ jta/narayana-jta*.jar - See below for usage information
+ jts/narayana-jts*.jar - See below for usage information
+ rts/rest-tx-api.jar
quickstarts/
Some examples to get you up and running quickly
@@ -55,32 +56,40 @@
ENABLING JTA
------------
To enable JTA you MUST:
-1. Rename lib/narayana-jta.jar.jta to lib/narayana-jta.jar
-2. If you need to use this version of JTA in an application server, you should also rename lib/narayana-jta-integration.jar.jta to lib/narayana-jta-integration.jar, however, note the comment above regarding manual upgrading of the component inside JBossAS is not recommended
+1. Include lib/ext/*.jar and lib/jta/narayana-jta.jar
+2. If you need to use this version of JTA in an application server, you should also include lib/jta/narayana-jta-integration.jar, however, note the comment above regarding manual upgrading of the component inside JBossAS is not recommended
3. Execute jta-setup-env.[bat|sh] to put JTA in the classpath
ENABLING JTS
------------
-To enable JTA you MUST:
-1. Rename lib/narayana-jts.jar.jts to lib/narayana-jts.jar
-2. If you need to use this version of JTS in an application server, you should also rename lib/narayana-jts-integration.jar.jts to lib/narayana-jts-integration.jar, however, note the comment above regarding manual upgrading of the component inside JBossAS is not recommended
+To enable JTS you MUST:
+1. Include lib/ext/*.jar and lib/jts/narayana-jts.jar
+2. If you need to use this version of JTS in an application server, you should also include lib/jts/narayana-jts-integration.jar, however, note the comment above regarding manual upgrading of the component inside JBossAS is not recommended
3. Execute jta-setup-env.[bat|sh] to put JTA in the classpath
ENABLING XTS
------------
-Please read the XTS guide for details on this, you will need to rename the following files:
-1. jbossxts.jar.xts to jbossxts.jar
-2. jbossxts-api.jar.xts to jbossxts-api.jar
+Please read the XTS guide for details on this, you will need to include the following files:
+1. lib/ext/*.jar
+2. lib/xts/jbossxts.jar
+3. lib/xts/jbossxts-api.jar
ENABLING TXBRIDGE
-----------------
-Please read the txbridge guide for details on this, you will need to rename the following file:
-1. jbosstxbridge.jar.txbridge to jbosstxbridge.jar
+Please read the txbridge guide for details on this, you will need to include the following file:
+1. lib/txbridge/jbosstxbridge.jar
+
+ ENABLING REST-TX API
+ --------------------
+Please read the txbridge guide for details on this, you will need to include the following file:
+1. lib/rts/rest-tx-api.jar
+
+
EMBEDDED TOOLS
--------------
JMX Instrumentation
Modified: labs/jbosstm/trunk/narayana-full/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/narayana-full/src/main/assembly/bin.xml 2011-08-12 09:31:48 UTC (rev 37394)
+++ labs/jbosstm/trunk/narayana-full/src/main/assembly/bin.xml 2011-08-12 11:02:29 UTC (rev 37395)
@@ -38,7 +38,7 @@
<includes>
<include>org.jboss.narayana.xts:xts-demo</include>
</includes>
- <outputDirectory>docs/XTS/demo</outputDirectory>
+ <outputDirectory>docs/xts/demo</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
<unpack>true</unpack>
<unpackOptions>
@@ -52,62 +52,52 @@
<includes>
<include>org.jboss.narayana.xts:jbossxts:*javadoc*</include>
</includes>
- <outputDirectory>docs/api/XTS</outputDirectory>
+ <outputDirectory>docs/api/xts</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
<unpack>true</unpack>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
-<!-- NO LONGER INCLUDING XTS TESTS IN THE BINARY
<dependencySet>
<includes>
- <include>org.jboss.narayana.xts:localjunit</include>
+ <include>org.jboss.narayana.xts:jbossxts:jar:api</include>
</includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <outputDirectory>XTS/interop-tests</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>lib/xts</outputDirectory>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<includes>
- <include>org.jboss.narayana.xts:localjunit</include>
+ <include>org.jboss.narayana.xts:jbossxts:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <outputDirectory>XTS/tests</outputDirectory>
+ <outputDirectory>lib/xts</outputDirectory>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
- <dependencySet>
+ <dependencySet>
<includes>
- <include>org.jboss.narayana.xts:xts-test-servlet</include>
+ <include>org.jboss.narayana.rts:rest-tx-api:*javadoc*</include>
</includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <outputDirectory>XTS/tests</outputDirectory>
- <unpack>false</unpack>
- <useTransitiveDependencies>false</useTransitiveDependencies>
+ <outputDirectory>docs/api/rts</outputDirectory>
+ <useProjectAttachments>true</useProjectAttachments>
+ <unpack>true</unpack>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
- -->
<dependencySet>
- <includes>
- <include>org.jboss.narayana.xts:jbossxts:jar:api</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}.xts</outputFileNameMapping>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <useTransitiveDependencies>false</useTransitiveDependencies>
<useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
- <dependencySet>
<includes>
- <include>org.jboss.narayana.xts:jbossxts:jar</include>
+ <include>org.jboss.narayana.rts:rest-tx-api</include>
</includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}.xts</outputFileNameMapping>
- <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <exclude>*:javadoc</exclude>
+ </excludes>
+ <outputDirectory>lib/rts</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+ </outputFileNameMapping>
<unpack>false</unpack>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<includes>
@@ -149,7 +139,7 @@
<includes>
<include>org.jboss.narayana.jts:trailmap</include>
</includes>
- <outputDirectory>docs/JTS/trailmap</outputDirectory>
+ <outputDirectory>docs/jts/trailmap</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
<unpack>true</unpack>
<unpackOptions>
@@ -179,7 +169,7 @@
<includes>
<include>org.jboss.narayana.jts:narayana-jts:*:javadoc</include>
</includes>
- <outputDirectory>docs/api/JTS</outputDirectory>
+ <outputDirectory>docs/api/jts</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
<unpack>true</unpack>
</dependencySet>
@@ -191,8 +181,8 @@
<excludes>
<exclude>*:javadoc</exclude>
</excludes>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}.jts
+ <outputDirectory>lib/jts</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
</outputFileNameMapping>
<unpack>false</unpack>
</dependencySet>
@@ -201,8 +191,8 @@
<includes>
<include>org.jboss.narayana.jts:narayana-jts-integration</include>
</includes>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}.jts
+ <outputDirectory>lib/jts</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
</outputFileNameMapping>
<unpack>false</unpack>
</dependencySet>
@@ -211,7 +201,7 @@
<includes>
<include>org.jboss.narayana.jta:narayana-jta:*:javadoc</include>
</includes>
- <outputDirectory>docs/api/JTA</outputDirectory>
+ <outputDirectory>docs/api/jta</outputDirectory>
<useProjectAttachments>true</useProjectAttachments>
<unpack>true</unpack>
</dependencySet>
@@ -223,8 +213,8 @@
<excludes>
<exclude>*:javadoc</exclude>
</excludes>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}.jta
+ <outputDirectory>lib/jta</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
</outputFileNameMapping>
<unpack>false</unpack>
</dependencySet>
@@ -233,8 +223,8 @@
<includes>
<include>org.jboss.narayana.jta:narayana-jta-integration</include>
</includes>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}.jta
+ <outputDirectory>lib/jta</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
</outputFileNameMapping>
<unpack>false</unpack>
</dependencySet>
@@ -243,8 +233,8 @@
<includes>
<include>org.jboss.narayana:jbosstxbridge</include>
</includes>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}.txbridge
+ <outputDirectory>lib/txbridge</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
</outputFileNameMapping>
<unpack>false</unpack>
</dependencySet>
@@ -311,13 +301,13 @@
<source>../ArjunaJTA/narayana-jta/src/main/resources/jbossts-properties.xml</source>
<fileMode>0644</fileMode>
<outputDirectory>etc</outputDirectory>
- <destName>jbossts-properties.xml.jta</destName>
+ <destName>default-jta-jbossts-properties.xml</destName>
</file>
<file>
<source>../ArjunaJTS/narayana-jts/src/main/resources/jbossts-properties.xml</source>
<fileMode>0644</fileMode>
<outputDirectory>etc</outputDirectory>
- <destName>jbossts-properties.xml.jts</destName>
+ <destName>default-jts-jbossts-properties.xml</destName>
</file>
<file>
<source>../XTS/third_party_licenses.txt</source>
@@ -325,19 +315,6 @@
<outputDirectory>lib/ext</outputDirectory>
<destName>xts_third_party_licenses.txt</destName>
</file>
-
- <!--
- <file>
- <source>../XTS/localjunit/run-tests.xml</source>
- <fileMode>0644</fileMode>
- <outputDirectory>XTS/tests</outputDirectory>
- </file>
- <file>
- <source>../XTS/localjunit/run-interop-tests.xml</source>
- <fileMode>0644</fileMode>
- <outputDirectory>XTS/interop-tests</outputDirectory>
- </file>
- -->
</files>
<fileSets>
<fileSet>
Modified: labs/jbosstm/trunk/pom.xml
===================================================================
--- labs/jbosstm/trunk/pom.xml 2011-08-12 09:31:48 UTC (rev 37394)
+++ labs/jbosstm/trunk/pom.xml 2011-08-12 11:02:29 UTC (rev 37395)
@@ -686,6 +686,17 @@
<type>war</type>
</dependency>
<dependency>
+ <groupId>org.jboss.narayana.rts</groupId>
+ <artifactId>rest-tx-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.narayana.rts</groupId>
+ <artifactId>rest-tx-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
<groupId>org.jboss.narayana</groupId>
<artifactId>jbosstxbridge</artifactId>
<version>${project.version}</version>
Modified: labs/jbosstm/trunk/qa/build.xml
===================================================================
--- labs/jbosstm/trunk/qa/build.xml 2011-08-12 09:31:48 UTC (rev 37394)
+++ labs/jbosstm/trunk/qa/build.xml 2011-08-12 11:02:29 UTC (rev 37395)
@@ -91,10 +91,10 @@
<antcall target="init-jts"/>
</target>
<target name="init-jta" unless="init-jts">
- <move file="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jta.jar.jta" tofile="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jta.jar"/>
+ <copy file="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/jta/narayana-jta.jar" tofile="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jta.jar"/>
</target>
<target name="init-jts" if="init-jts">
- <move file="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jts.jar.jta" tofile="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jts.jar"/>
+ <copy file="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/jts/narayana-jts.jar" tofile="${org.jboss.jbossts.qa.ts.home}/narayana-full-${narayana.version}/lib/narayana-jts.jar"/>
</target>
<target name="dist" depends="clean, init, buildtype">
<!-- build the test suite -->
Modified: labs/jbosstm/trunk/txbridge/pom.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/pom.xml 2011-08-12 09:31:48 UTC (rev 37394)
+++ labs/jbosstm/trunk/txbridge/pom.xml 2011-08-12 11:02:29 UTC (rev 37395)
@@ -71,13 +71,14 @@
<dependency>
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<!-- JCA API -->
<groupId>org.jboss.ironjacamar</groupId>
<artifactId>ironjacamar-spec-api</artifactId>
<version>1.0.0.Beta5</version>
- <!-- TODO AS7 -->
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.narayana.xts</groupId>
More information about the jboss-svn-commits
mailing list