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

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

Author: dimitris at jboss.org
Date: 2006-12-17 06:39:17 -0500 (Sun, 17 Dec 2006)
New Revision: 59068

Modified:
   branches/Branch_4_2/build/build-distr.xml
   branches/Branch_4_2/build/build-thirdparty.xml
Log:
JBAS-3892, revert to JBossTM until we decide whether JBossTS will be used and which version of it

Modified: branches/Branch_4_2/build/build-distr.xml
===================================================================
--- branches/Branch_4_2/build/build-distr.xml	2006-12-17 11:38:45 UTC (rev 59067)
+++ branches/Branch_4_2/build/build-distr.xml	2006-12-17 11:39:17 UTC (rev 59068)
@@ -1104,7 +1104,7 @@
       </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/">
         <include name="jbossjta.jar"/>
@@ -1113,7 +1113,7 @@
       </fileset>
     </copy>
     <copy todir="${install.all.conf}" filtering="no" file="${project.thirdparty}/jboss/jbossts/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	2006-12-17 11:38:45 UTC (rev 59067)
+++ branches/Branch_4_2/build/build-thirdparty.xml	2006-12-17 11:39:17 UTC (rev 59068)
@@ -60,7 +60,7 @@
       <componentref name="apache-fileupload" version="1.0"/>
       <componentref name="apache-httpclient" version="2.0.2"/>
       <componentref name="apache-jaxme" version="0.2-cvs"/>
-      <componentref name="apache-log4j" version="1.2.8"/>
+      <componentref name="apache-log4j" version="1.2.14"/>
       <componentref name="apache-logging" version="1.0.5.GA-jboss"/>
       <componentref name="apache-myfaces" version="1.1.4"/>
       <componentref name="apache-pool" version="1.0.1"/>
@@ -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/jbossts" version="4.2.2.GA"/>-->
       <componentref name="jboss/jbossws" version="1.0.4.GA"/>
       <componentref name="jboss/jbossws14" version="1.0.4.GA"/>
       <componentref name="jboss/jboss-ws4ee" version="4.0.4.SP1"/>