[jboss-cvs] JBossAS SVN: r83626 - in branches/Branch_5_x: component-matrix and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 29 12:19:16 EST 2009
Author: jhalliday
Date: 2009-01-29 12:19:16 -0500 (Thu, 29 Jan 2009)
New Revision: 83626
Added:
branches/Branch_5_x/jbossas/transactions/
Removed:
branches/Branch_5_x/jbossas/jts/
Modified:
branches/Branch_5_x/build/build-distr.xml
branches/Branch_5_x/build/build.xml
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/jbossas/transactions/build.xml
branches/Branch_5_x/thirdparty/pom.xml
Log:
Update JBossTS component to 4.6.0.CR1 for new JTS and XTS. JBAS-6433
Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml 2009-01-29 17:09:53 UTC (rev 83625)
+++ branches/Branch_5_x/build/build-distr.xml 2009-01-29 17:19:16 UTC (rev 83626)
@@ -2174,34 +2174,44 @@
</patternset>
</unzip>
- <!-- copy binary release of JBossTS (JTA part) from thirdparty repo -->
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
- <include name="jbossjta.jar"/>
- <include name="jbossjta-integration.jar"/>
- <include name="jbossts-common.jar"/>
- </fileset>
- </copy>
- <copy todir="${install.all.conf}" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjta-properties.xml"/>
- <!-- copy binary release of JBossTS (JTS part) from thirdparty repo -->
- <mkdir dir="${install.examples}/jts"/>
- <copy todir="${install.examples}/jts" filtering="no">
- <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
- <include name="jbossjts.jar"/>
- <include name="jbossjts-integration.jar"/>
- <include name="jbossjts-jacorb.jar"/>
- <include name="jbossts-tools.sar"/>
- </fileset>
- </copy>
- <copy todir="${install.examples}/jts" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjts-properties.xml"/>
- <!-- copy JBossTS JTS install script and instructions from jbossas/jts module -->
- <copy todir="${install.examples}/jts" filtering="no">
- <fileset dir="${project.root}/jbossas/jts">
- <include name="README.txt"/>
- <include name="build.xml"/>
- </fileset>
- </copy>
+ <!-- copy binary release of JBossTS (JTS libs are a superset of the JTA ones) from thirdparty repo -->
+ <copy todir="${install.all.lib}" filtering="no">
+ <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
+ <include name="jbossjts.jar"/>
+ <include name="jbossjts-integration.jar"/>
+ <include name="jbossjts-jacorb.jar"/>
+ <include name="jbossts-common.jar"/>
+ </fileset>
+ </copy>
+ <!-- in in JTS mode the client needs some impl classes to make ClientUserTransaction work -->
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
+ <include name="jbossjts.jar"/>
+ <include name="jbossjts-integration.jar"/>
+ </fileset>
+ </copy>
+ <!-- install the JTA version of the config file as the default -->
+ <copy tofile="${install.all.conf}/jbossts-properties.xml"
+ filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossts-properties.xml-forJTA"/>
+ <!-- copy optional JBossTS binaries from thirdparty repo -->
+ <mkdir dir="${install.examples}/transactions"/>
+ <copy todir="${install.examples}/transactions" filtering="no">
+ <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
+ <include name="jbossts-tools.sar"/>
+ <include name="jbossxts.sar"/>
+ </fileset>
+ </copy>
+ <copy tofile="${install.examples}/transactions/jbossts-properties.xml"
+ filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossts-properties.xml-forJTS"/>
+ <!-- copy JBossTS JTS install script and instructions from jbossas/jts module -->
+ <copy todir="${install.examples}/transactions" filtering="no">
+ <fileset dir="${project.root}/jbossas/transactions">
+ <include name="README.txt"/>
+ <include name="build.xml"/>
+ </fileset>
+ </copy>
+
<chmod perm="+x">
<fileset dir="${install.bin}">
<include name="*.sh"/>
Modified: branches/Branch_5_x/build/build.xml
===================================================================
--- branches/Branch_5_x/build/build.xml 2009-01-29 17:09:53 UTC (rev 83625)
+++ branches/Branch_5_x/build/build.xml 2009-01-29 17:19:16 UTC (rev 83626)
@@ -925,6 +925,8 @@
<include name="jboss-deployers-core-spi.jar"/>
<include name="jboss-deployers-client.jar"/>
<include name="jboss-deployers-client-spi.jar"/>
+ <include name="jbossjts.jar"/>
+ <include name="jbossjts-integration.jar"/>
<!-- client excludes -->
<exclude name="jbossws-native-client.jar"/>
<exclude name="${jbossall.client.filename}"/>
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-01-29 17:09:53 UTC (rev 83625)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-01-29 17:19:16 UTC (rev 83626)
@@ -30,7 +30,7 @@
<properties>
<version.junit>3.8.2</version.junit>
<version.jacorb>2.3.0jboss.patch5-brew</version.jacorb>
- <version.jboss.jbossts>4.4.0.GA</version.jboss.jbossts>
+ <version.jboss.jbossts>4.6.0.CR1</version.jboss.jbossts>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.jaxr>1.2.1.GA</version.jboss.jaxr>
<version.jboss.jbossws>3.1.0.CR1</version.jboss.jbossws>
@@ -740,13 +740,13 @@
<dependency>
<groupId>jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
+ <artifactId>jbossjts</artifactId>
<version>${version.jboss.jbossts}</version>
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
- <artifactId>jbossjta-integration</artifactId>
+ <artifactId>jbossjts-integration</artifactId>
<version>${version.jboss.jbossts}</version>
</dependency>
@@ -758,36 +758,31 @@
<dependency>
<groupId>jboss.jbossts</groupId>
- <artifactId>jbossjts</artifactId>
+ <artifactId>jbossjts-jacorb</artifactId>
<version>${version.jboss.jbossts}</version>
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
- <artifactId>jbossjts-integration</artifactId>
+ <artifactId>jbossts-tools</artifactId>
<version>${version.jboss.jbossts}</version>
+ <type>jboss-sar</type>
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
- <artifactId>jbossjts-jacorb</artifactId>
+ <artifactId>resources</artifactId>
<version>${version.jboss.jbossts}</version>
</dependency>
-
+
<dependency>
<groupId>jboss.jbossts</groupId>
- <artifactId>jbossts-tools</artifactId>
+ <artifactId>jbossxts</artifactId>
<version>${version.jboss.jbossts}</version>
<type>jboss-sar</type>
</dependency>
<dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>resources</artifactId>
- <version>${version.jboss.jbossts}</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
<version>${version.jboss.jbossws}</version>
Copied: branches/Branch_5_x/jbossas/transactions (from rev 83403, branches/Branch_5_x/jbossas/jts)
Modified: branches/Branch_5_x/jbossas/transactions/build.xml
===================================================================
--- branches/Branch_5_x/jbossas/jts/build.xml 2009-01-25 13:14:28 UTC (rev 83403)
+++ branches/Branch_5_x/jbossas/transactions/build.xml 2009-01-29 17:19:16 UTC (rev 83626)
@@ -26,40 +26,18 @@
-->
<project name="jts-install" default="install" basedir=".">
- <property name="common.lib.dir" value="../../../common/lib"/>
-
<!-- Select which server the JTS will install into. Must have an ORB configured.
- Path relative to our location (docs/examples/jts) -->
+ Path relative to our location (docs/examples/transactions) -->
<property name="jts.server.dir" value="../../../server/all"/>
- <!-- Select servers which will continue to use the default JTA -->
- <property name="jta.server.dir.1" value="../../../server/default"/>
- <property name="jta.server.dir.2" value="../../../server/web"/>
-
-
<target name="install">
- <!-- install the JTA to the servers that still need it -->
- <copy todir="${jta.server.dir.1}/lib/">
- <fileset dir="${common.lib.dir}" includes="jbossjta*.jar"/>
- </copy>
- <copy todir="${jta.server.dir.2}/lib/">
- <fileset dir="${common.lib.dir}" includes="jbossjta*.jar"/>
- </copy>
-
- <!-- back out the common JTA, it does not cohabit well with the JTS -->
- <delete file="${common.lib.dir}/jbossjta.jar"/>
- <delete file="${common.lib.dir}/jbossjta-integration.jar"/>
-
<!-- rename the JTA properties file rather than deleting it,
as it may have customizations we don't want to lose. -->
- <move file="${jts.server.dir}/conf/jbossjta-properties.xml" tofile="${jts.server.dir}/conf/jbossjta-properties-old.xml"/>
+ <move file="${jts.server.dir}/conf/jbossts-properties.xml"
+ tofile="${jts.server.dir}/conf/jbossts-properties-old-for-jta.xml"/>
- <!-- drop in the JTS components -->
- <copy file="jbossjts.jar" todir="${jts.server.dir}/lib/"/>
- <copy file="jbossjts-integration.jar" todir="${jts.server.dir}/lib/"/>
- <copy file="jbossjts-jacorb.jar" todir="${jts.server.dir}/lib/"/>
- <copy file="jbossjts-properties.xml" todir="${jts.server.dir}/conf/"/>
+ <copy file="jbossts-properties.xml" todir="${jts.server.dir}/conf/"/>
<echo message="Transaction service libraries and configuration installed."/>
@@ -72,16 +50,15 @@
</target>
-
-
<target name="modify-config-files">
+
<!--
edit the conf/jbossjts-properties.xml file and remove the
recovery extension property containing the value
"com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"
-->
<replaceregexp
- file="${server.dir}/conf/jbossjts-properties.xml"
+ file="${server.dir}/conf/jbossts-properties.xml"
match="<property\s+name=.com\.arjuna\.ats\.arjuna\.recovery\.recoveryExtension\d+.\s*value=.com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule.\s*/>"
replace="" />
Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml 2009-01-29 17:09:53 UTC (rev 83625)
+++ branches/Branch_5_x/thirdparty/pom.xml 2009-01-29 17:19:16 UTC (rev 83626)
@@ -1242,14 +1242,6 @@
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjta-integration</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
<artifactId>jbossts-common</artifactId>
</dependency>
<dependency>
@@ -1274,6 +1266,11 @@
<artifactId>resources</artifactId>
</dependency>
<dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossxts</artifactId>
+ <type>jboss-sar</type>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-saaj</artifactId>
</dependency>
More information about the jboss-cvs-commits
mailing list