[jboss-svn-commits] JBL Code SVN: r31916 - in labs/jbosstm/trunk/XTS: WS-C and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 3 12:13:56 EST 2010
Author: adinn
Date: 2010-03-03 12:13:55 -0500 (Wed, 03 Mar 2010)
New Revision: 31916
Removed:
labs/jbosstm/trunk/XTS/WS-T/docs/
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/build.xml
labs/jbosstm/trunk/XTS/recovery/build.xml
labs/jbosstm/trunk/XTS/sar/build.xml
labs/jbosstm/trunk/XTS/sharedbuild.xml
Log:
more tidying up of build scripts in preparation for adding support for emma coverage analysis -- fixes for JBTM-682
Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-03-03 15:28:38 UTC (rev 31915)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-03-03 17:13:55 UTC (rev 31916)
@@ -28,13 +28,17 @@
<!-- -->
<!-- ====================================================================== -->
-<project name="WebServicesCoordination" default="dev-webapps" basedir=".">
+<project name="WebServicesCoordination" default="webapps" basedir=".">
<!-- ================================================================== -->
<!-- Set module name -->
<property name="modulename" value="ws-c"/>
+ <!-- set root before including shared build -->
+
+ <property name="root.dir" location = ".."/>
+
<import file="../sharedbuild.xml"/>
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
@@ -44,26 +48,30 @@
<property name="deploy.dir" value="${jboss.home}/derver/${jboss.server}/deploy}"/>
<!-- internal paths and jars -->
- <property name="build.dir" value="build"/>
- <property name="dev.src.dir" value="dev/src"/>
- <property name="dev.src10.dir" value="dev/src10"/>
- <property name="dev.src11.dir" value="dev/src11"/>
- <property name="dev.dd.dir" value="dev/dd"/>
- <property name="tests.src.dir" value="tests/src"/>
- <property name="tests.dd.dir" value="tests/dd"/>
- <property name="build.dev.classes.dir" value="${build.dir}/dev/classes"/>
- <property name="build.dev.classes10.dir" value="${build.dir}/dev/classes10/classes"/>
- <property name="build.dev.classes11.dir" value="${build.dir}/dev/classes11/classes"/>
- <property name="build.dev.lib.dir" value="${build.dir}/dev/lib"/>
- <property name="build.dev.dd.dir" value="${build.dir}/dev/dd"/>
- <property name="build.dev.webapps.dir" value="${build.dir}/dev/webapps"/>
- <property name="build.tests.classes.dir" value="${build.dir}/tests/classes"/>
- <property name="build.tests.lib.dir" value="${build.dir}/tests/lib"/>
- <property name="build.tests.dd.dir" value="${build.dir}/tests/dd"/>
- <property name="build.tests.webapps.dir" value="${build.dir}/tests/webapps"/>
+ <property name="src.dir" value="dev/src"/>
+ <property name="src10.dir" value="dev/src10"/>
+ <property name="src11.dir" value="dev/src11"/>
+ <property name="dd.dir" value="dev/dd"/>
- <property name="wsas.tests.build.lib.dir" value="../WSAS/tests/build/lib"/>
+ <property name="build.dir" value="build"/>
+ <property name="build.classes.dir" value="${build.dir}/classes"/>
+ <property name="build.classes10.dir" value="${build.dir}/classes10/classes"/>
+ <property name="build.classes11.dir" value="${build.dir}/classes11/classes"/>
+ <property name="build.lib.dir" value="${build.dir}/lib"/>
+ <property name="build.dd.dir" value="${build.dir}/dd"/>
+ <property name="build.webapps.dir" value="${build.dir}/webapps"/>
+ <property name="tests.src.dir" value="tests/src"/>
+ <property name="tests.dd.dir" value="tests/dd"/>
+
+ <property name="tests.build.dir" value="tests/build"/>
+ <property name="tests.build.classes.dir" value="${tests.build.dir}/classes"/>
+ <property name="tests.build.lib.dir" value="${tests.build.dir}/lib"/>
+ <property name="tests.build.dd.dir" value="${tests.build.dir}/dd"/>
+ <property name="tests.build.webapps.dir" value="${tests.build.dir}/webapps"/>
+
+ <property name="wsas.tests.build.lib.dir" value="${wsas.dir}/tests/build/lib"/>
+
<!-- classes provided for clients via api jar -->
<property name="ws-c.api.classes" value="com/arjuna/wsc/AlreadyRegisteredException.class"/>
<!-- we had to delete the JaxRPC handlers so we export the bist needed to allow clients to create them -->
@@ -84,6 +92,7 @@
<target name="clean">
<delete dir="${build.dir}"/>
+ <delete dir="${tests.build.dir}"/>
<delete>
<fileset dir="." includes="**/*.bak" defaultexcludes="no"/>
<fileset dir="." includes="**/*~" defaultexcludes="no"/>
@@ -92,61 +101,67 @@
</delete>
</target>
- <target name="init" depends="clean,init-dir"/>
+ <target name="init" depends="clean,init-dir">
+ <!-- Define default build properties -->
+ <tstamp>
+ <format property="date" pattern="yyyy/mm/dd hh:mm aa"/>
+ </tstamp>
+ </target>
<target name="init-dir">
<mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dev.classes.dir}"/>
- <mkdir dir="${build.dev.classes10.dir}"/>
- <mkdir dir="${build.dev.classes11.dir}"/>
- <mkdir dir="${build.dev.lib.dir}"/>
- <mkdir dir="${build.dev.dd.dir}"/>
- <mkdir dir="${build.dev.webapps.dir}"/>
- <mkdir dir="${build.tests.classes.dir}"/>
- <mkdir dir="${build.tests.lib.dir}"/>
- <mkdir dir="${build.tests.dd.dir}"/>
- <mkdir dir="${build.tests.webapps.dir}"/>
+ <mkdir dir="${build.classes.dir}"/>
+ <mkdir dir="${build.classes10.dir}"/>
+ <mkdir dir="${build.classes11.dir}"/>
+ <mkdir dir="${build.lib.dir}"/>
+ <mkdir dir="${build.dd.dir}"/>
+ <mkdir dir="${build.webapps.dir}"/>
+ <mkdir dir="${tests.build.dir}"/>
+ <mkdir dir="${tests.build.classes.dir}"/>
+ <mkdir dir="${tests.build.lib.dir}"/>
+ <mkdir dir="${tests.build.dd.dir}"/>
+ <mkdir dir="${tests.build.webapps.dir}"/>
</target>
- <target name="dev-compile-generic" depends="init">
- <javac destdir="${build.dev.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <target name="compile-generic" depends="init">
+ <javac destdir="${build.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
<path refid="build.classpath"/>
</classpath>
- <src path="${dev.src.dir}"/>
+ <src path="${src.dir}"/>
</javac>
</target>
- <target name="dev-compile10" depends="dev-compile-generic">
- <javac destdir="${build.dev.classes10.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <target name="compile10" depends="compile-generic">
+ <javac destdir="${build.classes10.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
<path>
- <pathelement path="${build.dev.classes.dir}"/>
+ <pathelement path="${build.classes.dir}"/>
</path>
<path refid="build.classpath"/>
</classpath>
- <src path="${dev.src10.dir}"/>
+ <src path="${src10.dir}"/>
</javac>
- <copy todir="${build.dev.classes.dir}">
- <fileset dir="${dev.src10.dir}" excludes="**/*.java"/>
+ <copy todir="${build.classes10.dir}">
+ <fileset dir="${src10.dir}" excludes="**/*.java"/>
</copy>
</target>
- <target name="dev-compile11" depends="dev-compile-generic">
- <javac destdir="${build.dev.classes11.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <target name="compile11" depends="compile-generic">
+ <javac destdir="${build.classes11.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
<path>
- <pathelement path="${build.dev.classes.dir}"/>
+ <pathelement path="${build.classes.dir}"/>
</path>
<path refid="build.classpath"/>
</classpath>
- <src path="${dev.src11.dir}"/>
+ <src path="${src11.dir}"/>
</javac>
</target>
- <target name="dev-compile" depends="dev-compile11, dev-compile10"/>
+ <target name="compile" depends="compile11, compile10"/>
- <target name="dev-resourcebundle">
+ <target name="resourcebundle">
<echo message="Generating WS-C Bundle"/>
<javadoc packagenames="com.arjuna.*"
@@ -155,85 +170,85 @@
defaultexcludes="yes"
classpath="${build.classpath}">
- <packageset dir="${dev.src.dir}" defaultexcludes="yes">
+ <packageset dir="${src.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
- <packageset dir="${dev.src10.dir}" defaultexcludes="yes">
+ <packageset dir="${src10.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
- <packageset dir="${dev.src11.dir}" defaultexcludes="yes">
+ <packageset dir="${src11.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
<doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
<path refid="doclet.classpath"/>
- <param name="-basedir" value="${basedir}/${build.dev.classes.dir}"/>
+ <param name="-basedir" value="${basedir}/${build.classes.dir}"/>
<param name="-resourcebundle" value="${wsc.resourcebundle}"/>
</doclet>
</javadoc>
</target>
- <target name="dev-jars" depends="dev-compile, dev-resourcebundle" >
+ <target name="jars" depends="compile, resourcebundle" >
<!-- wsdl files for services - loaded as /WEB-INF/wsdl/... -->
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wscoor.wsdl" tofile="${build.dev.dd.dir}/wsdl/wscoor.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wscoor.xsd" tofile="${build.dev.dd.dir}/wsdl/wscoor.xsd"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.dev.dd.dir}/wsdl/ws-addr.xsd"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wscoor-activation-binding.wsdl" tofile="${build.dev.dd.dir}/wsdl/wscoor-activation-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wscoor-registration-binding.wsdl" tofile="${build.dev.dd.dir}/wsdl/wscoor-registration-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wscoor.wsdl" tofile="${build.dd.dir}/wsdl/wscoor.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wscoor.xsd" tofile="${build.dd.dir}/wsdl/wscoor.xsd"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.dd.dir}/wsdl/ws-addr.xsd"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wscoor-activation-binding.wsdl" tofile="${build.dd.dir}/wsdl/wscoor-activation-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wscoor-registration-binding.wsdl" tofile="${build.dd.dir}/wsdl/wscoor-registration-binding.wsdl"/>
<!-- wsdl files for clients - loaded as <ClientClassDir>/wsdl/... -->
- <mkdir dir="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wscoor.wsdl" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wscoor.xsd" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor.xsd"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/ws-addr.xsd"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wscoor-activation-binding.wsdl" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor-activation-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wscoor-registration-binding.wsdl" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor-registration-binding.wsdl"/>
+ <mkdir dir="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wscoor.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wscoor.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor.xsd"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/ws-addr.xsd"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wscoor-activation-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor-activation-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wscoor-registration-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor-registration-binding.wsdl"/>
- <copy file="${dev.dd.dir}/soapfault/wsdl/soapfault.wsdl" tofile="${build.dev.classes11.dir}/org/jboss/jbossts/xts/soapfault/wsdl/soapfault.wsdl"/>
- <jar jarfile="${build.dev.lib.dir}/ws-c.jar">
- <fileset dir="${build.dev.classes.dir}" excludes="${ws-c.api.classes}"/>
+ <copy file="${dd.dir}/soapfault/wsdl/soapfault.wsdl" tofile="${build.classes11.dir}/org/jboss/jbossts/xts/soapfault/wsdl/soapfault.wsdl"/>
+ <jar jarfile="${build.lib.dir}/ws-c.jar">
+ <fileset dir="${build.classes.dir}" excludes="${ws-c.api.classes}"/>
</jar>
- <jar jarfile="${build.dev.lib.dir}/ws-c-api.jar">
- <fileset dir="${build.dev.classes.dir}" includes="${ws-c.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/ws-c-api.jar">
+ <fileset dir="${build.classes.dir}" includes="${ws-c.api.classes}"/>
</jar>
- <jar jarfile="${build.dev.lib.dir}/ws-c10.jar">
- <fileset dir="${build.dev.classes10.dir}" excludes="${ws-c10.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/ws-c10.jar">
+ <fileset dir="${build.classes10.dir}" excludes="${ws-c10.api.classes}"/>
</jar>
- <jar jarfile="${build.dev.lib.dir}/ws-c10-api.jar">
- <fileset dir="${build.dev.classes10.dir}" includes="${ws-c10.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/ws-c10-api.jar">
+ <fileset dir="${build.classes10.dir}" includes="${ws-c10.api.classes}"/>
</jar>
- <jar jarfile="${build.dev.lib.dir}/ws-c11.jar">
- <fileset dir="${build.dev.classes11.dir}">
+ <jar jarfile="${build.lib.dir}/ws-c11.jar">
+ <fileset dir="${build.classes11.dir}">
<exclude name="com/arjuna/webservices11/wscoor/sei/**"/>
<exclude name="handlers.xml"/>
</fileset>
</jar>
</target>
- <target name="dev-webapps" depends="dev-jars" >
- <copy file="${dev.dd.dir}/ws-c_web-app.xml" tofile="${build.dev.dd.dir}/web-app.xml">
+ <target name="webapps" depends="jars" >
+ <copy file="${dd.dir}/ws-c_web-app.xml" tofile="${build.dd.dir}/web-app.xml">
</copy>
- <copy file="${dev.dd.dir}/ws-c11_web-app.xml" tofile="${build.dev.dd.dir}/web-app11.xml">
+ <copy file="${dd.dir}/ws-c11_web-app.xml" tofile="${build.dd.dir}/web-app11.xml">
</copy>
- <copy file="${dev.dd.dir}/ws-c_handlers.xml" tofile="${build.dev.classes11.dir}/handlers.xml"/>
- <war warfile="${build.dev.webapps.dir}/ws-c10.war" webxml="${build.dev.dd.dir}/web-app.xml"/>
- <war warfile="${build.dev.webapps.dir}/ws-c11.war" webxml="${build.dev.dd.dir}/web-app11.xml">
- <webinf dir="${build.dir}/dev/classes11" includes="classes/com/arjuna/webservices11/wscoor/sei/* classes/handlers.xml"/>
- <webinf dir="${build.dev.dd.dir}" includes="wsdl/**"/>
+ <copy file="${dd.dir}/ws-c_handlers.xml" tofile="${build.classes11.dir}/handlers.xml"/>
+ <war warfile="${build.webapps.dir}/ws-c10.war" webxml="${build.dd.dir}/web-app.xml"/>
+ <war warfile="${build.webapps.dir}/ws-c11.war" webxml="${build.dd.dir}/web-app11.xml">
+ <webinf dir="${build.dir}/classes11" includes="classes/com/arjuna/webservices11/wscoor/sei/* classes/handlers.xml"/>
+ <webinf dir="${build.dd.dir}" includes="wsdl/**"/>
</war>
</target>
<!-- this assumes the required libs have already been built -->
<target name="tests-compile">
- <javac destdir="${build.tests.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <javac destdir="${tests.build.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
- <pathelement path="${build.dev.lib.dir}/ws-c.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-c-api.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-c10.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-c10-api.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-c11.jar"/>
+ <pathelement path="${build.lib.dir}/ws-c.jar"/>
+ <pathelement path="${build.lib.dir}/ws-c-api.jar"/>
+ <pathelement path="${build.lib.dir}/ws-c10.jar"/>
+ <pathelement path="${build.lib.dir}/ws-c10-api.jar"/>
+ <pathelement path="${build.lib.dir}/ws-c11.jar"/>
<path refid="tests.lib.path"/>
<path refid="build.classpath"/>
</classpath>
@@ -242,11 +257,11 @@
</target>
<!-- this assumes the required libs have already been built -->
<target name="tests-compile11">
- <javac destdir="${build.tests.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <javac destdir="${tests.build.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
- <pathelement path="${build.dev.lib.dir}/ws-c.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-c-api.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-c11.jar"/>
+ <pathelement path="${build.lib.dir}/ws-c.jar"/>
+ <pathelement path="${build.lib.dir}/ws-c-api.jar"/>
+ <pathelement path="${build.lib.dir}/ws-c11.jar"/>
<path refid="tests.lib.path"/>
<path refid="build.classpath"/>
</classpath>
@@ -257,41 +272,41 @@
</target>
<target name="tests-webapps" depends="tests-compile" >
- <copy file="${tests.dd.dir}/ws-c-tests_web-app.xml" tofile="${build.tests.dd.dir}/web-app.xml">
+ <copy file="${tests.dd.dir}/ws-c-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app.xml">
</copy>
- <copy file="${tests.dd.dir}/ws-c11-tests_web-app.xml" tofile="${build.tests.dd.dir}/web-app11.xml">
+ <copy file="${tests.dd.dir}/ws-c11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml">
</copy>
- <jar jarfile="${build.tests.lib.dir}/xts-test-servlet.jar">
- <fileset dir="${build.tests.classes.dir}" includes="com/arjuna/qa/junit/*.class"/>
+ <jar jarfile="${tests.build.lib.dir}/xts-test-servlet.jar">
+ <fileset dir="${tests.build.classes.dir}" includes="com/arjuna/qa/junit/*.class"/>
</jar>
- <jar jarfile="${build.tests.lib.dir}/ws-c-tests.jar">
- <fileset dir="${build.tests.classes.dir}" />
+ <jar jarfile="${tests.build.lib.dir}/ws-c-tests.jar">
+ <fileset dir="${tests.build.classes.dir}" />
</jar>
- <war warfile="${build.tests.webapps.dir}/ws-c-tests.war" webxml="${build.tests.dd.dir}/web-app.xml">
+ <war warfile="${tests.build.webapps.dir}/ws-c-tests.war" webxml="${tests.build.dd.dir}/web-app.xml">
</war>
- <war warfile="${build.tests.webapps.dir}/ws-c11-tests.war" webxml="${build.tests.dd.dir}/web-app11.xml">
+ <war warfile="${tests.build.webapps.dir}/ws-c11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml">
</war>
- <ear earfile="${build.tests.webapps.dir}/ws-c-tests.ear" appxml="${tests.dd.dir}/ws-c-tests_application.xml">
+ <ear earfile="${tests.build.webapps.dir}/ws-c-tests.ear" appxml="${tests.dd.dir}/ws-c-tests_application.xml">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${build.tests.webapps.dir}" includes="ws-c-tests.war"/>
- <fileset dir="${build.tests.webapps.dir}" includes="ws-c11-tests.war"/>
- <fileset dir="${build.tests.lib.dir}" includes="ws-c-tests.jar"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="ws-c-tests.war"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="ws-c11-tests.war"/>
+ <fileset dir="${tests.build.lib.dir}" includes="ws-c-tests.jar"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
</target>
<target name="tests-webapps11" depends="tests-compile11" >
- <copy file="${tests.dd.dir}/ws-c11-tests_web-app.xml" tofile="${build.tests.dd.dir}/web-app11.xml">
+ <copy file="${tests.dd.dir}/ws-c11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml">
</copy>
- <jar jarfile="${build.tests.lib.dir}/xts-test-servlet.jar">
- <fileset dir="${build.tests.classes.dir}" includes="com/arjuna/qa/junit/*.class"/>
+ <jar jarfile="${tests.build.lib.dir}/xts-test-servlet.jar">
+ <fileset dir="${tests.build.classes.dir}" includes="com/arjuna/qa/junit/*.class"/>
</jar>
- <war warfile="${build.tests.webapps.dir}/ws-c11-tests.war" webxml="${build.tests.dd.dir}/web-app11.xml">
- <classes dir="${build.tests.classes.dir}" excludes="com/arjuna/qa/junit/**/*.class"/>
+ <war warfile="${tests.build.webapps.dir}/ws-c11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml">
+ <classes dir="${tests.build.classes.dir}" excludes="com/arjuna/qa/junit/**/*.class"/>
</war>
- <ear earfile="${build.tests.webapps.dir}/ws-c-tests.ear" appxml="${tests.dd.dir}/ws-c11-tests_application.xml">
+ <ear earfile="${tests.build.webapps.dir}/ws-c-tests.ear" appxml="${tests.dd.dir}/ws-c11-tests_application.xml">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${build.tests.webapps.dir}" includes="ws-c11-tests.war"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="ws-c11-tests.war"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
</target>
@@ -302,11 +317,11 @@
<target name="tests-both" depends="tests-webapps"/>
<target name="tests-deploy" depends="tests-webapps, tests-undeploy">
- <copy file="${build.tests.webapps.dir}/ws-c-tests.ear" tofile="${deploy.dir}/ws-c-tests.ear"/>
+ <copy file="${tests.build.webapps.dir}/ws-c-tests.ear" tofile="${deploy.dir}/ws-c-tests.ear"/>
</target>
<target name="tests-deploy11" depends="tests-webapps11, tests-undeploy">
- <copy file="${build.tests.webapps.dir}/ws-c-tests.ear" tofile="${deploy.dir}/ws-c-tests.ear"/>
+ <copy file="${tests.build.webapps.dir}/ws-c-tests.ear" tofile="${deploy.dir}/ws-c-tests.ear"/>
</target>
<target name="tests-undeploy">
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-03-03 15:28:38 UTC (rev 31915)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-03-03 17:13:55 UTC (rev 31916)
@@ -29,13 +29,17 @@
<!-- -->
<!-- ====================================================================== -->
-<project name="WebServicesTransaction" default="dev-webapps" basedir=".">
+<project name="WebServicesTransaction" default="webapps" basedir=".">
<!-- ================================================================== -->
<!-- Set module name -->
<property name="modulename" value="ws-t"/>
+ <!-- set root before including shared build -->
+
+ <property name="root.dir" location = ".."/>
+
<import file="../sharedbuild.xml"/>
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
@@ -45,24 +49,28 @@
<property name="deploy.dir" value="${jboss.home}/derver/${jboss.server}/deploy}"/>
<!-- internal paths and jars -->
- <property name="build.dir" value="build"/>
- <property name="dev.src.dir" value="dev/src"/>
- <property name="dev.src10.dir" value="dev/src10"/>
- <property name="dev.src11.dir" value="dev/src11"/>
- <property name="dev.dd.dir" value="dev/dd"/>
- <property name="tests.src.dir" value="tests/src"/>
- <property name="tests.dd.dir" value="tests/dd"/>
- <property name="build.dev.classes.dir" value="${build.dir}/dev/classes"/>
- <property name="build.dev.classes10.dir" value="${build.dir}/dev/classes10/classes"/>
- <property name="build.dev.classes11.dir" value="${build.dir}/dev/classes11/classes"/>
- <property name="build.dev.lib.dir" value="${build.dir}/dev/lib"/>
- <property name="build.dev.dd.dir" value="${build.dir}/dev/dd"/>
- <property name="build.dev.webapps.dir" value="${build.dir}/dev/webapps"/>
- <property name="build.tests.classes.dir" value="${build.dir}/tests/classes"/>
- <property name="build.tests.lib.dir" value="${build.dir}/tests/lib"/>
- <property name="build.tests.dd.dir" value="${build.dir}/tests/dd"/>
- <property name="build.tests.webapps.dir" value="${build.dir}/tests/webapps"/>
+ <property name="build.dir" value="build"/>
+ <property name="src.dir" value="dev/src"/>
+ <property name="src10.dir" value="dev/src10"/>
+ <property name="src11.dir" value="dev/src11"/>
+ <property name="dd.dir" value="dev/dd"/>
+ <property name="tests.src.dir" value="tests/src"/>
+ <property name="tests.dd.dir" value="tests/dd"/>
+
+ <property name="build.classes.dir" value="${build.dir}/classes"/>
+ <property name="build.classes10.dir" value="${build.dir}/classes10/classes"/>
+ <property name="build.classes11.dir" value="${build.dir}/classes11/classes"/>
+ <property name="build.lib.dir" value="${build.dir}/lib"/>
+ <property name="build.dd.dir" value="${build.dir}/dd"/>
+ <property name="build.webapps.dir" value="${build.dir}/webapps"/>
+
+ <property name="tests.build.dir" value="tests/build"/>
+ <property name="tests.build.classes.dir" value="${tests.build.dir}/classes"/>
+ <property name="tests.build.lib.dir" value="${tests.build.dir}/lib"/>
+ <property name="tests.build.dd.dir" value="${tests.build.dir}/dd"/>
+ <property name="tests.build.webapps.dir" value="${tests.build.dir}/webapps"/>
+
<!-- classes provided for clients via api jars -->
<property name="ws-t.api.classes" value="com/arjuna/wst/Vote.class com/arjuna/wst/Prepared.class
com/arjuna/wst/ReadOnly.class com/arjuna/wst/Aborted.class
@@ -82,29 +90,30 @@
<!--sibling module directories and jars -->
- <property name="ws-c.build.dev.lib.dir" value="../WS-C//build/dev/lib"/>
- <property name="wscf.build.lib.dir" value="../WSCF//build/lib"/>
- <property name="wsas.build.lib.dir" value="../WSAS//build/lib"/>
- <property name="wsas.tests.build.lib.dir" value="../WSAS/tests/build/lib"/>
+ <property name="wsas.build.lib.dir" value="${wsas.dir}/build/lib"/>
+ <property name="wscf.build.lib.dir" value="${wscf.dir}/build/lib"/>
+ <property name="ws-c.build.lib.dir" value="${ws-c.dir}/build/lib"/>
+ <property name="wsas.tests.build.lib.dir" value="${wsas.dir}/tests/build/lib"/>
+
+ <property name="wsas.libs" value="wsas.jar"/>
+ <property name="wscf.libs" value="wscf.jar"/>
+ <property name="wscf10.libs" value="wscf10.jar"/>
+ <property name="wscf11.libs" value="wscf11.jar"/>
<property name="ws-c.libs" value="ws-c.jar"/>
- <property name="ws-c.api.libs" value="ws-c-api.jar"/>
- <property name="ws-c10.libs" value="ws-c10.jar"/>
- <property name="ws-c10.api.libs" value="ws-c10-api.jar"/>
- <property name="ws-c11.libs" value="ws-c11.jar"/>
- <property name="wscf.libs" value="wscf.jar"/>
- <property name="wscf10.libs" value="wscf10.jar"/>
- <property name="wscf11.libs" value="wscf11.jar"/>
- <property name="wsas.libs" value="wsas.jar"/>
+ <property name="ws-c.api.libs" value="ws-c-api.jar"/>
+ <property name="ws-c10.libs" value="ws-c10.jar"/>
+ <property name="ws-c10.api.libs" value="ws-c10-api.jar"/>
+ <property name="ws-c11.libs" value="ws-c11.jar"/>
<path id="ws-c.path">
- <fileset dir="${ws-c.build.dev.lib.dir}" includes="${ws-c.libs} ${ws-c.api.libs}"/>
+ <fileset dir="${ws-c.build.lib.dir}" includes="${ws-c.libs} ${ws-c.api.libs}"/>
</path>
<path id="ws-c10.path">
- <fileset dir="${ws-c.build.dev.lib.dir}" includes="${ws-c10.libs} ${ws-c10.api.libs}"/>
+ <fileset dir="${ws-c.build.lib.dir}" includes="${ws-c10.libs} ${ws-c10.api.libs}"/>
</path>
<path id="ws-c11.path">
- <fileset dir="${ws-c.build.dev.lib.dir}" includes="${ws-c11.libs}"/>
+ <fileset dir="${ws-c.build.lib.dir}" includes="${ws-c11.libs}"/>
</path>
<path id="wscf.path">
@@ -148,25 +157,26 @@
<target name="init-dir">
<mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dev.classes.dir}"/>
- <mkdir dir="${build.dev.classes10.dir}"/>
- <mkdir dir="${build.dev.classes11.dir}"/>
- <mkdir dir="${build.dev.lib.dir}"/>
- <mkdir dir="${build.dev.dd.dir}"/>
- <mkdir dir="${build.dev.webapps.dir}"/>
- <mkdir dir="${build.tests.classes.dir}"/>
- <mkdir dir="${build.tests.lib.dir}"/>
- <mkdir dir="${build.tests.dd.dir}"/>
- <mkdir dir="${build.tests.webapps.dir}"/>
+ <mkdir dir="${build.classes.dir}"/>
+ <mkdir dir="${build.classes10.dir}"/>
+ <mkdir dir="${build.classes11.dir}"/>
+ <mkdir dir="${build.lib.dir}"/>
+ <mkdir dir="${build.dd.dir}"/>
+ <mkdir dir="${build.webapps.dir}"/>
+ <mkdir dir="${tests.build.dir}"/>
+ <mkdir dir="${tests.build.classes.dir}"/>
+ <mkdir dir="${tests.build.lib.dir}"/>
+ <mkdir dir="${tests.build.dd.dir}"/>
+ <mkdir dir="${tests.build.webapps.dir}"/>
</target>
- <target name="dev-compile" depends="dev-compile10, dev-compile11"/>
+ <target name="compile" depends="compile10, compile11"/>
- <target name="dev-compile10" depends="dev-compile-generic">
- <javac destdir="${build.dev.classes10.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <target name="compile10" depends="compile-generic">
+ <javac destdir="${build.classes10.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
<path>
- <pathelement path="${build.dev.classes.dir}"/>
+ <pathelement path="${build.classes.dir}"/>
</path>
<path refid="build.classpath"/>
<path refid="ws-c.path"/>
@@ -175,15 +185,15 @@
<path refid="wscf10.path"/>
<path refid="wsas.path"/>
</classpath>
- <src path="${dev.src10.dir}"/>
+ <src path="${src10.dir}"/>
</javac>
</target>
- <target name="dev-compile11" depends="dev-compile-generic">
- <javac destdir="${build.dev.classes11.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <target name="compile11" depends="compile-generic">
+ <javac destdir="${build.classes11.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
<path>
- <pathelement path="${build.dev.classes.dir}"/>
+ <pathelement path="${build.classes.dir}"/>
</path>
<path refid="build.classpath"/>
<path refid="ws-c.path"/>
@@ -192,23 +202,23 @@
<path refid="wscf11.path"/>
<path refid="wsas.path"/>
</classpath>
- <src path="${dev.src11.dir}"/>
+ <src path="${src11.dir}"/>
</javac>
</target>
- <target name="dev-compile-generic" depends="init">
- <javac destdir="${build.dev.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <target name="compile-generic" depends="init">
+ <javac destdir="${build.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
<path refid="build.classpath"/>
<path refid="ws-c.path"/>
<path refid="wscf.path"/>
<path refid="wsas.path"/>
</classpath>
- <src path="${dev.src.dir}"/>
+ <src path="${src.dir}"/>
</javac>
</target>
- <target name="dev-resourcebundle">
+ <target name="resourcebundle">
<echo message="Generating WS-T Bundle"/>
<javadoc packagenames="com.arjuna.*, org.jboss.jbossts.xts.*"
@@ -217,122 +227,122 @@
defaultexcludes="yes"
classpath="${build.classpath}">
- <packageset dir="${dev.src.dir}" defaultexcludes="yes">
+ <packageset dir="${src.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
<include name="org/jboss/jbossts/xts/**"/>
</packageset>
- <packageset dir="${dev.src10.dir}" defaultexcludes="yes">
+ <packageset dir="${src10.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
<include name="org/jboss/jbossts/xts/**"/>
</packageset>
- <packageset dir="${dev.src11.dir}" defaultexcludes="yes">
+ <packageset dir="${src11.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
<include name="org/jboss/jbossts/xts//**"/>
</packageset>
<doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
<path refid="doclet.classpath"/>
- <param name="-basedir" value="${basedir}/${build.dev.classes.dir}"/>
+ <param name="-basedir" value="${basedir}/${build.classes.dir}"/>
<param name="-resourcebundle" value="${wst.resourcebundle}"/>
</doclet>
</javadoc>
</target>
- <target name="dev-jars" depends="dev-compile, dev-resourcebundle" >
+ <target name="jars" depends="compile, resourcebundle" >
<!-- wsdl files for services -->
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsat.wsdl" tofile="${build.dev.dd.dir}/wsdl/wsat.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsat.xsd" tofile="${build.dev.dd.dir}/wsdl/wsat.xsd"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.dev.dd.dir}/wsdl/ws-addr.xsd"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsat.wsdl" tofile="${build.dd.dir}/wsdl/wsat.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsat.xsd" tofile="${build.dd.dir}/wsdl/wsat.xsd"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.dd.dir}/wsdl/ws-addr.xsd"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsat-participant-binding.wsdl" tofile="${build.dev.dd.dir}/wsdl/wsat-participant-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsat-coordinator-binding.wsdl" tofile="${build.dev.dd.dir}/wsdl/wsat-coordinator-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsat-completion-initiator-binding.wsdl" tofile="${build.dev.dd.dir}/wsdl/wsat-completion-initiator-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsat-completion-coordinator-binding.wsdl" tofile="${build.dev.dd.dir}/wsdl/wsat-completion-coordinator-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsat-participant-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsat-participant-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsat-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsat-coordinator-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsat-completion-initiator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsat-completion-initiator-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsat-completion-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsat-completion-coordinator-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsba.wsdl" tofile="${build.dev.dd.dir}/wsdl/wsba.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsba.xsd" tofile="${build.dev.dd.dir}/wsdl/wsba.xsd"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsba.wsdl" tofile="${build.dd.dir}/wsdl/wsba.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsba.xsd" tofile="${build.dd.dir}/wsdl/wsba.xsd"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl" tofile="${build.dev.dd.dir}/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsba-coordinator-completion-participant-binding.wsdl" tofile="${build.dev.dd.dir}/wsdl/wsba-coordinator-completion-participant-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsba-participant-completion-coordinator-binding.wsdl" tofile="${build.dev.dd.dir}/wsdl/wsba-participant-completion-coordinator-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsba-participant-completion-participant-binding.wsdl" tofile="${build.dev.dd.dir}/wsdl/wsba-participant-completion-participant-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsba-coordinator-completion-participant-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsba-coordinator-completion-participant-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsba-participant-completion-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsba-participant-completion-coordinator-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsba-participant-completion-participant-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsba-participant-completion-participant-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wsarjtx/wsdl/wsarjtx.wsdl" tofile="${build.dev.dd.dir}/wsdl/wsarjtx.wsdl"/>
- <copy file="${dev.dd.dir}/wsarjtx/wsdl/wsarjtx-termination-coordinator-binding.wsdl" tofile="${build.dev.dd.dir}/wsdl/wsarjtx-termination-coordinator-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wsarjtx/wsdl/wsarjtx-termination-participant-binding.wsdl" tofile="${build.dev.dd.dir}/wsdl/wsarjtx-termination-participant-binding.wsdl"/>
+ <copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx.wsdl" tofile="${build.dd.dir}/wsdl/wsarjtx.wsdl"/>
+ <copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx-termination-coordinator-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsarjtx-termination-coordinator-binding.wsdl"/>
+ <copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx-termination-participant-binding.wsdl" tofile="${build.dd.dir}/wsdl/wsarjtx-termination-participant-binding.wsdl"/>
<!-- wsdl files for clients -->
- <mkdir dir="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl"/>
- <mkdir dir="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl"/>
- <mkdir dir="${build.dev.classes11.dir}/com/arjuna/schemas/ws/_2005/_10/wsarjtx/wsdl"/>
+ <mkdir dir="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl"/>
+ <mkdir dir="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl"/>
+ <mkdir dir="${build.classes11.dir}/com/arjuna/schemas/ws/_2005/_10/wsarjtx/wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsat.wsdl" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsat.xsd" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat.xsd"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/ws-addr.xsd"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsat.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsat.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat.xsd"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/ws-addr.xsd"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsat-participant-binding.wsdl" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat-participant-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsat-coordinator-binding.wsdl" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat-coordinator-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsat-completion-initiator-binding.wsdl" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat-completion-initiator-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsat-completion-coordinator-binding.wsdl" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat-completion-coordinator-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsat-participant-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat-participant-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsat-coordinator-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat-coordinator-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsat-completion-initiator-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat-completion-initiator-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsat-completion-coordinator-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsat/_2006/_06/wsdl/wsat-completion-coordinator-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsba.wsdl" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsba.xsd" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba.xsd"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/ws-addr.xsd"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsba.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsba.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba.xsd"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/ws-addr.xsd"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsba-coordinator-completion-participant-binding.wsdl" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba-coordinator-completion-participant-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsba-participant-completion-coordinator-binding.wsdl" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba-participant-completion-coordinator-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wscoor1.1/wsdl/wsba-participant-completion-participant-binding.wsdl" tofile="${build.dev.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba-participant-completion-participant-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba-coordinator-completion-coordinator-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsba-coordinator-completion-participant-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba-coordinator-completion-participant-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsba-participant-completion-coordinator-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba-participant-completion-coordinator-binding.wsdl"/>
+ <copy file="${dd.dir}/wscoor1.1/wsdl/wsba-participant-completion-participant-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wsba/_2006/_06/wsdl/wsba-participant-completion-participant-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wsarjtx/wsdl/wsarjtx.wsdl" tofile="${build.dev.classes11.dir}/com/arjuna/schemas/ws/_2005/_10/wsarjtx/wsdl/wsarjtx.wsdl"/>
- <copy file="${dev.dd.dir}/wsarjtx/wsdl/wsarjtx-termination-coordinator-binding.wsdl" tofile="${build.dev.classes11.dir}/com/arjuna/schemas/ws/_2005/_10/wsarjtx/wsdl/wsarjtx-termination-coordinator-binding.wsdl"/>
- <copy file="${dev.dd.dir}/wsarjtx/wsdl/wsarjtx-termination-participant-binding.wsdl" tofile="${build.dev.classes11.dir}/com/arjuna/schemas/ws/_2005/_10/wsarjtx/wsdl/wsarjtx-termination-participant-binding.wsdl"/>
+ <copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx.wsdl" tofile="${build.classes11.dir}/com/arjuna/schemas/ws/_2005/_10/wsarjtx/wsdl/wsarjtx.wsdl"/>
+ <copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx-termination-coordinator-binding.wsdl" tofile="${build.classes11.dir}/com/arjuna/schemas/ws/_2005/_10/wsarjtx/wsdl/wsarjtx-termination-coordinator-binding.wsdl"/>
+ <copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx-termination-participant-binding.wsdl" tofile="${build.classes11.dir}/com/arjuna/schemas/ws/_2005/_10/wsarjtx/wsdl/wsarjtx-termination-participant-binding.wsdl"/>
- <jar jarfile="${build.dev.lib.dir}/ws-t.jar">
- <fileset dir="${build.dev.classes.dir}" excludes="${ws-t.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/ws-t.jar">
+ <fileset dir="${build.classes.dir}" excludes="${ws-t.api.classes}"/>
</jar>
- <jar jarfile="${build.dev.lib.dir}/ws-t-api.jar">
- <fileset dir="${build.dev.classes.dir}" includes="${ws-t.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/ws-t-api.jar">
+ <fileset dir="${build.classes.dir}" includes="${ws-t.api.classes}"/>
</jar>
- <jar jarfile="${build.dev.lib.dir}/ws-t10.jar">
- <fileset dir="${build.dev.classes10.dir}" excludes="${ws-t10.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/ws-t10.jar">
+ <fileset dir="${build.classes10.dir}" excludes="${ws-t10.api.classes}"/>
</jar>
- <jar jarfile="${build.dev.lib.dir}/ws-t10-api.jar">
- <fileset dir="${build.dev.classes10.dir}" includes="${ws-t10.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/ws-t10-api.jar">
+ <fileset dir="${build.classes10.dir}" includes="${ws-t10.api.classes}"/>
</jar>
- <jar jarfile="${build.dev.lib.dir}/ws-t11.jar">
- <fileset dir="${build.dev.classes11.dir}" excludes="${ws-t11.api.classes} com/arjuna/webservices11/wsat/sei/* com/arjuna/webservices11/wsba/sei/* com/arjuna/webservices11/wsarjtx/sei/* handlers.xml"/>
+ <jar jarfile="${build.lib.dir}/ws-t11.jar">
+ <fileset dir="${build.classes11.dir}" excludes="${ws-t11.api.classes} com/arjuna/webservices11/wsat/sei/* com/arjuna/webservices11/wsba/sei/* com/arjuna/webservices11/wsarjtx/sei/* handlers.xml"/>
</jar>
- <jar jarfile="${build.dev.lib.dir}/ws-t11-api.jar">
- <fileset dir="${build.dev.classes11.dir}" includes="${ws-t11.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/ws-t11-api.jar">
+ <fileset dir="${build.classes11.dir}" includes="${ws-t11.api.classes}"/>
</jar>
</target>
- <target name="dev-webapps" depends="dev-jars">
- <copy file="${dev.dd.dir}/ws-t_web-app.xml" tofile="${build.dev.dd.dir}/web-app.xml">
+ <target name="webapps" depends="jars">
+ <copy file="${dd.dir}/ws-t_web-app.xml" tofile="${build.dd.dir}/web-app.xml">
</copy>
- <copy file="${dev.dd.dir}/ws-t11_web-app.xml" tofile="${build.dev.dd.dir}/web-app11.xml">
+ <copy file="${dd.dir}/ws-t11_web-app.xml" tofile="${build.dd.dir}/web-app11.xml">
</copy>
- <copy file="${dev.dd.dir}/ws-t_handlers.xml" tofile="${build.dev.classes11.dir}/handlers.xml"/>
- <war warfile="${build.dev.webapps.dir}/ws-t10.war" webxml="${build.dev.dd.dir}/web-app.xml"/>
- <war warfile="${build.dev.webapps.dir}/ws-t11.war" webxml="${build.dev.dd.dir}/web-app11.xml">
- <webinf dir="${build.dir}/dev/classes11" includes="classes/com/arjuna/webservices11/wsat/sei/* classes/com/arjuna/webservices11/wsba/sei/* classes/com/arjuna/webservices11/wsarjtx/sei/* classes/handlers.xml"/>
- <webinf dir="${build.dev.dd.dir}" includes="wsdl/**"/>
+ <copy file="${dd.dir}/ws-t_handlers.xml" tofile="${build.classes11.dir}/handlers.xml"/>
+ <war warfile="${build.webapps.dir}/ws-t10.war" webxml="${build.dd.dir}/web-app.xml"/>
+ <war warfile="${build.webapps.dir}/ws-t11.war" webxml="${build.dd.dir}/web-app11.xml">
+ <webinf dir="${build.dir}/classes11" includes="classes/com/arjuna/webservices11/wsat/sei/* classes/com/arjuna/webservices11/wsba/sei/* classes/com/arjuna/webservices11/wsarjtx/sei/* classes/handlers.xml"/>
+ <webinf dir="${build.dd.dir}" includes="wsdl/**"/>
</war>
</target>
<!-- this assumes all the required libs have been built -->
<target name="tests-compile">
- <javac destdir="${build.tests.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <javac destdir="${tests.build.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
- <pathelement path="${build.dev.lib.dir}/ws-t.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-t-api.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-t10.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-t10-api.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-t11.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-t11-api.jar"/>
+ <pathelement path="${build.lib.dir}/ws-t.jar"/>
+ <pathelement path="${build.lib.dir}/ws-t-api.jar"/>
+ <pathelement path="${build.lib.dir}/ws-t10.jar"/>
+ <pathelement path="${build.lib.dir}/ws-t10-api.jar"/>
+ <pathelement path="${build.lib.dir}/ws-t11.jar"/>
+ <pathelement path="${build.lib.dir}/ws-t11-api.jar"/>
<path refid="tests.lib.path"/>
<path refid="build.classpath"/>
<path refid="ws-c.path"/>
@@ -349,12 +359,12 @@
<!-- this assumes all the required libs have been built -->
<target name="tests-compile11">
- <javac destdir="${build.tests.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
+ <javac destdir="${tests.build.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
- <pathelement path="${build.dev.lib.dir}/ws-t.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-t-api.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-t11.jar"/>
- <pathelement path="${build.dev.lib.dir}/ws-t11-api.jar"/>
+ <pathelement path="${build.lib.dir}/ws-t.jar"/>
+ <pathelement path="${build.lib.dir}/ws-t-api.jar"/>
+ <pathelement path="${build.lib.dir}/ws-t11.jar"/>
+ <pathelement path="${build.lib.dir}/ws-t11-api.jar"/>
<path refid="tests.lib.path"/>
<path refid="build.classpath"/>
<path refid="ws-c.path"/>
@@ -371,37 +381,37 @@
</target>
<target name="tests-webapps" depends="tests-compile">
- <jar jarfile="${build.tests.lib.dir}/ws-t-tests.jar">
- <fileset dir="${build.tests.classes.dir}" excludes="com/arjuna/qa/junit/*.class"/>
+ <jar jarfile="${tests.build.lib.dir}/ws-t-tests.jar">
+ <fileset dir="${tests.build.classes.dir}" excludes="com/arjuna/qa/junit/*.class"/>
</jar>
- <copy file="${tests.dd.dir}/ws-t-tests_web-app.xml" tofile="${build.tests.dd.dir}/web-app.xml">
+ <copy file="${tests.dd.dir}/ws-t-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app.xml">
</copy>
- <war warfile="${build.tests.webapps.dir}/ws-t-tests.war" webxml="${build.tests.dd.dir}/web-app.xml">
+ <war warfile="${tests.build.webapps.dir}/ws-t-tests.war" webxml="${tests.build.dd.dir}/web-app.xml">
</war>
- <copy file="${tests.dd.dir}/ws-t11-tests_web-app.xml" tofile="${build.tests.dd.dir}/web-app11.xml">
+ <copy file="${tests.dd.dir}/ws-t11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml">
</copy>
- <war warfile="${build.tests.webapps.dir}/ws-t11-tests.war" webxml="${build.tests.dd.dir}/web-app11.xml">
+ <war warfile="${tests.build.webapps.dir}/ws-t11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml">
</war>
- <ear earfile="${build.tests.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t-tests_application.xml">
+ <ear earfile="${tests.build.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t-tests_application.xml">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${build.tests.webapps.dir}" includes="ws-t-tests.war ws-t11-tests.war"/>
- <fileset dir="${build.tests.lib.dir}" includes="ws-t-tests.jar"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="ws-t-tests.war ws-t11-tests.war"/>
+ <fileset dir="${tests.build.lib.dir}" includes="ws-t-tests.jar"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
</target>
<target name="tests-webapps11" depends="tests-compile11">
- <jar jarfile="${build.tests.lib.dir}/ws-t-tests.jar">
- <fileset dir="${build.tests.classes.dir}"/>
+ <jar jarfile="${tests.build.lib.dir}/ws-t-tests.jar">
+ <fileset dir="${tests.build.classes.dir}"/>
</jar>
- <copy file="${tests.dd.dir}/ws-t11-tests_web-app.xml" tofile="${build.tests.dd.dir}/web-app11.xml">
+ <copy file="${tests.dd.dir}/ws-t11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml">
</copy>
- <war warfile="${build.tests.webapps.dir}/ws-t11-tests.war" webxml="${build.tests.dd.dir}/web-app11.xml">
+ <war warfile="${tests.build.webapps.dir}/ws-t11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml">
</war>
- <ear earfile="${build.tests.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t11-tests_application.xml">
+ <ear earfile="${tests.build.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t11-tests_application.xml">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${build.tests.webapps.dir}" includes="ws-t11-tests.war"/>
- <fileset dir="${build.tests.lib.dir}" includes="ws-t-tests.jar"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="ws-t11-tests.war"/>
+ <fileset dir="${tests.build.lib.dir}" includes="ws-t-tests.jar"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
</target>
@@ -412,11 +422,11 @@
<target name="tests-both" depends="tests-webapps"/>
<target name="tests-deploy" depends="tests-webapps, tests-undeploy">
- <copy file="${build.tests.webapps.dir}/ws-t-tests.ear" tofile="${deploy.dir}/ws-t-tests.ear"/>
+ <copy file="${tests.build.webapps.dir}/ws-t-tests.ear" tofile="${deploy.dir}/ws-t-tests.ear"/>
</target>
<target name="tests-deploy11" depends="tests-webapps11, tests-undeploy">
- <copy file="${build.tests.webapps.dir}/ws-t-tests.ear" tofile="${deploy.dir}/ws-t-tests.ear"/>
+ <copy file="${tests.build.webapps.dir}/ws-t-tests.ear" tofile="${deploy.dir}/ws-t-tests.ear"/>
</target>
<target name="tests-undeploy">
Modified: labs/jbosstm/trunk/XTS/WSAS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-03-03 15:28:38 UTC (rev 31915)
+++ labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-03-03 17:13:55 UTC (rev 31916)
@@ -19,11 +19,15 @@
(C) 2005-2006,
@author JBoss Inc.
-->
-<project name="WSAS" default="wsas.jar" basedir=".">
+<project name="WSAS" default="jar" basedir=".">
<!-- Set module name -->
<property name="modulename" value="wsas"/>
+ <!-- set root before including shared build -->
+
+ <property name="root.dir" location = ".."/>
+
<import file="../sharedbuild.xml"/>
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
@@ -38,34 +42,36 @@
<!-- Set internal property defaults -->
<!-- Path names -->
- <property name="wsas.src" value="classes"/>
- <property name="wsas.dest.root" value="build"/>
- <property name="wsas.dest" value="${wsas.dest.root}/classes"/>
- <property name="wsas.jar.dest" value="${wsas.dest.root}/lib"/>
- <property name="wsas.htdocs.dest" value="build/htdocs"/>
+ <property name="src.dir" value="classes"/>
+ <property name="build.dir" value="build"/>
+ <property name="build.classes.dir" value="${build.dir}/classes"/>
+ <property name="build.lib.dir" value="${build.dir}/lib"/>
+ <property name="build.htdocs.dir" value="${build.dir}/htdocs"/>
+
<!-- test path names -->
- <property name="wsas.tests.src" value="tests/classes"/>
- <property name="wsas.tests.dd" value="tests/dd"/>
- <property name="wsas.tests.dest.root" value="tests/build"/>
- <property name="wsas.tests.dest" value="tests/build/classes"/>
- <property name="wsas.tests.dd.dest" value="tests/build/dd"/>
- <property name="wsas.tests.webapps.dest" value="tests/build/webapps"/>
- <property name="wsas.tests.jar.dest" value="tests/build/lib"/>
+ <property name="tests.src.dir" value="tests/classes"/>
+ <property name="tests.dd.dir" value="tests/dd"/>
+ <property name="tests.build.dir" value="tests/build"/>
+ <property name="tests.build.classes.dir" value="${tests.build.dir}/classes"/>
+ <property name="tests.build.lib.dir" value="${tests.build.dir}/lib"/>
+ <property name="tests.build.dd.dir" value="${tests.build.dir}/dd"/>
+ <property name="tests.build.webapps.dir" value="${tests.build.dir}/webapps"/>
+
<!-- tests library and path to library -->
<property name="tests.libs" value="junit.jar"/>
<property name="tests.depend.libs" value="${tests.libs} ${modulename}.jar"/>
- <path id="wsas.tests.lib.path">
+ <path id="tests.lib.path">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
</path>
<!-- Initialisation -->
- <target name="wsas.init">
+ <target name="init">
<!-- Define default build properties -->
<tstamp>
- <format property="wsas.date" pattern="yyyy/mm/dd hh:mm aa"/>
+ <format property="date" pattern="yyyy/mm/dd hh:mm aa"/>
</tstamp>
<!-- Compile with debugging? -->
<condition property="debug" value="no">
@@ -79,52 +85,52 @@
</condition>
<property name="deprecation" value="no"/>
<!-- Make the destination directory -->
- <mkdir dir="${wsas.dest}"/>
+ <mkdir dir="${build.classes.dir}"/>
</target>
<!-- Compilation targets -->
- <target name="wsas.compile" depends="wsas.init">
+ <target name="compile" depends="init">
<echo message="Compiling module"/>
- <javac srcdir="${wsas.src}" destdir="${wsas.dest}"
+ <javac srcdir="${src.dir}" destdir="${build.classes.dir}"
debug="${debug}" deprecation="${deprecation}"
classpathref = "build.classpath"/>
</target>
<!-- htdocs paths -->
- <path id="wsas.htdocs.path" path="${wsas.src}"/>
+ <path id="htdocs.path" path="${src.dir}"/>
<!-- Build htdocs for just mw, or mw and mwlabs -->
- <property name="wsas.htdocs.list" value="*"/>
+ <property name="htdocs.list" value="*"/>
<!-- Jar targets -->
- <target name="wsas.jar" depends="wsas.compile, wsas.htdocs, wsas.generateresourcebundle">
+ <target name="jar" depends="compile, htdocs, generateresourcebundle">
<echo message="Building jar file"/>
- <mkdir dir="${wsas.jar.dest}"/>
- <jar jarfile="${wsas.jar.dest}/${modulename}.jar" basedir="${wsas.dest}" excludes="com/arjuna/qa/junit/*.class"/>
+ <mkdir dir="${build.lib.dir}"/>
+ <jar jarfile="${build.lib.dir}/${modulename}.jar" basedir="${build.classes.dir}" excludes="com/arjuna/qa/junit/*.class"/>
</target>
- <target name="wsas.htdocs"
- depends="wsas.init">
+ <target name="htdocs"
+ depends="init">
<echo message="Building htdocs "/>
- <mkdir dir="${wsas.htdocs.dest}"/>
+ <mkdir dir="${build.htdocs.dir}"/>
<javadoc
- sourcepathref="wsas.htdocs.path"
- destdir="${wsas.htdocs.dest}"
- packagenames="${wsas.htdocs.list}"
+ sourcepathref="htdocs.path"
+ destdir="${build.htdocs.dir}"
+ packagenames="${htdocs.list}"
>
<classpath>
<path refid="build.classpath"/>
- <path path="${wsas.src}"/>
+ <path path="${src.dir}"/>
</classpath>
</javadoc>
</target>
- <target name="wsas.generateresourcebundle">
+ <target name="generateresourcebundle">
<echo message="Generating WSAS Bundle"/>
- <javadoc sourcepath="${wsas.src}"
+ <javadoc sourcepath="${src.dir}"
packagenames="com.arjuna.*"
failonerror="yes"
private="yes"
@@ -132,7 +138,7 @@
classpath="${build.classpath}">
<doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
<path refid="doclet.classpath"/>
- <param name="-basedir" value="${basedir}/${wsas.dest}"/>
+ <param name="-basedir" value="${basedir}/${build.classes.dir}"/>
<param name="-resourcebundle" value="${wsas.resourcebundle}"/>
</doclet>
</javadoc>
@@ -140,76 +146,69 @@
</target>
<!-- test targets -->
- <target name="wsas.tests.init">
- <delete dir="${wsas.tests.dest.root}"/>
+ <target name="tests.init">
+ <delete dir="${tests.build.dir}"/>
<!-- make the test destination directories -->
- <mkdir dir="${wsas.tests.dest.root}"/>
- <mkdir dir="${wsas.tests.dest}"/>
- <mkdir dir="${wsas.tests.dd.dest}"/>
- <mkdir dir="${wsas.tests.webapps.dest}"/>
- <mkdir dir="${wsas.tests.jar.dest}"/>
+ <mkdir dir="${tests.build.dir}"/>
+ <mkdir dir="${tests.build.classes.dir}"/>
+ <mkdir dir="${tests.build.dd.dir}"/>
+ <mkdir dir="${tests.build.webapps.dir}"/>
+ <mkdir dir="${tests.build.lib.dir}"/>
</target>
<!-- this assumes the required libs have already been built -->
- <target name="wsas.tests.compile" depends="wsas.tests.init">
- <javac destdir="${wsas.tests.dest}" debug="yes" optimize="no">
+ <target name="tests.compile" depends="tests.init">
+ <javac destdir="${tests.build.classes.dir}" debug="yes" optimize="no">
<classpath>
- <pathelement path="${wsas.jar.dest}/${modulename}.jar"/>
- <path refid="wsas.tests.lib.path"/>
+ <pathelement path="${build.lib.dir}/${modulename}.jar"/>
+ <path refid="tests.lib.path"/>
<path refid="build.classpath"/>
</classpath>
- <src path="${wsas.tests.src}"/>
+ <src path="${tests.src.dir}"/>
</javac>
</target>
- <target name="wsas.tests.webapps" depends="wsas.tests.compile">
- <copy file="${wsas.tests.dd}/wsas-tests_web-app.xml" tofile="${wsas.tests.dd.dest}/web-app.xml">
+ <target name="tests.webapps" depends="tests.compile">
+ <copy file="${tests.dd.dir}/wsas-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app.xml">
</copy>
- <jar jarfile="${wsas.tests.jar.dest}/wsas-tests.jar" basedir="${wsas.tests.dest}" excludes="com/arjuna/qa/junit/*.class"/>
- <jar jarfile="${wsas.tests.jar.dest}/xts-test-servlet.jar" basedir="${wsas.tests.dest}" includes="com/arjuna/qa/junit/*.class"/>
- <war warfile="${wsas.tests.webapps.dest}/wsas-tests.war" webxml="${wsas.tests.dd.dest}/web-app.xml">
+ <jar jarfile="${tests.build.lib.dir}/wsas-tests.jar" basedir="${tests.build.classes.dir}" excludes="com/arjuna/qa/junit/*.class"/>
+ <jar jarfile="${tests.build.lib.dir}/xts-test-servlet.jar" basedir="${tests.build.classes.dir}" includes="com/arjuna/qa/junit/*.class"/>
+ <war warfile="${tests.build.webapps.dir}/wsas-tests.war" webxml="${tests.build.dd.dir}/web-app.xml">
</war>
- <ear earfile="${wsas.tests.webapps.dest}/wsas-tests.ear" appxml="${wsas.tests.dd}/wsas-tests_application.xml">
+ <ear earfile="${tests.build.webapps.dir}/wsas-tests.ear" appxml="${tests.dd.dir}/wsas-tests_application.xml">
<!-- we only need to deploy the ext test libs (junit) and
the tests war in JBoss AS 5.0. the rest of the XTS
code is deployed as a sar and the TS code is deployed
in the server lib
-->
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${wsas.tests.webapps.dest}" includes="wsas-tests.war"/>
- <fileset dir="${wsas.tests.jar.dest}" includes="wsas-tests.jar"/>
- <fileset dir="${wsas.tests.jar.dest}" includes="xts-test-servlet.jar"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="wsas-tests.war"/>
+ <fileset dir="${tests.build.lib.dir}" includes="wsas-tests.jar"/>
+ <fileset dir="${tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
</target>
- <target name="wsas.tests.deploy" depends="wsas.tests.webapps, wsas.tests.undeploy">
- <copy file="${wsas.tests.webapps.dest}/wsas-tests.ear" tofile="${deploy.dir}/wsas-tests.ear"/>
+ <target name="tests.deploy" depends="tests.webapps, tests.undeploy">
+ <copy file="${tests.build.webapps.dir}/wsas-tests.ear" tofile="${deploy.dir}/wsas-tests.ear"/>
</target>
- <target name="wsas.tests.undeploy">
+ <target name="tests.undeploy">
<delete file="${deploy.dir}/wsas-tests.ear"/>
</target>
<!-- Clean targets -->
- <target name="wsas.clean">
+ <target name="clean">
<echo message="Cleaning module"/>
- <delete dir="${wsas.dest}"/>
- <delete dir="${wsas.dest.root}"/>
- <delete dir="${wsas.htdocs.dest}"/>
- <delete file="${wsas.jar.dest}/${modulename}.jar"/>
+ <delete dir="${build.classes.dir}"/>
+ <delete dir="${build.dir}"/>
+ <delete dir="${build.htdocs.dir}"/>
+ <delete file="${build.lib.dir}/${modulename}.jar"/>
<!-- delete the test destination directories -->
- <delete dir="${wsas.tests.dest.root}"/>
+ <delete dir="${tests.build.dir}"/>
</target>
- <!-- Short target names -->
- <target name="compile" depends="wsas.compile"/>
- <target name="jar" depends="wsas.jar"/>
- <target name="clean" depends="wsas.clean"/>
- <target name="tests-webapps" depends="wsas.tests.webapps"/>
<!-- production target for 1.1 tests - tests are not version specific -->
- <target name="tests-11" depends="tests-webapps"/>
- <target name="tests-both" depends="tests-webapps"/>
- <target name="tests-deploy" depends="wsas.tests.deploy"/>
- <target name="tests-undeploy" depends="wsas.tests.undeploy"/>
+ <target name="tests-11" depends="tests.webapps"/>
+ <target name="tests-both" depends="tests.webapps"/>
</project>
Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-03-03 15:28:38 UTC (rev 31915)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-03-03 17:13:55 UTC (rev 31916)
@@ -19,11 +19,15 @@
(C) 2005-2006,
@author JBoss Inc.
-->
-<project name="WSCF" default="wscf.war" basedir=".">
+<project name="WSCF" default="war" basedir=".">
<!-- Set module name -->
<property name="modulename" value="wscf"/>
+ <!-- set root before including shared build -->
+
+ <property name="root.dir" location = ".."/>
+
<import file="../sharedbuild.xml"/>
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
@@ -34,31 +38,33 @@
<!-- internal paths and jars -->
- <property name="wscf.src" value="classes"/>
- <property name="wscf.src10" value="classes10"/>
- <property name="wscf.src11" value="classes11"/>
- <property name="wscf.dest.root" value="build"/>
- <property name="wscf.dest" value="build/classes"/>
- <property name="wscf.dest10" value="build/classes10/classes"/>
- <property name="wscf.dest11" value="build/classes11/classes"/>
- <property name="wscf.jar.dest" value="build/lib"/>
- <property name="wscf.war.dest" value="build/webapps"/>
- <property name="wscf.htdocs.dest" value="build/htdocs"/>
+ <property name="src.dir" value="classes"/>
+ <property name="src10.dir" value="classes10"/>
+ <property name="src11.dir" value="classes11"/>
+ <property name="build.dir" value="build"/>
+ <property name="build.classes.dir" value="${build.dir}/classes"/>
+ <property name="build.classes10.dir" value="${build.dir}/classes10/classes"/>
+ <property name="build.classes11.dir" value="${build.dir}/classes11/classes"/>
+ <property name="build.lib.dir" value="${build.dir}/lib"/>
+ <property name="build.webapps.dir" value="${build.dir}/webapps"/>
+ <property name="htdocs.dest" value="${build.dir}/htdocs"/>
+
<!-- test path names -->
- <property name="wscf.tests.src" value="tests/classes"/>
- <property name="wscf.tests.dd" value="tests/dd"/>
- <property name="wscf.tests.dest.root" value="tests/build"/>
- <property name="wscf.tests.dest" value="tests/build/classes"/>
- <property name="wscf.tests.dd.dest" value="tests/build/dd"/>
- <property name="wscf.tests.webapps.dest" value="tests/build/webapps"/>
- <property name="wscf.tests.jar.dest" value="tests/build/lib"/>
+ <property name="tests.src.dir" value="tests/classes"/>
+ <property name="tests.dd.dir" value="tests/dd"/>
+ <property name="tests.build.dir" value="tests/build"/>
+ <property name="tests.build.classes.dir" value="${tests.build.dir}/classes"/>
+ <property name="tests,build.dd.dir" value="${tests.build.dir}/dd"/>
+ <property name="tests.build.webapps.dir" value="${tests.build.dir}/webapps"/>
+ <property name="tests.build.lib.dir" value="${tests.build.dir}/lib"/>
+
<!--sibling module directories and jars -->
- <property name="wsas.jar.dest" value="../WSAS/build/lib"/>
- <property name="wsas.tests.build.lib.dir" value="../WSAS/tests/build/lib"/>
- <property name="wsc.jar.dest" value="../WS-C/build/dev/lib"/>
+ <property name="wsas.build.lib.dir" value="${wsas.dir}/build/lib"/>
+ <property name="wsas.tests.build.lib.dir" value="${wsas.dir}/tests/build/lib"/>
+ <property name="wsc.build.lib.dir" value="${ws-c.dir}/build/lib"/>
<property name="wsas.libs" value="wsas.jar"/>
<property name="wsc.libs" value="ws-c.jar"/>
@@ -67,73 +73,70 @@
<property name="wsc10.api.libs" value="ws-c10-api.jar"/>
<property name="wsc11.libs" value="ws-c11.jar"/>
- <property name="wscf.resourcebundle"
- value="wscf_msg_en_US.properties"/>
+ <property name="wscf.resourcebundle" value="wscf_msg_en_US.properties"/>
<path id="wscf.lib.classpath">
<path refid="build.classpath"/>
- <fileset dir="${wsas.jar.dest}" includes="${wsas.libs}"/>
- <fileset dir="${wsc.jar.dest}" includes="${wsc.libs} ${wsc.api.libs}"/>
+ <fileset dir="${wsas.build.lib.dir}" includes="${wsas.libs}"/>
+ <fileset dir="${wsc.build.lib.dir}" includes="${wsc.libs} ${wsc.api.libs}"/>
</path>
<!-- tests library and path to library -->
<property name="tests.libs" value="junit.jar"/>
- <property name="tests.depend.libs" value="${tests.libs} ${modulename}.jar"/>
- <property name="tests.depend.libs" value="${tests.libs} ${modulename}.jar"/>
- <path id="wscf.tests.lib.path">
+ <path id="tests.lib.path">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<path refid="wscf.lib.classpath"/>
</path>
<!-- Initialisation -->
- <target name="wscf.init">
+ <target name="init">
<!-- Define default build properties -->
<tstamp>
<format property="wscf.date" pattern="yyyy/mm/dd hh:mm aa"/>
</tstamp>
<!-- Make the destination directory -->
- <mkdir dir="${wscf.dest}"/>
- <mkdir dir="${wscf.dest10}"/>
- <mkdir dir="${wscf.dest11}"/>
- <mkdir dir="${wscf.war.dest}"/>
+ <mkdir dir="${build.classes.dir}"/>
+ <mkdir dir="${build.classes10.dir}"/>
+ <mkdir dir="${build.classes11.dir}"/>
+ <mkdir dir="${build.webapps.dir}"/>
</target>
<!-- Compilation targets -->
- <target name="wscf.compile" depends="wscf.compile10, wscf.compile11"/>
- <target name="wscf.compile11" depends="wscf.compile-generic">
+ <target name="compile" depends="compile10, compile11"/>
+ <target name="compile11" depends="compile-generic">
<echo message="Compiling module 1.1 code"/>
- <javac srcdir="${wscf.src11}"
- destdir="${wscf.dest11}"
+ <javac srcdir="${src11.dir}"
+ destdir="${build.classes11.dir}"
debug="on">
<classpath>
<path>
- <pathelement path="${wscf.dest}"/>
- <pathelement path="${wsc.jar.dest}/${wsc11.libs}"/>
+ <pathelement path="${build.classes.dir}"/>
+ <pathelement path="${wsc.build.lib.dir}/${wsc11.libs}"/>
</path>
<path refid="wscf.lib.classpath"/>
</classpath>
</javac>
</target>
- <target name="wscf.compile10" depends="wscf.compile-generic">
+ <target name="compile10" depends="compile-generic">
<echo message="Compiling module 1.0 code"/>
- <javac srcdir="${wscf.src10}"
- destdir="${wscf.dest10}"
+ <javac srcdir="${src10.dir}"
+ destdir="${build.classes10.dir}"
debug="on">
<classpath>
<path>
- <pathelement path="${wscf.dest}"/>
- <pathelement path="${wsc.jar.dest}/${wsc10.libs}"/>
- <pathelement path="${wsc.jar.dest}/${wsc10.api.libs}"/>
+ <pathelement path="${build.classes.dir}"/>
+ <pathelement path="${wsc.build.lib.dir}/${wsc10.libs}"/>
+ <pathelement path="${wsc.build.lib.dir}/${wsc10.api.libs}"/>
</path>
<path refid="wscf.lib.classpath"/>
</classpath>
</javac>
</target>
- <target name="wscf.compile-generic" depends="wscf.init">
+ <target name="compile-generic" depends="init">
<echo message="Compiling module generic code"/>
- <javac srcdir="${wscf.src}"
- destdir="${wscf.dest}"
+ <javac srcdir="${src.dir}"
+ destdir="${build.classes.dir}"
debug="on">
<classpath>
<path refid="wscf.lib.classpath"/>
@@ -142,81 +145,80 @@
</target>
<!-- htdocs paths -->
- <path id="wscf.htdocs.path">
+ <path id="htdocs.path">
<pathelement path="classes"/>
</path>
<!-- Build htdocs for just mw, or mw and mwlabs -->
- <property name="wscf.htdocs.list"
- value="*"/>
+ <property name="htdocs.list" value="*"/>
- <target name="wscf.war" depends="wscf.jar">
- <war warfile="${wscf.war.dest}/${modulename}10.war" webxml="xml/wscf_web-app.xml"/>
- <war warfile="${wscf.war.dest}/${modulename}11.war" webxml="xml/wscf11_web-app.xml"/>
+ <target name="war" depends="jar">
+ <war warfile="${build.webapps.dir}/${modulename}10.war" webxml="xml/wscf_web-app.xml"/>
+ <war warfile="${build.webapps.dir}/${modulename}11.war" webxml="xml/wscf11_web-app.xml"/>
</target>
<!-- Jar targets -->
- <target name="wscf.jar" depends="wscf.jar11, wscf.jar10"/>
+ <target name="jar" depends="jar11, jar10"/>
- <target name="wscf.jar11" depends="wscf.jar-generic">
+ <target name="jar11" depends="jar-generic">
<copy file="xml/ArjunaCoreHLS.xml"
- tofile="${wscf.dest11}/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ArjunaCoreHLS.xml"/>
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ArjunaCoreHLS.xml"/>
<copy file="xml/JTAHLS.xml"
- tofile="${wscf.dest11}/com/arjuna/mwlabs/wscf/model/as/coordinator/jta/JTAHLS.xml"/>
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wscf/model/as/coordinator/jta/JTAHLS.xml"/>
<copy file="xml/TwoPhase11HLSImple.xml"
- tofile="${wscf.dest11}/com/arjuna/mwlabs/wscf11/model/twophase/arjunacore/TwoPhaseHLSImple.xml"/>
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wscf11/model/twophase/arjunacore/TwoPhaseHLSImple.xml"/>
<copy file="xml/Sagas11HLSImple.xml"
- tofile="${wscf.dest11}/com/arjuna/mwlabs/wscf11/model/sagas/arjunacore/SagasHLSImple.xml"/>
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wscf11/model/sagas/arjunacore/SagasHLSImple.xml"/>
- <jar jarfile="${wscf.jar.dest}/${modulename}11.jar"
- basedir="${wscf.dest11}">
+ <jar jarfile="${build.lib.dir}/${modulename}11.jar"
+ basedir="${build.classes11.dir}">
</jar>
</target>
- <target name="wscf.jar10" depends="wscf.jar-generic">
+ <target name="jar10" depends="jar-generic">
<copy file="xml/ArjunaCoreHLS.xml"
- tofile="${wscf.dest10}/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ArjunaCoreHLS.xml"/>
+ tofile="${build.classes10.dir}/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ArjunaCoreHLS.xml"/>
<copy file="xml/JTAHLS.xml"
- tofile="${wscf.dest10}/com/arjuna/mwlabs/wscf/model/as/coordinator/jta/JTAHLS.xml"/>
+ tofile="${build.classes10.dir}/com/arjuna/mwlabs/wscf/model/as/coordinator/jta/JTAHLS.xml"/>
<copy file="xml/TwoPhaseHLSImple.xml"
- tofile="${wscf.dest10}/com/arjuna/mwlabs/wscf/model/twophase/arjunacore/TwoPhaseHLSImple.xml"/>
+ tofile="${build.classes10.dir}/com/arjuna/mwlabs/wscf/model/twophase/arjunacore/TwoPhaseHLSImple.xml"/>
<copy file="xml/SagasHLSImple.xml"
- tofile="${wscf.dest10}/com/arjuna/mwlabs/wscf/model/sagas/arjunacore/SagasHLSImple.xml"/>
+ tofile="${build.classes10.dir}/com/arjuna/mwlabs/wscf/model/sagas/arjunacore/SagasHLSImple.xml"/>
<copy file="xml/JTAHLSImple.xml"
- tofile="${wscf.dest10}/com/arjuna/mwlabs/wscf/model/jta/arjunajta/JTAHLSImple.xml"/>
+ tofile="${build.classes10.dir}/com/arjuna/mwlabs/wscf/model/jta/arjunajta/JTAHLSImple.xml"/>
- <jar jarfile="${wscf.jar.dest}/${modulename}10.jar"
- basedir="${wscf.dest10}">
+ <jar jarfile="${build.lib.dir}/${modulename}10.jar"
+ basedir="${build.classes10.dir}">
</jar>
</target>
- <target name="wscf.jar-generic" depends="wscf.compile, wscf.htdocs, wscf.generateresourcebundle">
+ <target name="jar-generic" depends="compile, htdocs, generateresourcebundle">
<echo message="Building jar files"/>
- <mkdir dir="${wscf.jar.dest}"/>
- <jar jarfile="${wscf.jar.dest}/${modulename}.jar"
- basedir="${wscf.dest}">
+ <mkdir dir="${build.lib.dir}"/>
+ <jar jarfile="${build.lib.dir}/${modulename}.jar"
+ basedir="${build.classes.dir}">
</jar>
</target>
- <target name="wscf.htdocs"
- depends="wscf.init">
+ <target name="htdocs"
+ depends="init">
<echo message="Building htdocs "/>
- <mkdir dir="${wscf.htdocs.dest}"/>
+ <mkdir dir="${htdocs.dest}"/>
<javadoc
- sourcepathref="wscf.htdocs.path"
- destdir="${wscf.htdocs.dest}"
- packagenames="${wscf.htdocs.list}"
+ sourcepathref="htdocs.path"
+ destdir="${htdocs.dest}"
+ packagenames="${htdocs.list}"
>
<classpath>
<path refid="wscf.lib.classpath"/>
- <path path="${wscf.src}"/>
+ <path path="${src.dir}"/>
</classpath>
</javadoc>
</target>
- <target name="wscf.generateresourcebundle">
+ <target name="generateresourcebundle">
<echo message="Generating WSCF Bundle"/>
@@ -226,21 +228,21 @@
defaultexcludes="yes"
classpath="${build.classpath}">
- <packageset dir="${wscf.src}" defaultexcludes="yes">
+ <packageset dir="${src.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
- <packageset dir="${wscf.src10}" defaultexcludes="yes">
+ <packageset dir="${src10.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
- <packageset dir="${wscf.src11}" defaultexcludes="yes">
+ <packageset dir="${src11.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
<doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
<path refid="doclet.classpath"/>
- <param name="-basedir" value="${basedir}/${wscf.dest}"/>
+ <param name="-basedir" value="${basedir}/${build.classes.dir}"/>
<param name="-resourcebundle" value="${wscf.resourcebundle}"/>
</doclet>
</javadoc>
@@ -248,124 +250,114 @@
</target>
<!-- test targets -->
- <target name="wscf.tests.init">
+ <target name="tests.init">
<!-- delete the test destination directories -->
- <delete dir="${wscf.tests.dest.root}"/>
+ <delete dir="${tests.build.dir}"/>
<!-- make the test destination directories -->
- <mkdir dir="${wscf.tests.dest.root}"/>
- <mkdir dir="${wscf.tests.dest}"/>
- <mkdir dir="${wscf.tests.dd.dest}"/>
- <mkdir dir="${wscf.tests.webapps.dest}"/>
- <mkdir dir="${wscf.tests.jar.dest}"/>
+ <mkdir dir="${tests.build.dir}"/>
+ <mkdir dir="${tests.build.classes.dir}"/>
+ <mkdir dir="${tests,build.dd.dir}"/>
+ <mkdir dir="${tests.build.webapps.dir}"/>
+ <mkdir dir="${tests.build.lib.dir}"/>
</target>
<!-- this assumes the required libs have already been built-->
- <target name="wscf.tests.compile" depends="wscf.tests.init">
- <javac destdir="${wscf.tests.dest}" debug="yes" optimize="no">
+ <target name="tests.compile" depends="tests.init">
+ <javac destdir="${tests.build.classes.dir}" debug="yes" optimize="no">
<classpath>
- <pathelement path="${wscf.jar.dest}/${modulename}.jar"/>
- <pathelement path="${wscf.jar.dest}/${modulename}10.jar"/>
- <pathelement path="${wscf.jar.dest}/${modulename}11.jar"/>
- <pathelement path="${wsc.jar.dest}/${wsc10.libs}"/>
- <pathelement path="${wsc.jar.dest}/${wsc10.api.libs}"/>
- <pathelement path="${wsc.jar.dest}/${wsc11.libs}"/>
- <path refid="wscf.tests.lib.path"/>
+ <pathelement path="${build.lib.dir}/${modulename}.jar"/>
+ <pathelement path="${build.lib.dir}/${modulename}10.jar"/>
+ <pathelement path="${build.lib.dir}/${modulename}11.jar"/>
+ <pathelement path="${wsc.build.lib.dir}/${wsc10.libs}"/>
+ <pathelement path="${wsc.build.lib.dir}/${wsc10.api.libs}"/>
+ <pathelement path="${wsc.build.lib.dir}/${wsc11.libs}"/>
+ <path refid="tests.lib.path"/>
<path refid="wscf.lib.classpath"/>
</classpath>
- <src path="${wscf.tests.src}"/>
+ <src path="${tests.src.dir}"/>
</javac>
</target>
<!-- this assumes the required libs have already been built-->
- <target name="wscf.tests.compile11" depends="wscf.tests.init">
- <javac destdir="${wscf.tests.dest}" debug="yes" optimize="no">
+ <target name="tests.compile11" depends="tests.init">
+ <javac destdir="${tests.build.classes.dir}" debug="yes" optimize="no">
<classpath>
- <pathelement path="${wscf.jar.dest}/${modulename}.jar"/>
- <pathelement path="${wscf.jar.dest}/${modulename}11.jar"/>
- <pathelement path="${wsc.jar.dest}/${wsc11.libs}"/>
- <path refid="wscf.tests.lib.path"/>
+ <pathelement path="${build.lib.dir}/${modulename}.jar"/>
+ <pathelement path="${build.lib.dir}/${modulename}11.jar"/>
+ <pathelement path="${wsc.build.lib.dir}/${wsc11.libs}"/>
+ <path refid="tests.lib.path"/>
<path refid="wscf.lib.classpath"/>
</classpath>
- <src path="${wscf.tests.src}"/>
+ <src path="${tests.src.dir}"/>
<exclude name="com/arjuna/wscf/**"/>
</javac>
</target>
- <target name="wscf.tests.webapps" depends="wscf.tests.compile">
- <copy file="${wscf.tests.dd}/wscf-tests_web-app.xml" tofile="${wscf.tests.dd.dest}/web-app.xml">
+ <target name="tests.webapps" depends="tests.compile">
+ <copy file="${tests.dd.dir}/wscf-tests_web-app.xml" tofile="${tests,build.dd.dir}/web-app.xml">
</copy>
- <copy file="${wscf.tests.dd}/wscf11-tests_web-app.xml" tofile="${wscf.tests.dd.dest}/web-app11.xml">
+ <copy file="${tests.dd.dir}/wscf11-tests_web-app.xml" tofile="${tests,build.dd.dir}/web-app11.xml">
</copy>
- <jar jarfile="${wscf.tests.webapps.dest}/wscf-tests.jar">
- <fileset dir="${wscf.tests.dest}"/>
+ <jar jarfile="${tests.build.webapps.dir}/wscf-tests.jar">
+ <fileset dir="${tests.build.classes.dir}"/>
</jar>
- <war warfile="${wscf.tests.webapps.dest}/wscf-tests.war" webxml="${wscf.tests.dd.dest}/web-app.xml"/>
- <war warfile="${wscf.tests.webapps.dest}/wscf11-tests.war" webxml="${wscf.tests.dd.dest}/web-app11.xml"/>
- <ear earfile="${wscf.tests.webapps.dest}/wscf-tests.ear" appxml="${wscf.tests.dd}/wscf-tests_application.xml">
+ <war warfile="${tests.build.webapps.dir}/wscf-tests.war" webxml="${tests,build.dd.dir}/web-app.xml"/>
+ <war warfile="${tests.build.webapps.dir}/wscf11-tests.war" webxml="${tests,build.dd.dir}/web-app11.xml"/>
+ <ear earfile="${tests.build.webapps.dir}/wscf-tests.ear" appxml="${tests.dd.dir}/wscf-tests_application.xml">
<!-- we only need to deploy the ext test libs (junit) and
the tests war in JBoss AS 5.0. the rest of the XTS
code is deployed as a sar and the TS code is deployed
in the server lib
-->
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${wscf.tests.webapps.dest}" includes="wscf-tests.war wscf11-tests.war wscf-tests.jar"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="wscf-tests.war wscf11-tests.war wscf-tests.jar"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
</target>
- <target name="wscf.tests.webapps11" depends="wscf.tests.compile11">
- <copy file="${wscf.tests.dd}/wscf11-tests_web-app.xml" tofile="${wscf.tests.dd.dest}/web-app11.xml">
+ <target name="tests.webapps11" depends="tests.compile11">
+ <copy file="${tests.dd.dir}/wscf11-tests_web-app.xml" tofile="${tests,build.dd.dir}/web-app11.xml">
</copy>
- <jar jarfile="${wscf.tests.webapps.dest}/wscf-tests.jar">
- <fileset dir="${wscf.tests.dest}"/>
+ <jar jarfile="${tests.build.webapps.dir}/wscf-tests.jar">
+ <fileset dir="${tests.build.classes.dir}"/>
</jar>
- <war warfile="${wscf.tests.webapps.dest}/wscf11-tests.war" webxml="${wscf.tests.dd.dest}/web-app11.xml"/>
- <ear earfile="${wscf.tests.webapps.dest}/wscf-tests.ear" appxml="${wscf.tests.dd}/wscf11-tests_application.xml">
+ <war warfile="${tests.build.webapps.dir}/wscf11-tests.war" webxml="${tests,build.dd.dir}/web-app11.xml"/>
+ <ear earfile="${tests.build.webapps.dir}/wscf-tests.ear" appxml="${tests.dd.dir}/wscf11-tests_application.xml">
<!-- we only need to deploy the ext test libs (junit) and
the tests war in JBoss AS 5.0. the rest of the XTS
code is deployed as a sar and the TS code is deployed
in the server lib
-->
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${wscf.tests.webapps.dest}" includes="wscf11-tests.war wscf-tests.jar"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="wscf11-tests.war wscf-tests.jar"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
</target>
- <target name="wscf.tests.deploy" depends="wscf.tests.webapps, wscf.tests.undeploy">
- <copy file="${wscf.tests.webapps.dest}/wscf-tests.ear" tofile="${deploy.dir}/wscf-tests.ear"/>
+ <target name="tests.deploy" depends="tests.webapps, tests.undeploy">
+ <copy file="${tests.build.webapps.dir}/wscf-tests.ear" tofile="${deploy.dir}/wscf-tests.ear"/>
</target>
- <target name="wscf.tests.deploy11" depends="wscf.tests.webapps11, wscf.tests.undeploy">
- <copy file="${wscf.tests.webapps.dest}/wscf-tests.ear" tofile="${deploy.dir}/wscf-tests.ear"/>
+ <target name="tests.deploy11" depends="tests.webapps11, tests.undeploy">
+ <copy file="${tests.build.webapps.dir}/wscf-tests.ear" tofile="${deploy.dir}/wscf-tests.ear"/>
</target>
- <target name="wscf.tests.undeploy">
+ <target name="tests.undeploy">
<delete file="${deploy.dir}/wscf-tests.ear"/>
</target>
<!-- Clean targets -->
- <target name="wscf.clean">
+ <target name="clean">
<echo message="Cleaning module"/>
- <delete dir="${wscf.dest}"/>
- <delete dir="${wscf.dest.root}"/>
- <delete dir="${wscf.htdocs.dest}"/>
- <delete file="${wscf.jar.dest}/${modulename}.jar"/>
+ <delete dir="${build.classes.dir}"/>
+ <delete dir="${build.dir}"/>
+ <delete dir="${htdocs.dest}"/>
+ <delete file="${build.lib.dir}/${modulename}.jar"/>
<!-- delete the test destination directories -->
- <delete dir="${wscf.tests.dest.root}"/>
+ <delete dir="${tests.build.dir}"/>
</target>
- <!-- Short target names -->
- <target name="compile" depends="wscf.compile"/>
- <target name="jar" depends="wscf.jar"/>
- <target name="war" depends="wscf.war"/>
- <target name="clean" depends="wscf.clean"/>
- <target name="tests-webapps" depends="wscf.tests.webapps"/>
- <target name="tests-webapps11" depends="wscf.tests.webapps11"/>
<!-- production target for 1.1 tests -->
- <target name="tests-11" depends="tests-webapps11"/>
- <target name="tests-both" depends="tests-webapps"/>
- <target name="tests-deploy" depends="wscf.tests.deploy"/>
- <target name="tests-deploy11" depends="tests-webapps11"/>
- <target name="tests-undeploy" depends="wscf.tests.undeploy"/>
+ <target name="tests-11" depends="tests.webapps11"/>
+ <target name="tests-both" depends="tests.webapps"/>
</project>
Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-03-03 15:28:38 UTC (rev 31915)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-03-03 17:13:55 UTC (rev 31916)
@@ -19,11 +19,15 @@
(C) 2005-2006,
@author JBoss Inc.
-->
-<project name="WSTX" default="wstx.war" basedir=".">
+<project name="WSTX" default="war" basedir=".">
<!-- Set module name -->
<property name="modulename" value="wstx"/>
+ <!-- set root before including shared build -->
+
+ <property name="root.dir" location = ".."/>
+
<import file="../sharedbuild.xml"/>
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
@@ -34,17 +38,27 @@
<!-- internal paths and jars -->
- <property name="wstx.src" value="classes"/>
- <property name="wstx.src10" value="classes10"/>
- <property name="wstx.src11" value="classes11"/>
- <property name="wstx.src11" value="build"/>
- <property name="wstx.dest" value="build/classes"/>
- <property name="wstx.dest10" value="build/classes10/classes"/>
- <property name="wstx.dest11" value="build/classes11/classes"/>
- <property name="wstx.webapps.dest" value="build/webapps"/>
- <property name="wstx.jar.dest" value="build/lib"/>
- <property name="wstx.htdocs.dest" value="build/htdocs"/>
+ <property name="src.dir" value="classes"/>
+ <property name="src10.dir" value="classes10"/>
+ <property name="src11.dir" value="classes11"/>
+ <property name="build.dir" value="build"/>
+ <property name="build.classes.dir" value="${build.dir}/classes"/>
+ <property name="build.classes10.dir" value="${build.dir}/classes10/classes"/>
+ <property name="build.classes11.dir" value="${build.dir}/classes11/classes"/>
+ <property name="build.webapps.dir" value="${build.dir}/webapps"/>
+ <property name="build.lib.dir" value="${build.dir}/lib"/>
+ <property name="build.htdocs.dir" value="${build.dir}/htdocs"/>
+ <property name="tests.src.dir" value="tests/classes"/>
+ <property name="tests.dd.dir" value="tests/dd"/>
+
+ <property name="tests.build.dir" value="tests/build"/>
+ <property name="tests.build.classes.dir" value="${tests.build.dir}/classes"/>
+ <property name="tests.build.dd.dir" value="${tests.build.dir}/dd"/>
+ <property name="tests.build.webapps.dir" value="${tests.build.dir}/webapps"/>
+ <property name="tests.build.lib.dir" value="${tests.build.dir}/lib"/>
+
+
<!-- classes provided for clients via api jars -->
<property name="wstx.api.classes" value="com/arjuna/mw/wst/TxContext.class"/>
<property name="wstx10.api.classes" value="com/arjuna/mw/wst/UserTransaction.class
@@ -70,15 +84,38 @@
com/arjuna/mw/wst11/service/JaxWSSubordinateHeaderContextProcessor.class
com/arjuna/mw/wst11/service/JaxBaseHeaderContextProcessor.class"/>
- <property name="com.arjuna.mwlabs.wstx.tests.src" value="tests/classes"/>
- <property name="wstx.tests.dd" value="tests/dd"/>
- <property name="wstx.tests.dest.root" value="tests/build"/>
- <property name="wstx.tests.dest" value="tests/build/classes"/>
- <property name="wstx.tests.dd.dest" value="tests/build/dd"/>
- <property name="wstx.tests.webapps.dest" value="tests/build/webapps"/>
- <property name="wstx.tests.jar.dest" value="tests/build/lib"/>
+ <property name="tests.libs" value="junit.jar"/>
+ <path id="tests.lib.path">
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
+ </path>
+ <property name="javac.debug" value="on"/>
+ <property name="javac.optimize" value="off"/>
+
+ <path id="com.arjuna.mwlabs.wstx.tests.lib.path">
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
+ <path refid="build.classpath"/>
+ </path>
+
+ <property name="wstx.libs" value="${modulename}.jar"/>
+ <property name="wstx10.libs" value="${modulename}10.jar"/>
+ <property name="wstx11.libs" value="${modulename}11.jar"/>
+ <property name="wstx.all.libs" value="${wstx.libs} ${wstx10.libs} ${wstx11.libs}"/>
+
+ <property name="wstx.resourcebundle" value="wstx_msg_en_US.properties"/>
+
+ <!--Set external directories -->
+
+ <property name="wsas.build.lib.dir" value="${wsas.dir}/build/lib"/>
+ <property name="wsc.build.lib.dir" value="${ws-c.dir}/build/lib"/>
+ <property name="wsc.build.dd.dir" value="${ws-c.dir}/build/dd"/>
+ <property name="wscf.build.lib.dir" value="${wscf.dir}/build/lib"/>
+ <property name="wst.build.lib.dir" value="${ws-t.dir}/build/lib"/>
+ <property name="wst.build.dd.dir" value="${ws-t.dir}/build/dd"/>
+
+ <property name="wsas.test.build.lib.dir" value="${wsas.dir}/tests/build/lib"/>
+
<!--sibling module directories and jars -->
<property name="wsas.libs" value="wsas.jar"/>
@@ -99,191 +136,162 @@
<property name="wst11.libs" value="ws-t11.jar"/>
<property name="wst11-api.libs" value="ws-t11-api.jar"/>
<property name="wst.all.libs" value="${wst.libs} ${wst10.libs} ${wst11.libs}"/>
- <property name="wstx.libs" value="${modulename}.jar"/>
- <property name="wstx10.libs" value="${modulename}10.jar"/>
- <property name="wstx11.libs" value="${modulename}11.jar"/>
- <property name="wstx.all.libs" value="${wstx.libs} ${wstx10.libs} ${wstx11.libs}"/>
- <property name="tests.libs" value="junit.jar"/>
-
- <path id="tests.lib.path">
- <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- </path>
-
<property name="tests.all.libs" value="${wsas.libs} ${wsc.all.libs} ${wscf.all.libs} ${wst.all.libs} ${wstx.all.libs} ${tests.libs}"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.optimize" value="off"/>
-
- <path id="com.arjuna.mwlabs.wstx.tests.lib.path">
- <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <path refid="build.classpath"/>
- </path>
-
- <property name="wstx.resourcebundle"
- value="wstx_msg_en_US.properties"/>
-
- <!--Set external directories -->
-
- <property name="wsas.build.lib.dir" value="../WSAS/build/lib"/>
- <property name="wsas.test.build.lib.dir" value="../WSAS/tests/build/lib"/>
- <property name="wsc.build.dev.lib.dir" value="../WS-C/build/dev/lib"/>
- <property name="wscf.build.lib.dir" value="../WSCF/build/lib"/>
- <property name="wst.build.dev.lib.dir" value="../WS-T/build/dev/lib"/>
-
- <path id="wstx.lib.classpath">
+ <path id="lib.classpath">
<path refid="build.classpath"/>
<fileset dir="${wsas.build.lib.dir}" includes="${wsas.libs}"/>
- <fileset dir="${wsc.build.dev.lib.dir}" includes="${wsc.libs} ${wsc-api.libs}"/>
+ <fileset dir="${wsc.build.lib.dir}" includes="${wsc.libs} ${wsc-api.libs}"/>
<fileset dir="${wscf.build.lib.dir}" includes="${wscf.libs}"/>
- <fileset dir="${wst.build.dev.lib.dir}" includes="${wst.libs} ${wst-api.libs}"/>
+ <fileset dir="${wst.build.lib.dir}" includes="${wst.libs} ${wst-api.libs}"/>
</path>
- <path id="wstx.lib.classpath10">
- <fileset dir="${wsc.build.dev.lib.dir}" includes="${wsc10.libs} ${wsc10-api.libs}"/>
+ <path id="lib.classpath10">
+ <fileset dir="${wsc.build.lib.dir}" includes="${wsc10.libs} ${wsc10-api.libs}"/>
<fileset dir="${wscf.build.lib.dir}" includes="${wscf10.libs}"/>
- <fileset dir="${wst.build.dev.lib.dir}" includes="${wst10.libs} ${wst10-api.libs}"/>
+ <fileset dir="${wst.build.lib.dir}" includes="${wst10.libs} ${wst10-api.libs}"/>
</path>
- <path id="wstx.lib.classpath11">
- <fileset dir="${wsc.build.dev.lib.dir}" includes="${wsc11.libs}"/>
+ <path id="lib.classpath11">
+ <fileset dir="${wsc.build.lib.dir}" includes="${wsc11.libs}"/>
<fileset dir="${wscf.build.lib.dir}" includes="${wscf11.libs}"/>
- <fileset dir="${wst.build.dev.lib.dir}" includes="${wst11.libs} ${wst11-api.libs}"/>
+ <fileset dir="${wst.build.lib.dir}" includes="${wst11.libs} ${wst11-api.libs}"/>
</path>
<!-- Initialisation -->
- <target name="wstx.init">
+ <target name="init">
<!-- Define default build properties -->
<tstamp>
<format property="com.arjuna.mw.wstx.date" pattern="yyyy/mm/dd hh:mm aa"/>
</tstamp>
<!-- Make the destination directory -->
- <mkdir dir="${wstx.dest}"/>
- <mkdir dir="${wstx.dest10}"/>
- <mkdir dir="${wstx.dest11}"/>
- <mkdir dir="${wstx.webapps.dest}"/>
+ <mkdir dir="${build.classes.dir}"/>
+ <mkdir dir="${build.classes10.dir}"/>
+ <mkdir dir="${build.classes11.dir}"/>
+ <mkdir dir="${build.webapps.dir}"/>
</target>
<!-- Compilation targets -->
- <target name="wstx.compile" depends="wstx.compile11, wstx.compile10"/>
+ <target name="compile" depends="compile11, wstx.compile10"/>
- <target name="wstx.compile10" depends="wstx.compile-generic">
+ <target name="wstx.compile10" depends="compile-generic">
<echo message="Compiling module 1.0 code"/>
- <javac srcdir="${wstx.src10}"
- destdir="${wstx.dest10}"
+ <javac srcdir="${src10.dir}"
+ destdir="${build.classes10.dir}"
debug="on">
<classpath>
<path>
- <pathelement path="${wstx.dest}"/>
+ <pathelement path="${build.classes.dir}"/>
</path>
- <path refid="wstx.lib.classpath10"/>
- <path refid="wstx.lib.classpath"/>
+ <path refid="lib.classpath10"/>
+ <path refid="lib.classpath"/>
</classpath>
</javac>
</target>
- <target name="wstx.compile11" depends="wstx.compile-generic">
+ <target name="compile11" depends="compile-generic">
<echo message="Compiling module 1.1 code"/>
- <javac srcdir="${wstx.src11}"
- destdir="${wstx.dest11}"
+ <javac srcdir="${src11.dir}"
+ destdir="${build.classes11.dir}"
debug="on">
<classpath>
<path>
- <pathelement path="${wstx.dest}"/>
+ <pathelement path="${build.classes.dir}"/>
</path>
- <path refid="wstx.lib.classpath11"/>
- <path refid="wstx.lib.classpath"/>
+ <path refid="lib.classpath11"/>
+ <path refid="lib.classpath"/>
</classpath>
</javac>
</target>
- <target name="wstx.compile-generic" depends="wstx.init">
+ <target name="compile-generic" depends="init">
<echo message="Compiling module generic code"/>
- <javac srcdir="${wstx.src}"
- destdir="${wstx.dest}"
+ <javac srcdir="${src.dir}"
+ destdir="${build.classes.dir}"
debug="on">
<classpath>
- <path refid="wstx.lib.classpath"/>
+ <path refid="lib.classpath"/>
</classpath>
</javac>
</target>
<!-- htdocs paths -->
- <path id="wstx.htdocs.path">
+ <path id="htdocs.path">
<pathelement path="classes"/>
</path>
<!-- Build htdocs for just mw, or mw and mwlabs -->
- <property name="wstx.htdocs.list" value="com.arjuna.mw.*"/>
+ <property name="htdocs.list" value="com.arjuna.mw.*"/>
- <target name="wstx.war" depends="wstx.jar">
- <war warfile="${wstx.webapps.dest}/${modulename}10.war" webxml="xml/wstx_web-app.xml"/>
- <war warfile="${wstx.webapps.dest}/${modulename}11.war" webxml="xml/wstx_web-app11.xml"/>
+ <target name="war" depends="jar">
+ <war warfile="${build.webapps.dir}/${modulename}10.war" webxml="xml/wstx_web-app.xml"/>
+ <war warfile="${build.webapps.dir}/${modulename}11.war" webxml="xml/wstx_web-app11.xml"/>
</target>
<!-- Jar targets -->
- <target name="wstx.jar" depends="wstx.compile, wstx.htdocs, wstx.generateresourcebundle">
+ <target name="jar" depends="compile, htdocs, generateresourcebundle">
<echo message="Building jar file"/>
- <mkdir dir="${wstx.jar.dest}"/>
+ <mkdir dir="${build.lib.dir}"/>
<copy file="xml/UserTwoPhaseTx.xml"
- tofile="${wstx.dest10}/com/arjuna/mwlabs/wstx/model/as/twophase/UserTwoPhaseTx.xml"/>
+ tofile="${build.classes10.dir}/com/arjuna/mwlabs/wstx/model/as/twophase/UserTwoPhaseTx.xml"/>
<copy file="xml/UserTwoPhaseTx.xml"
- tofile="${wstx.dest11}/com/arjuna/mwlabs/wstx11/model/as/twophase/UserTwoPhaseTx.xml"/>
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wstx11/model/as/twophase/UserTwoPhaseTx.xml"/>
<copy file="xml/AtomicTransaction.xml"
- tofile="${wstx.dest10}/com/arjuna/mwlabs/wst/at/ContextFactoryImple.xml"/>
+ tofile="${build.classes10.dir}/com/arjuna/mwlabs/wst/at/ContextFactoryImple.xml"/>
<copy file="xml/BusinessActivity.xml"
- tofile="${wstx.dest10}/com/arjuna/mwlabs/wst/ba/ContextFactoryImple.xml"/>
+ tofile="${build.classes10.dir}/com/arjuna/mwlabs/wst/ba/ContextFactoryImple.xml"/>
<copy file="xml/AtomicTransaction11.xml"
- tofile="${wstx.dest11}/com/arjuna/mwlabs/wst11/at/ContextFactoryImple.xml"/>
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wst11/at/ContextFactoryImple.xml"/>
<copy file="xml/BusinessActivity11.xml"
- tofile="${wstx.dest11}/com/arjuna/mwlabs/wst11/ba/ContextFactoryImple.xml"/>
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wst11/ba/ContextFactoryImple.xml"/>
- <jar jarfile="${wstx.jar.dest}/${modulename}.jar">
- <fileset dir="../WS-C/build/dev/dd/" includes="wsdl/*"/>
- <fileset dir="../WS-T/build/dev/dd/" includes="wsdl/*"/>
- <fileset dir="${wstx.dest}" excludes="${wstx.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/${modulename}.jar">
+ <fileset dir="${wsc.build.dd.dir}" includes="wsdl/*"/>
+ <fileset dir="${wst.build.dd.dir}" includes="wsdl/*"/>
+ <fileset dir="${build.classes.dir}" excludes="${wstx.api.classes}"/>
</jar>
- <jar jarfile="${wstx.jar.dest}/${modulename}-api.jar">
- <fileset dir="${wstx.dest}" includes="${wstx.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/${modulename}-api.jar">
+ <fileset dir="${build.classes.dir}" includes="${wstx.api.classes}"/>
</jar>
- <jar jarfile="${wstx.jar.dest}/${modulename}10.jar">
- <fileset dir="${wstx.dest10}" excludes="${wstx10.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/${modulename}10.jar">
+ <fileset dir="${build.classes10.dir}" excludes="${wstx10.api.classes}"/>
</jar>
- <jar jarfile="${wstx.jar.dest}/${modulename}10-api.jar">
- <fileset dir="${wstx.dest10}" includes="${wstx10.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/${modulename}10-api.jar">
+ <fileset dir="${build.classes10.dir}" includes="${wstx10.api.classes}"/>
</jar>
- <jar jarfile="${wstx.jar.dest}/${modulename}11.jar">
- <fileset dir="${wstx.dest11}" excludes="${wstx11.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/${modulename}11.jar">
+ <fileset dir="${build.classes11.dir}" excludes="${wstx11.api.classes}"/>
</jar>
- <jar jarfile="${wstx.jar.dest}/${modulename}11-api.jar">
- <fileset dir="${wstx.dest11}" includes="${wstx11.api.classes}"/>
+ <jar jarfile="${build.lib.dir}/${modulename}11-api.jar">
+ <fileset dir="${build.classes11.dir}" includes="${wstx11.api.classes}"/>
</jar>
</target>
- <target name="wstx.htdocs"
- depends="wstx.init">
+ <target name="htdocs"
+ depends="init">
<echo message="Building htdocs "/>
- <mkdir dir="${wstx.htdocs.dest}"/>
+ <mkdir dir="${build.htdocs.dir}"/>
<javadoc
- sourcepathref="wstx.htdocs.path"
- destdir="${wstx.htdocs.dest}"
- packagenames="${wstx.htdocs.list}"
+ sourcepathref="htdocs.path"
+ destdir="${build.htdocs.dir}"
+ packagenames="${htdocs.list}"
>
<classpath>
- <path refid="wstx.lib.classpath"/>
- <path path="${wstx.src}"/>
+ <path refid="lib.classpath"/>
+ <path path="${src.dir}"/>
</classpath>
</javadoc>
</target>
- <target name="wstx.generateresourcebundle">
+ <target name="generateresourcebundle">
<echo message="Generating WSTX Bundle"/>
@@ -293,71 +301,71 @@
defaultexcludes="yes"
classpath="${build.classpath}">
- <packageset dir="${wstx.src}" defaultexcludes="yes">
+ <packageset dir="${src.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
- <packageset dir="${wstx.src10}" defaultexcludes="yes">
+ <packageset dir="${src10.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
- <packageset dir="${wstx.src11}" defaultexcludes="yes">
+ <packageset dir="${src11.dir}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
<doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
<path refid="doclet.classpath"/>
- <param name="-basedir" value="${basedir}/${wstx.dest}"/>
+ <param name="-basedir" value="${basedir}/${build.classes.dir}"/>
<param name="-resourcebundle" value="${wstx.resourcebundle}"/>
</doclet>
</javadoc>
</target>
- <target name="wstx.tests.init">
+ <target name="tests.init">
<!-- delete the test destination directories -->
- <delete dir="${wstx.tests.dest.root}"/>
+ <delete dir="${tests.build.dir}"/>
<!-- make the test destination directories -->
- <mkdir dir="${wstx.tests.dest.root}"/>
- <mkdir dir="${wstx.tests.dest}"/>
- <mkdir dir="${wstx.tests.dd.dest}"/>
- <mkdir dir="${wstx.tests.webapps.dest}"/>
- <mkdir dir="${wstx.tests.jar.dest}"/>
+ <mkdir dir="${tests.build.dir}"/>
+ <mkdir dir="${tests.build.classes.dir}"/>
+ <mkdir dir="${tests.build.dd.dir}"/>
+ <mkdir dir="${tests.build.webapps.dir}"/>
+ <mkdir dir="${tests.build.lib.dir}"/>
</target>
<!-- this assumes all the rwuired libs have been built -->
- <target name="wstx.tests.compile" depends="wstx.tests.init">
- <javac destdir="${wstx.tests.dest}" debug="yes" optimize="no">
+ <target name="tests.compile" depends="tests.init">
+ <javac destdir="${tests.build.classes.dir}" debug="yes" optimize="no">
<classpath>
- <pathelement path="${wstx.jar.dest}/${modulename}.jar"/>
- <pathelement path="${wstx.jar.dest}/${modulename}-api.jar"/>
- <pathelement path="${wstx.jar.dest}/${modulename}10.jar"/>
- <pathelement path="${wstx.jar.dest}/${modulename}10-api.jar"/>
- <pathelement path="${wstx.jar.dest}/${modulename}11.jar"/>
- <pathelement path="${wstx.jar.dest}/${modulename}11-api.jar"/>
+ <pathelement path="${build.lib.dir}/${modulename}.jar"/>
+ <pathelement path="${build.lib.dir}/${modulename}-api.jar"/>
+ <pathelement path="${build.lib.dir}/${modulename}10.jar"/>
+ <pathelement path="${build.lib.dir}/${modulename}10-api.jar"/>
+ <pathelement path="${build.lib.dir}/${modulename}11.jar"/>
+ <pathelement path="${build.lib.dir}/${modulename}11-api.jar"/>
<path refid="com.arjuna.mwlabs.wstx.tests.lib.path"/>
- <path refid="wstx.lib.classpath10"/>
- <path refid="wstx.lib.classpath11"/>
- <path refid="wstx.lib.classpath"/>
+ <path refid="lib.classpath10"/>
+ <path refid="lib.classpath11"/>
+ <path refid="lib.classpath"/>
</classpath>
- <src path="${com.arjuna.mwlabs.wstx.tests.src}"/>
+ <src path="${tests.src.dir}"/>
</javac>
</target>
<!-- this assumes all the rwuired libs have been built -->
- <target name="wstx.tests.compile11" depends="wstx.tests.init">
- <javac destdir="${wstx.tests.dest}" debug="yes" optimize="no">
+ <target name="tests.compile11" depends="tests.init">
+ <javac destdir="${tests.build.classes.dir}" debug="yes" optimize="no">
<classpath>
- <pathelement path="${wstx.jar.dest}/${modulename}.jar"/>
- <pathelement path="${wstx.jar.dest}/${modulename}-api.jar"/>
- <pathelement path="${wstx.jar.dest}/${modulename}11.jar"/>
- <pathelement path="${wstx.jar.dest}/${modulename}11-api.jar"/>
+ <pathelement path="${build.lib.dir}/${modulename}.jar"/>
+ <pathelement path="${build.lib.dir}/${modulename}-api.jar"/>
+ <pathelement path="${build.lib.dir}/${modulename}11.jar"/>
+ <pathelement path="${build.lib.dir}/${modulename}11-api.jar"/>
<path refid="com.arjuna.mwlabs.wstx.tests.lib.path"/>
- <path refid="wstx.lib.classpath10"/>
- <path refid="wstx.lib.classpath11"/>
- <path refid="wstx.lib.classpath"/>
+ <path refid="lib.classpath10"/>
+ <path refid="lib.classpath11"/>
+ <path refid="lib.classpath"/>
</classpath>
- <src path="${com.arjuna.mwlabs.wstx.tests.src}"/>
+ <src path="${tests.src.dir}"/>
<include name="com/arjuna/qa/**"/>
<include name="com/arjuna/wst/tests/common/**"/>
<include name="com/arjuna/wst11/tests/**"/>
@@ -365,73 +373,62 @@
</javac>
</target>
- <target name="wstx.tests.webapps" depends="wstx.tests.compile">
- <copy file="${wstx.tests.dd}/wstx-tests_web-app.xml" tofile="${wstx.tests.dd.dest}/web-app.xml">
+ <target name="tests.webapps" depends="tests.compile">
+ <copy file="${tests.dd.dir}/wstx-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app.xml">
</copy>
- <copy file="${wstx.tests.dd}/wstx11-tests_web-app.xml" tofile="${wstx.tests.dd.dest}/web-app11.xml">
+ <copy file="${tests.dd.dir}/wstx11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml">
</copy>
- <jar jarfile="${wstx.tests.webapps.dest}/wstx-tests.jar">
- <fileset dir="${wstx.tests.dest}"/>
+ <jar jarfile="${tests.build.webapps.dir}/wstx-tests.jar">
+ <fileset dir="${tests.build.classes.dir}"/>
</jar>
- <war warfile="${wstx.tests.webapps.dest}/wstx-tests.war" webxml="${wstx.tests.dd.dest}/web-app.xml">
- <classes dir="${wstx.tests.dest}"/>
+ <war warfile="${tests.build.webapps.dir}/wstx-tests.war" webxml="${tests.build.dd.dir}/web-app.xml">
+ <classes dir="${tests.build.classes.dir}"/>
</war>
- <war warfile="${wstx.tests.webapps.dest}/wstx11-tests.war" webxml="${wstx.tests.dd.dest}/web-app11.xml"/>
- <ear earfile="${wstx.tests.webapps.dest}/wstx-tests.ear" appxml="${wstx.tests.dd}/wstx-tests_application.xml">
+ <war warfile="${tests.build.webapps.dir}/wstx11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml"/>
+ <ear earfile="${tests.build.webapps.dir}/wstx-tests.ear" appxml="${tests.dd.dir}/wstx-tests_application.xml">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${wstx.tests.webapps.dest}" includes="wstx-tests.war wstx11-tests.war wstx-tests.jar"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="wstx-tests.war wstx11-tests.war wstx-tests.jar"/>
<fileset dir="${wsas.test.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
</target>
- <target name="wstx.tests.webapps11" depends="wstx.tests.compile11">
- <copy file="${wstx.tests.dd}/wstx11-tests_web-app.xml" tofile="${wstx.tests.dd.dest}/web-app11.xml">
+ <target name="tests.webapps11" depends="tests.compile11">
+ <copy file="${tests.dd.dir}/wstx11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml">
</copy>
- <jar jarfile="${wstx.tests.webapps.dest}/wstx-tests.jar">
- <fileset dir="${wstx.tests.dest}"/>
+ <jar jarfile="${tests.build.webapps.dir}/wstx-tests.jar">
+ <fileset dir="${tests.build.classes.dir}"/>
</jar>
- <war warfile="${wstx.tests.webapps.dest}/wstx11-tests.war" webxml="${wstx.tests.dd.dest}/web-app11.xml"/>
- <ear earfile="${wstx.tests.webapps.dest}/wstx-tests.ear" appxml="${wstx.tests.dd}/wstx11-tests_application.xml">
+ <war warfile="${tests.build.webapps.dir}/wstx11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml"/>
+ <ear earfile="${tests.build.webapps.dir}/wstx-tests.ear" appxml="${tests.dd.dir}/wstx11-tests_application.xml">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${wstx.tests.webapps.dest}" includes="wstx11-tests.war wstx-tests.jar"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="wstx11-tests.war wstx-tests.jar"/>
<fileset dir="${wsas.test.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
</target>
- <target name="wstx.tests.deploy" depends="wstx.tests.webapps, wstx.tests.undeploy">
- <copy file="${wstx.tests.webapps.dest}/wstx-tests.ear" tofile="${deploy.dir}/wstx-tests.ear"/>
+ <target name="tests.deploy" depends="tests.webapps, tests.undeploy">
+ <copy file="${tests.build.webapps.dir}/wstx-tests.ear" tofile="${deploy.dir}/wstx-tests.ear"/>
</target>
- <target name="wstx.tests.deploy11" depends="wstx.tests.webapps11, wstx.tests.undeploy">
- <copy file="${wstx.tests.webapps.dest}/wstx-tests.ear" tofile="${deploy.dir}/wstx-tests.ear"/>
+ <target name="tests.deploy11" depends="tests.webapps11, tests.undeploy">
+ <copy file="${tests.build.webapps.dir}/wstx-tests.ear" tofile="${deploy.dir}/wstx-tests.ear"/>
</target>
- <target name="wstx.tests.undeploy">
+ <target name="tests.undeploy">
<delete file="${deploy.dir}/wstx-tests.ear"/>
</target>
<!-- Clean targets -->
- <target name="wstx.clean">
+ <target name="clean">
<echo message="Cleaning module"/>
- <delete dir="${wstx.dest}"/>
- <delete dir="${wstx.htdocs.dest}"/>
- <delete file="${wstx.jar.dest}/${modulename}.jar"/>
+ <delete dir="${build.classes.dir}"/>
+ <delete dir="${build.htdocs.dir}"/>
+ <delete file="${build.lib.dir}/${modulename}.jar"/>
<!-- delete the test destination directories -->
- <delete dir="${wstx.tests.dest.root}"/>
+ <delete dir="${tests.build.dir}"/>
</target>
- <!-- Short target names -->
- <target name="compile" depends="wstx.compile"/>
- <target name="jar" depends="wstx.jar"/>
- <target name="war" depends="wstx.war"/>
- <target name="clean" depends="wstx.clean"/>
- <target name="tests-webapps" depends="wstx.tests.webapps"/>
- <target name="tests-webapps11" depends="wstx.tests.webapps11"/>
<!-- production target for 1.1 tests -->
- <target name="tests-11" depends="tests-webapps11"/>
- <target name="tests-both" depends="tests-webapps"/>
-
- <target name="tests-deploy" depends="wstx.tests.deploy"/>
- <target name="tests-deploy11" depends="wstx.tests.deploy11"/>
- <target name="tests-undeploy" depends="wstx.tests.undeploy"/>
+ <target name="tests-11" depends="tests.webapps11"/>
+ <target name="tests-both" depends="tests.webapps"/>
</project>
Modified: labs/jbosstm/trunk/XTS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/build.xml 2010-03-03 15:28:38 UTC (rev 31915)
+++ labs/jbosstm/trunk/XTS/build.xml 2010-03-03 17:13:55 UTC (rev 31916)
@@ -49,11 +49,8 @@
<!-- Compile with deprecation? -->
<property name="xts.deprecation" value="no"/>
- <property name="xts.htdocs.list" value="com.arjuna.mw.wst.*, com.arjuna.wsc.*, com.arjuna.wst.*"/>
+ <property name="xts.htdocs.list" value="com.arjuna.mw.wst.*, com.arjuna.wsc.*, com.arjuna.wst.*, com.arjuna.mw.wst11.*, com.arjuna.wsc11.*, com.arjuna.wst11.* "/>
- <!-- Empty directories -->
- <mkdir dir="WS-C/dev/lib"/>
- <mkdir dir="WS-T/dev/lib"/>
</target>
<!-- Project targets - must add all module names to each target -->
@@ -77,23 +74,32 @@
</target>
+ <property name="xts.htdocs.dest" location="htdocs"/>
+
<target name="htdocs" depends="init">
<echo message="Building htdocs "/>
<mkdir dir="${xts.htdocs.dest}"/>
<path id="xts.htdocs.path">
- <pathelement path="WS-C/dev/src"/>
- <pathelement path="WS-T/dev/src"/>
- <pathelement path="WSTX/classes"/>
+ <pathelement path="${ws-c.dir}/dev/src"/>
+ <pathelement path="${ws-t.dir}/dev/src"/>
+ <pathelement path="${wstx.dir}/classes"/>
+ <pathelement path="${ws-c.dir}/dev/src11"/>
+ <pathelement path="${ws-t.dir}/dev/src11"/>
+ <pathelement path="${wstx.dir}/classes11"/>
+ <pathelement path="${ws-c.dir}/dev/src10"/>
+ <pathelement path="${ws-t.dir}/dev/src10"/>
+ <pathelement path="${wstx.dir}/classes10"/>
+ <pathelement path="${recovery.dir}/src"/>
</path>
<path id="xts.lib.classpath">
<path refid="build.classpath"/>
- <fileset dir="WS-C/build/dev/lib" includes="*.jar"/>
- <fileset dir="WSCF/build/lib" includes="*.jar"/>
- <fileset dir="WS-T/build/dev/lib" includes="*.jar"/>
- <fileset dir="WSTX/build/lib" includes="*.jar"/>
- <fileset dir="recovery/build/lib" includes="*.jar"/>
+ <fileset dir="${ws-c.dir}/build/lib" includes="*.jar"/>
+ <fileset dir="${wscf.dir}/build/lib" includes="*.jar"/>
+ <fileset dir="${ws-t.dir}/build/lib" includes="*.jar"/>
+ <fileset dir="${wstx.dir}/build/lib" includes="*.jar"/>
+ <fileset dir="${recovery.dir}/build/lib" includes="*.jar"/>
</path>
<javadoc
@@ -114,9 +120,9 @@
<mkdir dir="${xts.installationdirectory}/lib"/>
<copy todir="${xts.installationdirectory}/lib">
<fileset dir="WSAS/build/lib" includes="*.jar"/>
- <fileset dir="WS-C/build/dev/lib" includes="*.jar"/>
+ <fileset dir="WS-C/build/lib" includes="*.jar"/>
<fileset dir="WSCF/build/lib" includes="*.jar"/>
- <fileset dir="WS-T/build/dev/lib" includes="*.jar"/>
+ <fileset dir="WS-T/build/lib" includes="*.jar"/>
<fileset dir="WSTX/build/lib" includes="*.jar"/>
<fileset dir="recovery/build/lib" includes="*.jar"/>
</copy>
@@ -124,9 +130,9 @@
<echo message="Installing webapps"/>
<mkdir dir="${xts.installationdirectory}/webapps"/>
<copy todir="${xts.installationdirectory}/webapps">
- <fileset dir="WS-C/build/dev/webapps"/>
+ <fileset dir="WS-C/build/webapps"/>
<fileset dir="WSCF/build/webapps"/>
- <fileset dir="WS-T/build/dev/webapps"/>
+ <fileset dir="WS-T/build/webapps"/>
<fileset dir="WSTX/build/webapps"/>
</copy>
@@ -158,14 +164,14 @@
<echo message="Installing demo"/>
<mkdir dir="${xts.installationdirectory}/demo"/>
<!-- overlay the demo app onto the install -->
- <ant dir="${xts.demo.dir}" target="distribution"/>
+ <ant dir="${demo.dir}" target="distribution"/>
</target>
<target name="install-sar" depends="build-sar">
<echo message="Installing service archive"/>
<mkdir dir="${xts.installationdirectory}/sar"/>
<copy todir="${xts.installationdirectory}/sar">
- <fileset dir="sar/build" includes="jbossxts.sar"/>
+ <fileset dir="${sar.dir}/build" includes="jbossxts.sar"/>
</copy>
</target>
@@ -174,14 +180,14 @@
<mkdir dir="${xts.installationdirectory}/tests"/>
<copy todir="${xts.installationdirectory}/tests">
<!-- ears providing test servlets -->
- <fileset dir="WSAS/tests/build/webapps" includes="wsas-tests.ear"/>
- <fileset dir="WSCF/tests/build/webapps" includes="wscf-tests.ear"/>
- <fileset dir="WS-C/build/tests/webapps" includes="ws-c-tests.ear"/>
- <fileset dir="WS-T/build/tests/webapps" includes="ws-t-tests.ear"/>
- <fileset dir="WSTX/tests/build/webapps" includes="wstx-tests.ear"/>
+ <fileset dir="${wsas.dir}/tests/build/webapps" includes="wsas-tests.ear"/>
+ <fileset dir="${wscf.dir}/tests/build/webapps" includes="wscf-tests.ear"/>
+ <fileset dir="${ws-c.dir}/tests/build/webapps" includes="ws-c-tests.ear"/>
+ <fileset dir="${ws-t.dir}/tests/build/webapps" includes="ws-t-tests.ear"/>
+ <fileset dir="${wstx.dir}/tests/build/webapps" includes="wstx-tests.ear"/>
<!-- ant script and client jar used to exercise servlets-->
- <fileset dir="localjunit/build/" includes="localjunit.jar"/>
- <fileset dir="localjunit" includes="run-tests.xml"/>
+ <fileset dir="${localjunit.dir}/build/" includes="localjunit.jar"/>
+ <fileset dir="${localjunit.dir}" includes="run-tests.xml"/>
</copy>
<zip destfile="${xts.installationdirectory}/tests/jbossxts-tests.zip">
<fileset dir="${xts.installationdirectory}/tests" includes="*.ear *.jar *.xml"/>
@@ -193,11 +199,11 @@
<mkdir dir="${xts.installationdirectory}/interop-tests"/>
<copy todir="${xts.installationdirectory}/interop-tests">
<!-- wars providing test servlets -->
- <fileset dir="interop/WSTFSC07-interop/build/lib" includes="sc007.war"/>
- <fileset dir="interop/WSTX11-interop/build/lib" includes="interop11.war"/>
+ <fileset dir="${interop.sc007.dir}/build/lib" includes="sc007.war"/>
+ <fileset dir="${interop.wstx11.dir}/build/lib" includes="interop11.war"/>
<!-- ant script and client jar used to exercise servlets-->
- <fileset dir="localjunit/build/" includes="localjunit.jar"/>
- <fileset dir="localjunit" includes="run-interop-tests.xml"/>
+ <fileset dir="${localjunit.dir}/build/" includes="localjunit.jar"/>
+ <fileset dir="${localjunit.dir}" includes="run-interop-tests.xml"/>
</copy>
<zip destfile="${xts.installationdirectory}/interop-tests/jbossxts-interop-tests.zip">
<fileset dir="${xts.installationdirectory}/interop-tests" includes="*.war *.jar *.xml"/>
@@ -227,30 +233,30 @@
<delete dir="${xts.htdocs.dest}"/>
<delete dir="${xts.installationdirectory}"/>
- <ant dir="${xts.demo.dir}" target="clean"/>
+ <ant dir="${demo.dir}" target="clean"/>
</target>
<!-- Module targets -->
<target name="wsas.build">
- <ant dir="WSAS"/>
+ <ant dir="${wsas.dir}" inheritall="false"/>
</target>
<target name="ws-c.build">
- <ant dir="WS-C"/>
+ <ant dir="${ws-c.dir}" inheritall="false"/>
</target>
<target name="wscf.build">
- <ant dir="WSCF"/>
+ <ant dir="${wscf.dir}" inheritall="false"/>
</target>
<target name="ws-t.build">
- <ant dir="WS-T"/>
+ <ant dir="${ws-t.dir}" inheritall="false"/>
</target>
<target name="wstx.build">
- <ant dir="WSTX"/>
+ <ant dir="${wstx.dir}" inheritall="false"/>
</target>
<target name="recovery.build">
@@ -262,7 +268,7 @@
but release bundles should use -Dsartype=sar-11 so that
they contain only the supported version. -->
<property name="sartype" value="sar-both"/>
- <ant dir="sar" target="${sartype}"/>
+ <ant dir="${sar.dir}" target="${sartype}"/>
</target>
<target name="tests.build">
@@ -270,53 +276,52 @@
but release bundles should use -Dtesttype=tests-11 so that
thay contain only the supported version. -->
<property name="testtype" value="tests-both"/>
- <ant dir="WSAS" target="${testtype}"/>
- <ant dir="WSCF" target="${testtype}"/>
- <ant dir="WS-C" target="${testtype}"/>
- <ant dir="WS-T" target="${testtype}"/>
- <ant dir="WSTX" target="${testtype}"/>
- <ant dir="localjunit" target="all"/>
+ <ant dir="${wsas.dir}" target="${testtype}"/>
+ <ant dir="${wscf.dir}" target="${testtype}"/>
+ <ant dir="${ws-c.dir}" target="${testtype}"/>
+ <ant dir="${ws-t.dir}" target="${testtype}"/>
+ <ant dir="${wstx.dir}" target="${testtype}"/>
+ <ant dir="${localjunit.dir}" target="all"/>
</target>
<target name="interop-tests.build">
<property name="xts.home" location="${xts.installationdirectory}"/>
- <ant dir="interop/WSTFSC07-interop" target="war"/>
- <ant dir="interop/WSTX11-interop" target="war"/>
- <ant dir="localjunit" target="all"/>
+ <ant dir="${interop.sc007.dir}" target="war"/>
+ <ant dir="${interop.wstx11.dir}" target="war"/>
</target>
<target name="wsas.clean">
- <ant dir="WSAS" target="clean"/>
+ <ant dir="${wsas.dir}" target="clean"/>
</target>
<target name="ws-c.clean">
- <ant dir="WS-C" target="clean"/>
+ <ant dir="${ws-c.dir}" target="clean"/>
</target>
<target name="wscf.clean">
- <ant dir="WSCF" target="clean"/>
+ <ant dir="${wscf.dir}" target="clean"/>
</target>
<target name="ws-t.clean">
- <ant dir="WS-T" target="clean"/>
+ <ant dir="${ws-t.dir}" target="clean"/>
</target>
<target name="wstx.clean">
- <ant dir="WSTX" target="clean"/>
+ <ant dir="${wstx.dir}" target="clean"/>
</target>
<target name="recovery.clean">
- <ant dir="recovery" target="clean"/>
+ <ant dir="${recovery.dir}" target="clean"/>
</target>
<target name="sar.clean">
- <ant dir="sar" target="clean"/>
+ <ant dir="${sar.dir}" target="clean"/>
</target>
<target name="interop-tests.clean">
<property name="xts.home" location="${xts.installationdirectory}"/>
- <ant dir="interop/WSTFSC07-interop" target="clean"/>
- <ant dir="interop/WSTX11-interop" target="clean"/>
+ <ant dir="${interop.sc007.dir}" target="clean"/>
+ <ant dir="${interop.wstx11.dir}" target="clean"/>
</target>
</project>
Modified: labs/jbosstm/trunk/XTS/recovery/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/build.xml 2010-03-03 15:28:38 UTC (rev 31915)
+++ labs/jbosstm/trunk/XTS/recovery/build.xml 2010-03-03 17:13:55 UTC (rev 31916)
@@ -60,9 +60,9 @@
<!--Set external directories -->
<property name="wsas.jar.dest" value="../WSAS/build/lib"/>
- <property name="wsc.jar.dest" value="../WS-C/build/dev/lib"/>
+ <property name="wsc.jar.dest" value="../WS-C/build/lib"/>
<property name="wscf.jar.dest" value="../WSCF/build/lib"/>
- <property name="wst.jar.dest" value="../WS-T/build/dev/lib"/>
+ <property name="wst.jar.dest" value="../WS-T/build/lib"/>
<property name="wstx.jar.dest" value="../WSTX/build/lib"/>
<path id="recovery.lib.classpath">
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2010-03-03 15:28:38 UTC (rev 31915)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2010-03-03 17:13:55 UTC (rev 31916)
@@ -117,7 +117,7 @@
</target>
<!-- build the messages resource bundle for use by the XTS logger -->
- <target name="dev-resourcebundle">
+ <target name="resourcebundle">
<echo message="Generating XTS Bundle"/>
<javadoc packagenames="org.jboss.jbossts.*"
@@ -190,7 +190,7 @@
</target>
<!-- build XTS service archive supporting both 1.0 and 1.1 WS-C/T protocols -->
- <target name="sar-both" depends="init, compile.bridge, compile, dev-resourcebundle, api-both-jar">
+ <target name="sar-both" depends="init, compile.bridge, compile, resourcebundle, api-both-jar">
<!-- create config jar containing conf files for 1.0 and 1.1 -->
<filter token="coordinator.hostname" value="${coordinator.hostname}"/>
<filter token="coordinator.port" value="${coordinator.port}"/>
@@ -235,7 +235,7 @@
</target>
<!-- build XTS service archive supporting 1.1 WS-C/T protocols -->
- <target name="sar-11" depends="init, compile.bridge, compile, dev-resourcebundle, api11-jar">
+ <target name="sar-11" depends="init, compile.bridge, compile, resourcebundle, api11-jar">
<!-- create config jar containing conf files for 1.1 -->
<filter token="coordinator.hostname" value="${coordinator.hostname}"/>
<filter token="coordinator.port" value="${coordinator.port}"/>
@@ -277,7 +277,7 @@
</target>
<!-- build XTS service archive supporting 1.0 WS-C/T protocols -->
- <target name="sar-10" depends="init, compile, dev-resourcebundle, api10-jar">
+ <target name="sar-10" depends="init, compile, resourcebundle, api10-jar">
<!-- create config jar containing conf files for 1.0 -->
<filter token="coordinator.hostname" value="${coordinator.hostname}"/>
<filter token="coordinator.port" value="${coordinator.port}"/>
Modified: labs/jbosstm/trunk/XTS/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sharedbuild.xml 2010-03-03 15:28:38 UTC (rev 31915)
+++ labs/jbosstm/trunk/XTS/sharedbuild.xml 2010-03-03 17:13:55 UTC (rev 31916)
@@ -21,9 +21,25 @@
-->
<project name="sharedbuild">
- <!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location=".."/>
+ <!-- location of XTS tree root and various build trees -->
+ <property name="root.dir" location="."/>
+ <property name="wsas.dir" location="${root.dir}/WSAS"/>
+ <property name="ws-c.dir" location="${root.dir}/WS-C"/>
+ <property name="wscf.dir" location="${root.dir}/WSCF"/>
+ <property name="ws-t.dir" location="${root.dir}/WS-T"/>
+ <property name="wstx.dir" location="${root.dir}/WSTX"/>
+ <property name="recovery.dir" location="${root.dir}/recovery"/>
+ <property name="sar.dir" location="${root.dir}/sar"/>
+ <property name="demo.dir" location="${root.dir}/demo"/>
+ <property name="localjunit.dir" location="${root.dir}/localjunit"/>
+ <property name="interop.sc007.dir" location="${root.dir}/interop/WSTFSC07-interop"/>
+ <property name="interop.wstx11.dir" location="${root.dir}/interop/WSTX11-interop"/>
+
+
+ <!-- location of JBossTS parent tree -->
+ <property name="jbossts.dir" location="${root.dir}/.."/>
+
<!-- all libraries external to JBossTS should be found in parent build/extlib -->
<property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
<property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
@@ -59,10 +75,6 @@
<!-- paths internal to build -->
- <property name="xts.htdocs.dest" location="htdocs"/>
-
- <property name="xts.demo.dir" value="demo"/>
-
<path id="build.classpath">
<fileset dir="${jbossts.install.lib.dir}" includes="${jbossts.install.lib.jars}"/>
<fileset dir="${jbossts.build.extlib.dir}" includes="${jbossts.build.extlib.jars} ${xts.build.extlib.jars}"/>
@@ -76,4 +88,23 @@
<property name="doclet.classpath" refid="doclet.classpath"/>
+ <!-- emma support -->
+
+ <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}" />
+
+ <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
More information about the jboss-svn-commits
mailing list