--- build.xml.orig	2009-08-14 14:30:43.000000000 -0400
+++ build.xml	2009-08-14 14:32:38.000000000 -0400
@@ -76,29 +76,29 @@
    </target>
 
    <target name="jts">
-      <runant target="run_jts"/>
+      <ant target="run_jts"/>
    </target>
 
    <target name="jta">
-      <runant target="run_jta"/>
+      <ant target="run_jta"/>
    </target>
 
    <target name="core">
-      <runant target="run_core"/>
+      <ant target="run_core"/>
    </target>
 
    <target name="jbossjts">
-      <runant target="run_jbossjts"/>
-      <runant target="install_jboss_tools"/>
+      <ant target="run_jbossjts"/>
+      <ant target="install_jboss_tools"/>
    </target>
 
    <target name="jbossjta">
-      <runant target="run_jbossjta"/>
-      <runant target="install_jboss_tools"/>
+      <ant target="run_jbossjta"/>
+      <ant target="install_jboss_tools"/>
    </target>
 
    <target name="clean">
-      <runant target="run_clean"/>
+      <ant target="run_clean"/>
    </target>
 
    <target name="run_jts" if="jts.present">
--- build-release-pkgs.xml.orig	2009-08-14 14:45:50.000000000 -0400
+++ build-release-pkgs.xml	2009-08-14 14:46:01.000000000 -0400
@@ -71,9 +71,9 @@
     <!-- where to get the source -->
     <property name="svnbase" value="https://svn.jboss.org/repos/labs/labs/jbosstm/tags"/>
     <!-- The tag as it appears under svnbase -->
-    <property name="tag" value="JBOSSTS_4_6_0_GA"/>
+    <property name="tag" value="JBOSSTS_4_6_1_GA_CP03"/>
     <!-- The file name base for the user downloadable files. Derive it from the tag -->
-    <property name="filename" value="4.6.0.GA"/>
+    <property name="filename" value="4.6.1.GA_CP03"/>
     <!-- the location the JBossTS web site content svn is checked out to -->
     <property name="cmsdir" value="/home/jhalli/IdeaProjects/jboss/jbosstm-cms/"/>
     <!-- the location the maven repository svn is checked out to.
@@ -92,12 +92,6 @@
 
     <target name="dist" depends="init" description="build the end-user release bundles (src and binary)">
 
-        <!-- pull the source code from svn -->
-        <exec executable="svn" dir="${workdir}">
-            <arg value="export"/>
-            <arg value="${svnbase}/${tag}"/>
-        </exec>
-
         <!-- package the full source release (all src tree) -->
         <delete file="${workdir}/jbossts-full-${filename}-src.zip"/>
         <zip basedir="${workdir}" destfile="${workdir}/jbossts-full-${filename}-src.zip"
--- build-release-pkgs.xml.orig	2009-08-15 01:26:34.000000000 -0400
+++ build-release-pkgs.xml	2009-08-15 01:27:43.000000000 -0400
@@ -182,7 +182,7 @@
         <delete dir="${workdir}/build/${tag}"/>
         <unzip src="${workdir}/jbossts-full-${filename}.zip" dest="${workdir}/build"/>
 
-        <exec executable="mvn" dir="${workdir}">
+        <exec executable="mvn-jpp" dir="${workdir}">
             <arg value="deploy:deploy-file"/>
             <arg value="-Dfile=${workdir}/build/${tag}/lib/jbossjts.jar"/>
             <arg value="-Dpackaging=jar"/>
@@ -194,7 +194,7 @@
             <arg value="-DgeneratePom=true"/>
         </exec>
 
-        <exec executable="mvn" dir="${workdir}">
+        <exec executable="mvn-jpp" dir="${workdir}">
             <arg value="deploy:deploy-file"/>
             <arg value="-Dfile=${workdir}/build/${tag}/lib/jbossjts-integration.jar"/>
             <arg value="-Dpackaging=jar"/>
@@ -206,7 +206,7 @@
             <arg value="-DgeneratePom=true"/>
         </exec>
 
-        <exec executable="mvn" dir="${workdir}">
+        <exec executable="mvn-jpp" dir="${workdir}">
             <arg value="deploy:deploy-file"/>
             <arg value="-Dfile=${workdir}/build/${tag}/lib/jbossjts-jacorb.jar"/>
             <arg value="-Dpackaging=jar"/>
@@ -218,7 +218,7 @@
             <arg value="-DgeneratePom=true"/>
         </exec>
 
-        <exec executable="mvn" dir="${workdir}">
+        <exec executable="mvn-jpp" dir="${workdir}">
             <arg value="deploy:deploy-file"/>
             <arg value="-Dfile=${workdir}/build/${tag}/lib/ext/jbossts-common.jar"/>
             <arg value="-Dpackaging=jar"/>
@@ -231,7 +231,7 @@
         </exec>
 
         <!-- take the object store browser from jts, it will work with jta too -->
-        <exec executable="mvn" dir="${workdir}">
+        <exec executable="mvn-jpp" dir="${workdir}">
             <arg value="deploy:deploy-file"/>
             <arg value="-Dfile=${workdir}/build/${tag}/bin/jbossts-tools.sar"/>
             <arg value="-Dpackaging=sar"/>
@@ -250,7 +250,7 @@
 
         <jar basedir="${workdir}/build" includes="resources/*" destfile="${workdir}/build/resources.jar"/>
 
-        <exec executable="mvn" dir="${workdir}">
+        <exec executable="mvn-jpp" dir="${workdir}">
             <arg value="deploy:deploy-file"/>
             <arg value="-Dfile=${workdir}/build/resources.jar"/>
             <arg value="-Dpackaging=jar"/>
@@ -264,7 +264,7 @@
 
         <!-- now we do XTS -->
 
-        <exec executable="mvn" dir="${workdir}">
+        <exec executable="mvn-jpp" dir="${workdir}">
             <arg value="deploy:deploy-file"/>
             <arg value="-Dfile=${workdir}/build/${tag}/xts/sar/jbossxts.sar"/>
             <arg value="-Dpackaging=sar"/>
@@ -276,7 +276,7 @@
             <arg value="-DgeneratePom=true"/>
         </exec>
 
-        <exec executable="mvn" dir="${workdir}">
+        <exec executable="mvn-jpp" dir="${workdir}">
             <arg value="deploy:deploy-file"/>
             <arg value="-Dfile=${workdir}/build/${tag}/xts/tests/jbossxts-tests.zip"/>
             <arg value="-Dpackaging=zip"/>
@@ -288,7 +288,7 @@
             <arg value="-DgeneratePom=true"/>
         </exec>
 
-        <exec executable="mvn" dir="${workdir}">
+        <exec executable="mvn-jpp" dir="${workdir}">
             <arg value="deploy:deploy-file"/>
             <arg value="-Dfile=${workdir}/build/${tag}/xts/tests/jbossxts-interop-tests.zip"/>
             <arg value="-Dpackaging=zip"/>