[jboss-svn-commits] JBL Code SVN: r31705 - in labs/jbosstm/trunk: ArjunaCore and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Feb 17 05:10:37 EST 2010
Author: jhalliday
Date: 2010-02-17 05:10:36 -0500 (Wed, 17 Feb 2010)
New Revision: 31705
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
labs/jbosstm/trunk/ArjunaCore/build.xml
labs/jbosstm/trunk/ArjunaCore/tsmx/sar/build.xml
labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
labs/jbosstm/trunk/ArjunaJTS/jts/build.xml
labs/jbosstm/trunk/ArjunaJTS/orbportability/build-anttasks.xml
labs/jbosstm/trunk/ArjunaJTS/orbportability/orbspecific.xml
labs/jbosstm/trunk/build.xml
labs/jbosstm/trunk/common/build.xml
labs/jbosstm/trunk/qa/tests/build-core.xml
labs/jbosstm/trunk/qa/tests/build-jta.xml
labs/jbosstm/trunk/qa/tests/build-jts.xml
labs/jbosstm/trunk/sharedbuild.xml
Log:
Support using ant 1.8 for the builds. JBTM-707
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml 2010-02-17 10:08:45 UTC (rev 31704)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml 2010-02-17 10:10:36 UTC (rev 31705)
@@ -119,6 +119,9 @@
</sourcepath>
<txt outfile="${basedir}/${build.dir}/emma/coverage.txt" />
<html outfile="${basedir}/${build.dir}/emma/coverage.html" />
+ <sourcepath>
+ <dirset dir="${src.dir}"/>
+ </sourcepath>
</report>
</emma>
Modified: labs/jbosstm/trunk/ArjunaCore/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/build.xml 2010-02-17 10:08:45 UTC (rev 31704)
+++ labs/jbosstm/trunk/ArjunaCore/build.xml 2010-02-17 10:10:36 UTC (rev 31705)
@@ -100,7 +100,7 @@
<mkdir dir="${build.dir}/services"/>
<javac srcdir="arjuna/services/classes" destdir="${build.dir}/services" debug="${debug}"
- deprecation="${deprecation}">
+ deprecation="${deprecation}" includeantruntime="false">
<classpath>
<fileset dir="arjuna/build/lib" includes="arjuna.jar"/>
<fileset dir="." includes="${lib.dir}/ext/*"/>
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/sar/build.xml 2010-02-17 10:08:45 UTC (rev 31704)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/sar/build.xml 2010-02-17 10:10:36 UTC (rev 31705)
@@ -60,7 +60,7 @@
<target name="compile" depends="init" description="compile the source" if="bin.present">
<mkdir dir="${build.dir}"/>
<javac destdir="${build.dir}/classes" classpathref="classpath"
- debug="${com.arjuna.mwlabs.debug}">
+ debug="${com.arjuna.mwlabs.debug}" includeantruntime="false">
<src path="${src.dir}"/>
</javac>
</target>
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml 2010-02-17 10:08:45 UTC (rev 31704)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml 2010-02-17 10:10:36 UTC (rev 31705)
@@ -71,7 +71,7 @@
<exclude name="**/LastOnePhaseResource.java"/>
- <exclude name="**/implicit**"/>
+ <exclude name="**/implicit/**"/>
<exclude name="**/SimpleNestedTest.java"/>
</fileset>
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/build.xml 2010-02-17 10:08:45 UTC (rev 31704)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/build.xml 2010-02-17 10:10:36 UTC (rev 31705)
@@ -37,7 +37,7 @@
<target name="compile" depends="sharedbuild-jts.compile">
<!-- TODO fix me - how to chain macros? or just pass additional.src.dirs -->
<javac srcdir="services/classes" destdir="${build.dir}/classes" debug="${debug}"
- deprecation="${deprecation}" excludes="${excluded.classes}">
+ deprecation="${deprecation}" excludes="${excluded.classes}" includeantruntime="false">
<classpath>
<fileset dir="${build.dir}/lib/ext/" includes="*"/>
<fileset dir="." includes="${lib.dir}/ext/*"/>
@@ -110,6 +110,8 @@
<exclude name="**/CheckedTransactions.java"/>
<exclude name="**/GridTest.java"/>
<exclude name="**/remote/**"/>
+
+ <exclude name="**/DefaultTimeout.java"/>
</fileset>
</tests>
</run.tests.macro>
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/build-anttasks.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/build-anttasks.xml 2010-02-17 10:08:45 UTC (rev 31704)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/build-anttasks.xml 2010-02-17 10:10:36 UTC (rev 31705)
@@ -71,7 +71,7 @@
includes="**/*.java"
debug="${com.hp.mwlabs.debug}"
deprecation="${com.hp.mwlabs.deprecation}"
- />
+ includeantruntime="false"/>
<copy todir="${com.hp.mwlabs.orbportability.builddir}">
<fileset dir="${com.hp.mwlabs.orbportability.config}" includes="*.xml"/>
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/orbspecific.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/orbspecific.xml 2010-02-17 10:08:45 UTC (rev 31704)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/orbspecific.xml 2010-02-17 10:10:36 UTC (rev 31705)
@@ -130,7 +130,8 @@
destdir="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}"
debug="${com.hp.mwlabs.debug}"
bootclasspath="${com.hp.mw.orbportability.orbspecific.jacorb-bootclasspath}"
- deprecation="${com.hp.mwlabs.deprecation}">
+ deprecation="${com.hp.mwlabs.deprecation}"
+ includeantruntime="false">
<classpath>
<pathelement path="${build.jacorb.classpath}"/>
<pathelement path="${com.hp.mw.orbportability.orbspecific.jacorb-classpath}"/>
@@ -145,7 +146,8 @@
excludes="**/orbspecific/javaidl/**/*.java"
debug="${com.hp.mwlabs.debug}"
bootclasspath="${com.hp.mw.orbportability.orbspecific.jacorb-bootclasspath}"
- deprecation="${com.hp.mwlabs.deprecation}">
+ deprecation="${com.hp.mwlabs.deprecation}"
+ includeantruntime="false">
<classpath>
<pathelement path="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}"/>
<pathelement path="${build.jacorb.classpath}"/>
@@ -254,7 +256,7 @@
debug="${com.hp.mwlabs.debug}"
bootclasspath="${com.hp.mw.orbportability.orbspecific.javaidl-bootclasspath}"
deprecation="${com.hp.mwlabs.deprecation}"
- >
+ includeantruntime="false">
<classpath>
<pathelement path="${com.hp.mw.orbportability.orbspecific.javaidl.classpath}"/>
<pathelement path="${com.hp.mwlabs.orbportability.orbspecific.idlsrcdir}"/>
@@ -269,7 +271,8 @@
excludes="**/orbspecific/jacorb/**/*.java"
debug="${com.hp.mwlabs.debug}"
bootclasspath="${com.hp.mw.orbportability.orbspecific.javaidl-bootclasspath}"
- deprecation="${com.hp.mwlabs.deprecation}">
+ deprecation="${com.hp.mwlabs.deprecation}"
+ includeantruntime="false">
<classpath>
<pathelement path="${com.hp.mwlabs.orbportability.orbspecific.idlbuilddir}"/>
<pathelement path="${com.hp.mw.orbportability.orbspecific.javaidl.classpath}"/>
Modified: labs/jbosstm/trunk/build.xml
===================================================================
--- labs/jbosstm/trunk/build.xml 2010-02-17 10:08:45 UTC (rev 31704)
+++ labs/jbosstm/trunk/build.xml 2010-02-17 10:10:36 UTC (rev 31705)
@@ -19,7 +19,7 @@
@author JBoss Inc.
(C) 2009 @author Red Hat Middleware LLC.
-->
-<project name="jbossts" default="help">
+<project name="jbossts" default="jbossall">
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath>
@@ -89,6 +89,11 @@
<atsinstall.macro build.type="jta"/>
</target>
+ <target name="jbossall" depends="jbossjts">
+ <ant dir="XTS" target="clean"/>
+ <ant dir="XTS" target="install"/>
+ </target>
+
<target name="antbuildsystem" depends="clean">
<ant dir="antbuildsystem"/>
</target>
Modified: labs/jbosstm/trunk/common/build.xml
===================================================================
--- labs/jbosstm/trunk/common/build.xml 2010-02-17 10:08:45 UTC (rev 31704)
+++ labs/jbosstm/trunk/common/build.xml 2010-02-17 10:10:36 UTC (rev 31705)
@@ -64,6 +64,9 @@
</fileset>
<txt outfile="${basedir}/${build.dir}/emma/coverage.txt" />
<html outfile="${basedir}/${build.dir}/emma/coverage.html" />
+ <sourcepath>
+ <dirset dir="${src.dir}"/>
+ </sourcepath>
</report>
</emma>
Modified: labs/jbosstm/trunk/qa/tests/build-core.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-core.xml 2010-02-17 10:08:45 UTC (rev 31704)
+++ labs/jbosstm/trunk/qa/tests/build-core.xml 2010-02-17 10:10:36 UTC (rev 31705)
@@ -49,7 +49,8 @@
<javac srcdir="${org.jboss.jbossts.qa.core.src}"
destdir="${org.jboss.jbossts.qa.build.classes}"
- debug="on" deprecation="on">
+ debug="on" deprecation="on"
+ includeantruntime="false">
<include name="**/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java"/>
<include name="**/org/jboss/jbossts/qa/Utils/*Store*.java"/>
Modified: labs/jbosstm/trunk/qa/tests/build-jta.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jta.xml 2010-02-17 10:08:45 UTC (rev 31704)
+++ labs/jbosstm/trunk/qa/tests/build-jta.xml 2010-02-17 10:10:36 UTC (rev 31705)
@@ -60,7 +60,8 @@
<javac srcdir="${org.jboss.jbossts.qa.src}"
destdir="${org.jboss.jbossts.qa.build.classes}"
debug="on"
- excludes="org/jboss/jbossts/qa/ArjunaCore/Common/ClassPathParserTest.java">
+ excludes="org/jboss/jbossts/qa/ArjunaCore/Common/ClassPathParserTest.java"
+ includeantruntime="false">
<include name="**/org/jboss/jbossts/qa/Utils/*Store*.java"/>
<include name="**/org/jboss/jbossts/qa/Utils/BaseTestCase.java"/>
@@ -89,7 +90,8 @@
<target name="astests-compile" depends="org.jboss.jbossts.qa.clean, org.jboss.jbossts.qa.init" if="integration.build">
<javac srcdir="${org.jboss.jbossts.qa.src}"
destdir="${org.jboss.jbossts.qa.build.classes}"
- debug="on" includes="**/astests/**">
+ debug="on" includes="**/astests/**"
+ includeantruntime="false">
<classpath>
<path refid="jta.classpath"/>
Modified: labs/jbosstm/trunk/qa/tests/build-jts.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jts.xml 2010-02-17 10:08:45 UTC (rev 31704)
+++ labs/jbosstm/trunk/qa/tests/build-jts.xml 2010-02-17 10:10:36 UTC (rev 31705)
@@ -184,7 +184,8 @@
<javac srcdir="${org.jboss.jbossts.qa.build.idl}"
destdir="${org.jboss.jbossts.qa.build.classes}"
- debug="on">
+ debug="on"
+ includeantruntime="false">
<classpath>
<path refid="jts.classpath"/>
@@ -197,7 +198,8 @@
<target name="org.jboss.jbossts.qa.compile" depends="org.jboss.jbossts.qa.idl.compile">
<javac srcdir="${org.jboss.jbossts.qa.src}"
destdir="${org.jboss.jbossts.qa.build.classes}"
- debug="on" deprecation="on">
+ debug="on" deprecation="on"
+ includeantruntime="false">
<exclude name="org/jboss/jbossts/qa/ArjunaCore/Common/ClassPathParserTest.java" />
@@ -231,7 +233,8 @@
<target name="as-ejbjar.compile" if="integration.build">
<javac srcdir="${org.jboss.jbossts.qa.src}"
destdir="${org.jboss.jbossts.qa.build.classes}"
- debug="on" deprecation="on">
+ debug="on" deprecation="on"
+ includeantruntime="false">
<include name="**/${astest.dir}/**/*.java" />
<classpath>
<path refid="as.classpath"/>
Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml 2010-02-17 10:08:45 UTC (rev 31704)
+++ labs/jbosstm/trunk/sharedbuild.xml 2010-02-17 10:10:36 UTC (rev 31705)
@@ -40,7 +40,9 @@
<!-- build/extlib is populated by maven/build.xml via /build.xml target init_dependencies -->
<property name="global.ext.lib.dir" value="${sharedbuild.base.dir}/build/extlib"/>
- <property name="global.ext.libs" value="none"/>
+ <!-- using an empty string does not work, it's treated as undefined
+ and that results in everything being included by default. -->
+ <property name="global.ext.libs" value="fakefile.jar"/>
<property name="global.ext.test.libs" value="junit.jar"/>
<property name="excluded.classes" value=""/>
@@ -236,13 +238,9 @@
<property name="dest.dir" value="${build.dir}"/>
<copy todir="${dest.dir}/install/lib/ext">
- <filelist dir="${global.ext.lib.dir}" files="${global.ext.libs}"/>
+ <fileset dir="${global.ext.lib.dir}" includes="${global.ext.libs}" excludes="fakefile.jar"/>
</copy>
- <copy todir="${dest.dir}/install/lib/ext" failonerror="false">
- <fileset dir="lib/ext"/>
- </copy>
-
</target>
@@ -487,7 +485,7 @@
<copy file="${sharedbuild.base.dir}/ArjunaCore/arjuna/etc/log4j.properties" todir="${build.dir}/classes"/>
<mkdir dir="${build.dir}/testresults"/>
- <junit printsummary="yes" fork="yes" dir="${build.dir}" showoutput="@{showoutput}" >
+ <junit printsummary="yes" fork="yes" dir="${build.dir}" showoutput="@{showoutput}" includeantruntime="true">
<formatter type="plain"/>
<classpath>
<pathelement location="etc"/>
More information about the jboss-svn-commits
mailing list