[jboss-cvs] JBossAS SVN: r59373 - branches/Branch_4_2/build

[jboss-cvs-commits at lists.jboss.org]

Author: dimitris at jboss.org
Date: 2007-01-05 06:22:24 -0500 (Fri, 05 Jan 2007)
New Revision: 59373

Modified:
   branches/Branch_4_2/build/build-distr.xml
   branches/Branch_4_2/build/build-thirdparty.xml
Log:
JBAS-3892, Replace TxManager with JBoss Transactions 4.2.3.CR2

Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml	2007-01-05 11:22:04 UTC (rev 59372)
+++ branches/Branch_4_2/build/build-distr.xml	2007-01-05 11:22:24 UTC (rev 59373)
@@ -1104,16 +1104,16 @@
       </fileset>
     </copy>
 
-    <!-- copy binary release of JBossTS from thirdparty repo
+    <!-- copy binary release of JBossTS from thirdparty repo -->
     <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
+      <fileset dir="${jboss.jbossts14.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 todir="${install.all.conf}" filtering="no" file="${jboss.jbossts14.resources}/jbossjta-properties.xml"/>
+
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">

Modified: branches/Branch_4_2/build/build-thirdparty.xml
===================================================================
--- branches/Branch_4_2/build/build-thirdparty.xml	2007-01-05 11:22:04 UTC (rev 59372)
+++ branches/Branch_4_2/build/build-thirdparty.xml	2007-01-05 11:22:24 UTC (rev 59373)
@@ -91,7 +91,7 @@
     <componentref name="jboss/common" version="1.0.0.GA"/>
     <componentref name="jboss/dom4j-jarjar" version="1.6.1"/>
     <componentref name="jboss/jbossretro-rt" version="1.0.4.GA"/>
-    <!--<componentref name="jboss/jbossts" version="4.2.2.GA"/>-->
+    <componentref name="jboss/jbossts14" version="4.2.3.CR2"/>
     <componentref name="jboss/jbossws" version="1.2.0.CR1"/>
     <componentref name="jboss/jbossxb" version="snapshot"/>
     <componentref name="jboss/microcontainer" version="1.0.2"/>