[jboss-svn-commits] JBL Code SVN: r31996 - in labs/jbosstm/trunk/XTS: WS-C and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 8 12:38:22 EST 2010
Author: adinn
Date: 2010-03-08 12:38:22 -0500 (Mon, 08 Mar 2010)
New Revision: 31996
Modified:
labs/jbosstm/trunk/XTS/WS-C/build.xml
labs/jbosstm/trunk/XTS/WS-T/build.xml
labs/jbosstm/trunk/XTS/WSAS/build.xml
labs/jbosstm/trunk/XTS/WSCF/build.xml
labs/jbosstm/trunk/XTS/WSTX/build.xml
labs/jbosstm/trunk/XTS/recovery/build.xml
labs/jbosstm/trunk/XTS/sharedbuild.xml
Log:
removed early resolution of refids to paths which was breaking clean target if parent had been cleaned first
Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-03-08 13:20:29 UTC (rev 31995)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-03-08 17:38:22 UTC (rev 31996)
@@ -83,9 +83,6 @@
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
</path>
- <property name="javac.debug" value="on"/>
- <property name="javac.optimize" value="off"/>
-
<!-- name of the resource bundle -->
<property name="wsc.resourcebundle"
value="wsc_msg_en_US.properties"/>
@@ -124,7 +121,7 @@
</target>
<target name="compile-generic" depends="init">
- <javac destdir="${build.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <javac destdir="${build.classes.dir}" debug="${debug}" deprecation="${deprecation}">
<classpath>
<path refid="build.classpath"/>
</classpath>
@@ -133,7 +130,7 @@
</target>
<target name="compile10" depends="compile-generic">
- <javac destdir="${build.classes10.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <javac destdir="${build.classes10.dir}" debug="${debug}" deprecation="${deprecation}">
<classpath>
<path>
<pathelement path="${build.classes.dir}"/>
@@ -148,7 +145,7 @@
</target>
<target name="compile11" depends="compile-generic">
- <javac destdir="${build.classes11.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <javac destdir="${build.classes11.dir}" debug="${debug}" deprecation="${deprecation}">
<classpath>
<path>
<pathelement path="${build.classes.dir}"/>
@@ -168,7 +165,7 @@
failonerror="yes"
private="yes"
defaultexcludes="yes"
- classpath="${build.classpath}">
+ classpathref="build.classpath">
<packageset dir="${src.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
@@ -242,7 +239,7 @@
<!-- this assumes the required libs have already been built -->
<target name="tests-compile">
- <javac destdir="${tests.build.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <javac destdir="${tests.build.classes.dir}" debug="${debug}" deprecation="${deprecation}">
<classpath>
<pathelement path="${build.lib.dir}/ws-c.jar"/>
<pathelement path="${build.lib.dir}/ws-c-api.jar"/>
@@ -257,7 +254,7 @@
</target>
<!-- this assumes the required libs have already been built -->
<target name="tests-compile11">
- <javac destdir="${tests.build.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <javac destdir="${tests.build.classes.dir}" debug="${debug}" deprecation="${deprecation}">
<classpath>
<pathelement path="${build.lib.dir}/ws-c.jar"/>
<pathelement path="${build.lib.dir}/ws-c-api.jar"/>
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-03-08 13:20:29 UTC (rev 31995)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-03-08 17:38:22 UTC (rev 31996)
@@ -225,7 +225,7 @@
failonerror="yes"
private="yes"
defaultexcludes="yes"
- classpath="${build.classpath}">
+ classpathref="build.classpath">
<packageset dir="${src.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
Modified: labs/jbosstm/trunk/XTS/WSAS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-03-08 13:20:29 UTC (rev 31995)
+++ labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-03-08 17:38:22 UTC (rev 31996)
@@ -135,7 +135,7 @@
failonerror="yes"
private="yes"
defaultexcludes="yes"
- classpath="${build.classpath}">
+ classpathref="build.classpath">
<doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
<path refid="doclet.classpath"/>
<param name="-basedir" value="${basedir}/${build.classes.dir}"/>
Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-03-08 13:20:29 UTC (rev 31995)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-03-08 17:38:22 UTC (rev 31996)
@@ -226,7 +226,7 @@
failonerror="yes"
private="yes"
defaultexcludes="yes"
- classpath="${build.classpath}">
+ classpathref="build.classpath">
<packageset dir="${src.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-03-08 13:20:29 UTC (rev 31995)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-03-08 17:38:22 UTC (rev 31996)
@@ -299,7 +299,7 @@
failonerror="yes"
private="yes"
defaultexcludes="yes"
- classpath="${build.classpath}">
+ classpathref="build.classpath">
<packageset dir="${src.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
Modified: labs/jbosstm/trunk/XTS/recovery/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/build.xml 2010-03-08 13:20:29 UTC (rev 31995)
+++ labs/jbosstm/trunk/XTS/recovery/build.xml 2010-03-08 17:38:22 UTC (rev 31996)
@@ -142,7 +142,7 @@
failonerror="yes"
private="yes"
defaultexcludes="yes"
- classpath="${build.classpath}">
+ classpathref="build.classpath">
<packageset dir="${recovery.src}" defaultexcludes="yes">
<include name="org/jboss/jbossts/**"/>
Modified: labs/jbosstm/trunk/XTS/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sharedbuild.xml 2010-03-08 13:20:29 UTC (rev 31995)
+++ labs/jbosstm/trunk/XTS/sharedbuild.xml 2010-03-08 17:38:22 UTC (rev 31996)
@@ -36,6 +36,7 @@
<property name="interop.sc007.dir" location="${root.dir}/interop/WSTFSC07-interop"/>
<property name="interop.wstx11.dir" location="${root.dir}/interop/WSTX11-interop"/>
+ <property name="xts.install.dir" location="${root.dir}/xts-install"/>
<!-- location of JBossTS parent tree -->
<property name="jbossts.dir" location="${root.dir}/.."/>
@@ -84,27 +85,11 @@
<fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
</path>
- <property name="build.classpath" refid="build.classpath"/>
+ <!-- macros and associate defs -->
- <property name="doclet.classpath" refid="doclet.classpath"/>
-
- <!-- emma support -->
+ <!-- compilation -->
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath>
- <pathelement location="${jbossts.dir}/antbuildsystem/ant-contrib-1.0b3.jar"/>
- </classpath>
- </taskdef>
-
- <property name="emma.enabled" value="false"/>
-
- <property name="emma.dir" value="${jbossts.build.extlib.dir}" />
+ <property name="debug" value="true"/>
+ <property name="deprecation" value="true"/>
- <path id="emma.lib" >
- <pathelement location="${emma.dir}/emma.jar" />
- <pathelement location="${emma.dir}/emma_ant.jar" />
- </path>
-
- <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
-
-</project>
\ No newline at end of file
+</project>
More information about the jboss-svn-commits
mailing list