[jboss-svn-commits] JBL Code SVN: r31340 - in labs/jbosstm/trunk/XTS: WS-C and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 1 11:39:21 EST 2010
Author: adinn
Date: 2010-02-01 11:39:20 -0500 (Mon, 01 Feb 2010)
New Revision: 31340
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/interop/WSTFSC07-interop/build.xml
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
labs/jbosstm/trunk/XTS/recovery/build.xml
labs/jbosstm/trunk/XTS/sar/build.xml
Log:
modified XTS build scripts to pick up project external jars from the TS build/extlib directory and also made first pass at simplifying the scritps -- fixes JBTM-679
Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-02-01 13:37:44 UTC (rev 31339)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-02-01 16:39:20 UTC (rev 31340)
@@ -32,20 +32,71 @@
<!-- ================================================================== -->
- <property environment="env"/>
- <property name="jboss.home" value="${env.JBOSS_HOME}"/>
- <property name="jboss.server" value="default"/>
- <property name="jboss.lib.dir" location="${jboss.home}/lib"/>
- <property name="jboss.client.lib.dir" location="${jboss.home}/client"/>
- <property name="jboss.server.dir" location="${jboss.home}/server/${jboss.server}"/>
- <property name="jboss.server.lib.dir" location="${jboss.server.dir}/lib"/>
- <property name="jboss.common.lib.dir" location="${jboss.home}/common/lib"/>
+ <!-- Set module name -->
+ <property name="modulename" value="ws-c"/>
- <!-- ================================================================== -->
- <property name="deploy.dir" value="${jboss.server.dir}/deploy"/>
+ <!-- location of JBossTS parent tree -->
+ <property name="jbossts.dir" location="../.."/>
- <!-- ================================================================== -->
+ <!-- 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"/>
+ <!-- JBossTS products are in parent install/lib -->
+ <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
+ <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
+
+ <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
+ <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
+ <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
+
+ <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
+
+ <property name="xts.ext.dir" location="../ext"/>
+
+ <!-- required JBossTS product jars -->
+ <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
+
+ <!-- external jars also used by JBossTS -->
+ <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
+
+ <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
+ <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
+
+ <!-- external jars used by XTS for CXF enabled builds -->
+ <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+ geronimo-ws-metadata_2.0_spec.jar">
+ <isset property="cxf.build"/>
+ </condition>
+
+ <!-- external jars used by XTS for all builds -->
+ <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+ jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
+ jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
+
+ <!-- paths internal to build -->
+
+ <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}"/>
+ </path>
+
+ <path id="doclet.classpath">
+ <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
+ </path>
+
+ <property name="build.classpath" refid="build.classpath"/>
+
+ <property name="doclet.classpath" refid="doclet.classpath"/>
+
+ <!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
+ <property environment="env"/>
+ <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+ <property name="jboss.server" value="default"/>
+ <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"/>
@@ -69,58 +120,20 @@
<!-- we had to delete the JaxRPC handlers so we export the bist needed to allow clients to create them -->
<property name="ws-c10.api.classes" value="com/arjuna/webservices/wscoor/CoordinationConstants.class"/>
- <property name="com.arjuna.buildsystem.dir" location="../../antbuildsystem"/>
- <property name="com.arjuna.jta.install" location="../../install"/>
+ <property name="xts.ext.dir" location="../ext"/>
- <property name="com.arjuna.buildsystem.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
- <property name="com.arjuna.jta.install.lib" location="${com.arjuna.jta.install}/lib"/>
- <property name="com.arjuna.jta.install.ext" location="${com.arjuna.jta.install.lib}/ext"/>
- <property name="com.arjuna.xts.ext" location="../ext"/>
-
- <property name="com.arjuna.buildsystem.lib.jars" value="buildsystem.jar"/>
-
- <property name="jta.lib.jars" value="jbossjta.jar jbossjts.jar"/>
- <property name="jta.ext.jars" value="jbossts-common.jar commons-logging.jar"/>
- <property name="xts.ext.jars" value=""/>
- <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
- <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
- <property name="jboss.common.lib.jars" value="servlet-api.jar"/>
- <property name="jboss.lib.jars" value="dom4j.jar"/>
-
<property name="tests.libs" value="junit.jar"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.optimize" value="off"/>
-
- <path id="lib.ext.path">
- <fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars}"/>
- <fileset dir="${com.arjuna.jta.install.lib}" includes="${jta.lib.jars}"/>
- <fileset dir="${jboss.client.lib.dir}" includes="${jboss.client.lib.jars}"/>
- <fileset dir="${jboss.common.lib.dir}" includes="${jboss.common.lib.jars}"/>
- <fileset dir="${jboss.lib.dir}" includes="${jboss.lib.jars}"/>
- </path>
-
<path id="tests.lib.path">
- <fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
+ <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
</path>
+ <property name="javac.debug" value="on"/>
+ <property name="javac.optimize" value="off"/>
+
<!-- name of the resource bundle -->
- <property name="com.arjuna.mwlabs.wsc.resourcebundle"
+ <property name="wsc.resourcebundle"
value="wsc_msg_en_US.properties"/>
- <!-- Define classpath builder task -->
- <path id="com.arjuna.buildsystem.classpath">
- <fileset dir="${com.arjuna.buildsystem.lib}" includes="${com.arjuna.buildsystem.lib.jars}"/>
- </path>
- <property name="com.arjuna.buildsystem.classpath" refid="com.arjuna.buildsystem.classpath"/>
- <taskdef name="classpath-builder" classname="com.hp.mw.buildsystem.ant.ClasspathBuilder" classpathref="com.arjuna.buildsystem.classpath"/>
- <!-- class path behaviour -->
- <property name="build.sysclasspath" value="last"/>
- <property name="com.arjuna.mwlabs.classpathbuilderfilename" location="buildsystem.classpath"/>
<target name="clean">
<delete dir="${build.dir}"/>
@@ -151,7 +164,7 @@
<target name="dev-compile-generic" depends="init">
<javac destdir="${build.dev.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
- <path refid="lib.ext.path"/>
+ <path refid="build.classpath"/>
</classpath>
<src path="${dev.src.dir}"/>
</javac>
@@ -163,7 +176,7 @@
<path>
<pathelement path="${build.dev.classes.dir}"/>
</path>
- <path refid="lib.ext.path"/>
+ <path refid="build.classpath"/>
</classpath>
<src path="${dev.src10.dir}"/>
</javac>
@@ -178,7 +191,7 @@
<path>
<pathelement path="${build.dev.classes.dir}"/>
</path>
- <path refid="lib.ext.path"/>
+ <path refid="build.classpath"/>
</classpath>
<src path="${dev.src11.dir}"/>
</javac>
@@ -189,8 +202,6 @@
<target name="dev-resourcebundle">
<echo message="Generating WS-C Bundle"/>
- <classpath-builder filename="${com.arjuna.mwlabs.classpathbuilderfilename}" inproperty="build.classpath"/>
-
<javadoc packagenames="com.arjuna.*"
failonerror="yes"
private="yes"
@@ -210,11 +221,9 @@
</packageset>
<doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
- <path>
- <pathelement path="${com.arjuna.buildsystem.classpath}"/>
- </path>
+ <path refid="doclet.classpath"/>
<param name="-basedir" value="${basedir}/${build.dev.classes.dir}"/>
- <param name="-resourcebundle" value="${com.arjuna.mwlabs.wsc.resourcebundle}"/>
+ <param name="-resourcebundle" value="${wsc.resourcebundle}"/>
</doclet>
</javadoc>
</target>
@@ -279,7 +288,7 @@
<pathelement path="${build.dev.lib.dir}/ws-c10-api.jar"/>
<pathelement path="${build.dev.lib.dir}/ws-c11.jar"/>
<path refid="tests.lib.path"/>
- <path refid="lib.ext.path"/>
+ <path refid="build.classpath"/>
</classpath>
<src path="${tests.src.dir}"/>
</javac>
@@ -292,7 +301,7 @@
<pathelement path="${build.dev.lib.dir}/ws-c-api.jar"/>
<pathelement path="${build.dev.lib.dir}/ws-c11.jar"/>
<path refid="tests.lib.path"/>
- <path refid="lib.ext.path"/>
+ <path refid="build.classpath"/>
</classpath>
<src path="${tests.src.dir}"/>
<include name="com/arjuna/qa/**"/>
@@ -312,14 +321,7 @@
<classes dir="${build.tests.classes.dir}"/>
</war>
<ear earfile="${build.tests.webapps.dir}/ws-c-tests.ear" appxml="${tests.dd.dir}/ws-c-tests_application.xml">
- <!--
- <fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars}"/>
- -->
- <fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
- <!--
- <fileset dir="${com.arjuna.jta.install.lib}" includes="${jta.lib.jars}"/>
- <fileset dir="${build.dev.lib.dir}" includes="ws-c10.jar ws-c.jar"/>
- -->
+ <fileset dir="${xts.ext.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"/>
</ear>
@@ -332,14 +334,7 @@
<classes dir="${build.tests.classes.dir}"/>
</war>
<ear earfile="${build.tests.webapps.dir}/ws-c-tests.ear" appxml="${tests.dd.dir}/ws-c11-tests_application.xml">
- <!--
- <fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars}"/>
- -->
- <fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
- <!--
- <fileset dir="${com.arjuna.jta.install.lib}" includes="${jta.lib.jars}"/>
- <fileset dir="${build.dev.lib.dir}" includes="ws-c10.jar ws-c.jar"/>
- -->
+ <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
<fileset dir="${build.tests.webapps.dir}" includes="ws-c11-tests.war"/>
</ear>
</target>
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-02-01 13:37:44 UTC (rev 31339)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-02-01 16:39:20 UTC (rev 31340)
@@ -33,23 +33,71 @@
<!-- ================================================================== -->
- <property environment="env"/>
- <property name="jboss.home" value="${env.JBOSS_HOME}"/>
- <property name="jboss.server" value="default"/>
- <property name="jboss.lib.dir" location="${jboss.home}/lib"/>
- <property name="jboss.client.lib.dir" location="${jboss.home}/client"/>
- <property name="jboss.server.dir" location="${jboss.home}/server/${jboss.server}"/>
- <property name="jboss.server.lib.dir" location="${jboss.server.dir}/lib"/>
- <property name="jboss.common.lib.dir" location="${jboss.home}/common/lib"/>
-
- <!-- ================================================================== -->
- <property name="deploy.dir" value="${jboss.server.dir}/deploy"/>
- <property name="ws-c.home" value="../WS-C"/>
- <property name="wscf.home" value="../WSCF"/>
- <property name="wsas.home" value="../WSAS"/>
+ <!-- Set module name -->
+ <property name="modulename" value="ws-t"/>
- <!-- ================================================================== -->
+ <!-- location of JBossTS parent tree -->
+ <property name="jbossts.dir" location="../.."/>
+ <!-- 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"/>
+
+ <!-- JBossTS products are in parent install/lib -->
+ <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
+ <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
+
+ <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
+ <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
+ <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
+
+ <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
+
+ <property name="xts.ext.dir" location="../ext"/>
+
+ <!-- required JBossTS product jars -->
+ <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
+
+ <!-- external jars also used by JBossTS -->
+ <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
+
+ <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
+ <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
+
+ <!-- external jars used by XTS for CXF enabled builds -->
+ <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+ geronimo-ws-metadata_2.0_spec.jar">
+ <isset property="cxf.build"/>
+ </condition>
+
+ <!-- external jars used by XTS for all builds -->
+ <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+ jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
+ jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
+
+ <!-- paths internal to build -->
+
+ <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}"/>
+ </path>
+
+ <path id="doclet.classpath">
+ <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
+ </path>
+
+ <property name="build.classpath" refid="build.classpath"/>
+
+ <property name="doclet.classpath" refid="doclet.classpath"/>
+
+ <!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
+ <property environment="env"/>
+ <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+ <property name="jboss.server" value="default"/>
+ <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"/>
@@ -85,33 +133,12 @@
<property name="ws-t10.api.classes" value="com/arjuna/wst/BAParticipantManager.class"/>
<property name="ws-t11.api.classes" value="com/arjuna/wst11/BAParticipantManager.class"/>
- <property name="com.arjuna.buildsystem.dir" location="../../antbuildsystem"/>
- <property name="com.arjuna.jta.install" location="../../install"/>
+ <!--sibling module directories and jars -->
- <property name="com.arjuna.buildsystem.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
- <property name="com.arjuna.jta.install.lib" location="${com.arjuna.jta.install}/lib"/>
- <property name="com.arjuna.jta.install.ext" location="${com.arjuna.jta.install.lib}/ext"/>
- <property name="com.arjuna.xts.ext" location="../ext"/>
+ <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="ws-c.build.dev.lib.dir" value="${ws-c.home}/build/dev/lib"/>
- <property name="wscf.build.lib.dir" value="${wscf.home}/build/lib"/>
- <property name="wsas.build.lib.dir" value="${wsas.home}/build/lib"/>
-
- <property name="com.arjuna.buildsystem.lib.jars" value="buildsystem.jar"/>
-
- <property name="jta.lib.jars" value="jbossjta.jar jbossjts.jar"/>
- <property name="jta.ext.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
- <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
- <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
- <property name="jboss.common.lib.jars" value="servlet-api.jar"/>
- <property name="jboss.lib.jars" value="dom4j.jar"/>
-
- <property name="tests.libs" value="junit.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"/>
@@ -122,9 +149,6 @@
<property name="wscf11.libs" value="wscf11.jar"/>
<property name="wsas.libs" value="wsas.jar"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.optimize" value="off"/>
-
<path id="ws-c.path">
<fileset dir="${ws-c.build.dev.lib.dir}" includes="${ws-c.libs} ${ws-c.api.libs}"/>
</path>
@@ -144,34 +168,23 @@
<path id="wscf11.path">
<fileset dir="${wscf.build.lib.dir}" includes="${wscf11.libs}"/>
</path>
+
<path id="wsas.path">
<fileset dir="${wsas.build.lib.dir}" includes="${wsas.libs}"/>
</path>
- <path id="lib.ext.path">
- <fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars}"/>
- <fileset dir="${com.arjuna.jta.install.lib}" includes="${jta.lib.jars}"/>
- <fileset dir="${jboss.client.lib.dir}" includes="${jboss.client.lib.jars}"/>
- <fileset dir="${jboss.common.lib.dir}" includes="${jboss.common.lib.jars}"/>
- <fileset dir="${jboss.lib.dir}" includes="${jboss.lib.jars}"/>
- </path>
+ <property name="tests.libs" value="junit.jar"/>
<path id="tests.lib.path">
- <fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
+ <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
</path>
+ <property name="javac.debug" value="on"/>
+ <property name="javac.optimize" value="off"/>
+
<!-- name of the resource bundle -->
- <property name="com.arjuna.mwlabs.wst.resourcebundle"
+ <property name="wst.resourcebundle"
value="wst_msg_en_US.properties"/>
- <!-- Define classpath builder task -->
- <path id="com.arjuna.buildsystem.classpath">
- <fileset dir="${com.arjuna.buildsystem.lib}" includes="${com.arjuna.buildsystem.lib.jars}"/>
- </path>
- <property name="com.arjuna.buildsystem.classpath" refid="com.arjuna.buildsystem.classpath"/>
- <taskdef name="classpath-builder" classname="com.hp.mw.buildsystem.ant.ClasspathBuilder" classpathref="com.arjuna.buildsystem.classpath"/>
- <!-- class path behaviour -->
- <property name="build.sysclasspath" value="last"/>
- <property name="com.arjuna.mwlabs.classpathbuilderfilename" location="buildsystem.classpath"/>
<target name="clean">
<delete dir="${build.dir}"/>
@@ -207,7 +220,7 @@
<path>
<pathelement path="${build.dev.classes.dir}"/>
</path>
- <path refid="lib.ext.path"/>
+ <path refid="build.classpath"/>
<path refid="ws-c.path"/>
<path refid="ws-c10.path"/>
<path refid="wscf.path"/>
@@ -224,7 +237,7 @@
<path>
<pathelement path="${build.dev.classes.dir}"/>
</path>
- <path refid="lib.ext.path"/>
+ <path refid="build.classpath"/>
<path refid="ws-c.path"/>
<path refid="ws-c11.path"/>
<path refid="wscf.path"/>
@@ -238,7 +251,7 @@
<target name="dev-compile-generic" depends="init">
<javac destdir="${build.dev.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
- <path refid="lib.ext.path"/>
+ <path refid="build.classpath"/>
<path refid="ws-c.path"/>
<path refid="wscf.path"/>
<path refid="wsas.path"/>
@@ -250,8 +263,6 @@
<target name="dev-resourcebundle">
<echo message="Generating WS-T Bundle"/>
- <classpath-builder filename="${com.arjuna.mwlabs.classpathbuilderfilename}" inproperty="build.classpath"/>
-
<javadoc packagenames="com.arjuna.*, org.jboss.jbossts.xts.*"
failonerror="yes"
private="yes"
@@ -274,11 +285,9 @@
</packageset>
<doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
- <path>
- <pathelement path="${com.arjuna.buildsystem.classpath}"/>
- </path>
+ <path refid="doclet.classpath"/>
<param name="-basedir" value="${basedir}/${build.dev.classes.dir}"/>
- <param name="-resourcebundle" value="${com.arjuna.mwlabs.wst.resourcebundle}"/>
+ <param name="-resourcebundle" value="${wst.resourcebundle}"/>
</doclet>
</javadoc>
</target>
@@ -377,7 +386,7 @@
<pathelement path="${build.dev.lib.dir}/ws-t11.jar"/>
<pathelement path="${build.dev.lib.dir}/ws-t11-api.jar"/>
<path refid="tests.lib.path"/>
- <path refid="lib.ext.path"/>
+ <path refid="build.classpath"/>
<path refid="ws-c.path"/>
<path refid="ws-c10.path"/>
<path refid="ws-c11.path"/>
@@ -399,7 +408,7 @@
<pathelement path="${build.dev.lib.dir}/ws-t11.jar"/>
<pathelement path="${build.dev.lib.dir}/ws-t11-api.jar"/>
<path refid="tests.lib.path"/>
- <path refid="lib.ext.path"/>
+ <path refid="build.classpath"/>
<path refid="ws-c.path"/>
<path refid="ws-c11.path"/>
<path refid="wscf.path"/>
@@ -429,7 +438,7 @@
<!--
<fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars}"/>
-->
- <fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
+ <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
<!--
<fileset dir="${com.arjuna.jta.install.lib}" includes="${jta.lib.jars}"/>
<fileset dir="${build.dev.lib.dir}" includes="ws-t.jar ws-t10.jar"/>
@@ -451,7 +460,7 @@
<war warfile="${build.tests.webapps.dir}/ws-t11-tests.war" webxml="${build.tests.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">
- <fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
+ <fileset dir="${xts.ext.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"/>
</ear>
Modified: labs/jbosstm/trunk/XTS/WSAS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-02-01 13:37:44 UTC (rev 31339)
+++ labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-02-01 16:39:20 UTC (rev 31340)
@@ -19,252 +19,247 @@
(C) 2005-2006,
@author JBoss Inc.
-->
-<project name="WSAS" default="com.arjuna.mw.wsas.jar" basedir=".">
+<project name="WSAS" default="wsas.jar" basedir=".">
+
<!-- Set module name -->
- <property name="com.arjuna.mwlabs.ts.modulename" value="wsas"/>
+ <property name="modulename" value="wsas"/>
- <!-- Set default properties filename -->
- <property name="com.arjuna.mw.wsas.properties" value="wsas.properties"/>
+ <!-- location of JBossTS parent tree -->
+ <property name="jbossts.dir" location="../.."/>
- <!-- Load Build Properties File -->
- <property file="${com.arjuna.mw.wsas.properties}"/>
+ <!-- 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"/>
- <!-- Set property defaults -->
- <property environment="env"/>
- <property name="jboss.dir" value="${env.JBOSS_HOME}"/>
- <property name="deploy.dir" value="${jboss.dir}/server/default/deploy"/>
+ <!-- JBossTS products are in parent install/lib -->
+ <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
+ <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
- <property name="jboss.lib.dir" location="${jboss.dir}/lib"/>
- <property name="jboss.client.lib.dir" location="${jboss.dir}/client"/>
- <property name="jboss.common.lib.dir" location="${jboss.dir}/common/lib"/>
+ <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
+ <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
+ <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
- <property name="com.arjuna.buildsystem.dir" location="../../antbuildsystem"/>
- <property name="com.arjuna.jta.install" location="../../install"/>
+ <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
- <property name="com.arjuna.buildsystem.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
- <property name="com.arjuna.jta.install.lib" location="${com.arjuna.jta.install}/lib"/>
- <property name="com.arjuna.jta.install.ext" location="${com.arjuna.jta.install.lib}/ext"/>
- <property name="com.arjuna.xts.ext" location="../ext"/>
+ <property name="xts.ext.dir" location="../ext"/>
- <property name="com.arjuna.buildsystem.lib.jars" value="buildsystem.jar"/>
+ <!-- required JBossTS product jars -->
+ <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
- <property name="jta.lib.jars" value="jbossjta.jar jbossjts.jar"/>
- <property name="jta.ext.jars" value="jbossts-common.jar"/>
- <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+ <!-- external jars also used by JBossTS -->
+ <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
+
+ <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
+ <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
+
+ <!-- external jars used by XTS for CXF enabled builds -->
+ <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
geronimo-ws-metadata_2.0_spec.jar">
<isset property="cxf.build"/>
</condition>
- <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+
+ <!-- external jars used by XTS for all builds -->
+ <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
- <property name="jboss.common.lib.jars" value="servlet-api.jar"/>
- <property name="jboss.lib.jars" value="dom4j.jar"/>
+ jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
- <property name="com.arjuna.mwlabs.wsas.resourcebundle" value="wsas_msg_en_US.properties"/>
+ <!-- paths internal to build -->
+ <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}"/>
+ </path>
+
+ <path id="doclet.classpath">
+ <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
+ </path>
+
+ <property name="build.classpath" refid="build.classpath"/>
+
+ <property name="doclet.classpath" refid="doclet.classpath"/>
+
+ <!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
+ <property environment="env"/>
+ <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+ <property name="jboss.server" value="default"/>
+ <property name="deploy.dir" value="${jboss.home}/derver/${jboss.server}/deploy}"/>
+
+ <!-- internal paths and jars -->
+
+ <property name="wsas.resourcebundle" value="wsas_msg_en_US.properties"/>
+
<!-- Set internal property defaults -->
<!-- Path names -->
- <property name="com.arjuna.mwlabs.wsas.src" value="classes"/>
- <property name="com.arjuna.mwlabs.wsas.dest.root" value="build"/>
- <property name="com.arjuna.mwlabs.wsas.dest" value="${com.arjuna.mwlabs.wsas.dest.root}/classes"/>
- <property name="com.arjuna.mwlabs.wsas.jar.dest" value="${com.arjuna.mwlabs.wsas.dest.root}/lib"/>
- <property name="com.arjuna.mwlabs.wsas.htdocs.dest" value="build/htdocs"/>
+ <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"/>
<!-- test path names -->
- <property name="com.arjuna.mwlabs.wsas.tests.src" value="tests/classes"/>
- <property name="com.arjuna.mwlabs.wsas.tests.dd" value="tests/dd"/>
- <property name="com.arjuna.mwlabs.wsas.tests.dest.root" value="tests/build"/>
- <property name="com.arjuna.mwlabs.wsas.tests.dest" value="tests/build/classes"/>
- <property name="com.arjuna.mwlabs.wsas.tests.dd.dest" value="tests/build/dd"/>
- <property name="com.arjuna.mwlabs.wsas.tests.webapps.dest" value="tests/build/webapps"/>
- <property name="com.arjuna.mwlabs.wsas.tests.jar.dest" value="tests/build/lib"/>
+ <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"/>
- <!-- class path behaviour -->
- <path id="com.arjuna.buildsystem.classpath">
- <fileset dir="${com.arjuna.buildsystem.lib}" includes="${com.arjuna.buildsystem.lib.jars}"/>
- </path>
- <property name="com.arjuna.buildsystem.classpath" refid="com.arjuna.buildsystem.classpath"/>
- <property name="build.sysclasspath" value="last"/>
- <property name="com.arjuna.mwlabs.classpathbuilderfilename" location="buildsystem.classpath"/>
-
- <path id="com.arjuna.mwlabs.wsas.lib.classpath">
- <fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars}"/>
- <fileset dir="${com.arjuna.jta.install.lib}" includes="${jta.lib.jars}"/>
- </path>
-
<!-- tests library and path to library -->
<property name="tests.libs" value="junit.jar"/>
- <property name="tests.depend.libs" value="${tests.libs} ${com.arjuna.mwlabs.ts.modulename}.jar"/>
+ <property name="tests.depend.libs" value="${tests.libs} ${modulename}.jar"/>
- <path id="com.arjuna.mwlabs.wsas.tests.lib.path">
- <fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
- <fileset dir="${jboss.client.lib.dir}" includes="${jboss.client.lib.jars}"/>
- <fileset dir="${jboss.common.lib.dir}" includes="${jboss.common.lib.jars}"/>
- <fileset dir="${jboss.lib.dir}" includes="${jboss.lib.jars}"/>
+ <path id="wsas.tests.lib.path">
+ <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
</path>
<!-- Initialisation -->
- <target name="com.arjuna.mwlabs.wsas.init">
+ <target name="wsas.init">
<!-- Define default build properties -->
<tstamp>
- <format property="com.arjuna.mw.wsas.date" pattern="yyyy/mm/dd hh:mm aa"/>
+ <format property="wsas.date" pattern="yyyy/mm/dd hh:mm aa"/>
</tstamp>
<!-- Compile with debugging? -->
- <condition property="com.arjuna.mwlabs.debug" value="no">
- <equals arg1="${com.arjuna.mw.debug}" arg2="no"/>
+ <condition property="debug" value="no">
+ <equals arg1="${debug}" arg2="no"/>
</condition>
- <property name="com.arjuna.mwlabs.debug" value="yes"/>
+ <property name="debug" value="yes"/>
<!-- Compile with deprecation? -->
- <condition property="com.arjuna.mwlabs.deprecation" value="yes">
- <equals arg1="${com.arjuna.mw.deprecation}" arg2="yes"/>
+ <condition property="deprecation" value="yes">
+ <equals arg1="${deprecation}" arg2="yes"/>
</condition>
- <property name="com.arjuna.mwlabs.deprecation" value="no"/>
+ <property name="deprecation" value="no"/>
<!-- Make the destination directory -->
- <mkdir dir="${com.arjuna.mwlabs.wsas.dest}"/>
+ <mkdir dir="${wsas.dest}"/>
</target>
- <!-- Define classpath builder task and add this JAR to the classpath -->
- <taskdef name="classpath-builder" classname="com.hp.mw.buildsystem.ant.ClasspathBuilder" classpathref="com.arjuna.buildsystem.classpath"/>
-
<!-- Compilation targets -->
- <target name="com.arjuna.mw.wsas.compile"
- depends="com.arjuna.mwlabs.wsas.compile,
- com.arjuna.mw.wsas.htdocs, com.arjuna.mwlabs.wsas.generateresourcebundle"/>
-
- <target name="com.arjuna.mwlabs.wsas.compile" depends="com.arjuna.mwlabs.wsas.init">
+ <target name="wsas.compile" depends="wsas.init">
<echo message="Compiling module"/>
- <javac srcdir="${com.arjuna.mwlabs.wsas.src}" destdir="${com.arjuna.mwlabs.wsas.dest}"
- debug="${com.arjuna.mwlabs.debug}" deprecation="${com.arjuna.mwlabs.deprecation}"
- classpathref = "com.arjuna.mwlabs.wsas.lib.classpath"/>
+ <javac srcdir="${wsas.src}" destdir="${wsas.dest}"
+ debug="${debug}" deprecation="${deprecation}"
+ classpathref = "build.classpath"/>
</target>
<!-- htdocs paths -->
- <path id="com.arjuna.mw.wsas.htdocs.path" path="${com.arjuna.mwlabs.wsas.src}"/>
+ <path id="wsas.htdocs.path" path="${wsas.src}"/>
<!-- Build htdocs for just mw, or mw and mwlabs -->
- <property name="com.arjuna.mwlabs.wsas.htdocs.list" value="com.arjuna.mw.*"/>
+ <property name="wsas.htdocs.list" value="*"/>
<!-- Jar targets -->
- <target name="com.arjuna.mw.wsas.jar" depends="com.arjuna.mw.wsas.compile">
+ <target name="wsas.jar" depends="wsas.compile, wsas.htdocs, wsas.generateresourcebundle">
<echo message="Building jar file"/>
- <mkdir dir="${com.arjuna.mwlabs.wsas.jar.dest}"/>
- <jar jarfile="${com.arjuna.mwlabs.wsas.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar" basedir="${com.arjuna.mwlabs.wsas.dest}"/>
+ <mkdir dir="${wsas.jar.dest}"/>
+ <jar jarfile="${wsas.jar.dest}/${modulename}.jar" basedir="${wsas.dest}"/>
</target>
- <target name="com.arjuna.mw.wsas.htdocs"
- depends="com.arjuna.mwlabs.wsas.init">
+ <target name="wsas.htdocs"
+ depends="wsas.init">
<echo message="Building htdocs "/>
- <mkdir dir="${com.arjuna.mwlabs.wsas.htdocs.dest}"/>
- <path id="com.arjuna.mwlabs.wsas.htdocs.path">
- <path refid="com.arjuna.mw.wsas.htdocs.path"/>
- </path>
+ <mkdir dir="${wsas.htdocs.dest}"/>
<javadoc
- sourcepathref="com.arjuna.mwlabs.wsas.htdocs.path"
- destdir="${com.arjuna.mwlabs.wsas.htdocs.dest}"
- packagenames="${com.arjuna.mwlabs.wsas.htdocs.list}"
+ sourcepathref="wsas.htdocs.path"
+ destdir="${wsas.htdocs.dest}"
+ packagenames="${wsas.htdocs.list}"
>
<classpath>
- <path refid="com.arjuna.mwlabs.wsas.lib.classpath"/>
- <path path="${com.arjuna.mwlabs.wsas.src}"/>
+ <path refid="build.classpath"/>
+ <path path="${wsas.src}"/>
</classpath>
</javadoc>
</target>
- <target name="com.arjuna.mwlabs.wsas.generateresourcebundle">
+ <target name="wsas.generateresourcebundle">
- <echo message="Generating WSAS Bundle"/>
+ <echo message="Generating WSAS Bundle"/>
- <classpath-builder filename="${com.arjuna.mwlabs.classpathbuilderfilename}" inproperty="build.classpath"/>
+ <javadoc sourcepath="${wsas.src}"
+ packagenames="com.arjuna.*"
+ failonerror="yes"
+ private="yes"
+ defaultexcludes="yes"
+ 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="-resourcebundle" value="${wsas.resourcebundle}"/>
+ </doclet>
+ </javadoc>
- <javadoc sourcepath="${com.arjuna.mwlabs.wsas.src}"
- packagenames="com.arjuna.*"
- failonerror="yes"
- private="yes"
- defaultexcludes="yes"
- classpath="${build.classpath}">
+ </target>
- <doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
- <path>
- <pathelement path="${com.arjuna.buildsystem.classpath}"/>
- </path>
- <param name="-basedir" value="${basedir}/${com.arjuna.mwlabs.wsas.dest}"/>
- <param name="-resourcebundle" value="${com.arjuna.mwlabs.wsas.resourcebundle}"/>
- </doclet>
- </javadoc>
-
- </target>
-
<!-- test targets -->
- <target name="com.arjuna.mwlabs.wsas.tests.init">
- <delete dir="${com.arjuna.mwlabs.wsas.tests.dest.root}"/>
+ <target name="wsas.tests.init">
+ <delete dir="${wsas.tests.dest.root}"/>
<!-- make the test destination directories -->
- <mkdir dir="${com.arjuna.mwlabs.wsas.tests.dest.root}"/>
- <mkdir dir="${com.arjuna.mwlabs.wsas.tests.dest}"/>
- <mkdir dir="${com.arjuna.mwlabs.wsas.tests.dd.dest}"/>
- <mkdir dir="${com.arjuna.mwlabs.wsas.tests.webapps.dest}"/>
- <mkdir dir="${com.arjuna.mwlabs.wsas.tests.jar.dest}"/>
+ <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}"/>
</target>
<!-- this assumes the required libs have already been built -->
- <target name="com.arjuna.mwlabs.wsas.tests.compile" depends="com.arjuna.mwlabs.wsas.tests.init">
- <javac destdir="${com.arjuna.mwlabs.wsas.tests.dest}" debug="yes" optimize="no">
+ <target name="wsas.tests.compile" depends="wsas.tests.init">
+ <javac destdir="${wsas.tests.dest}" debug="yes" optimize="no">
<classpath>
- <pathelement path="${com.arjuna.mwlabs.wsas.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar"/>
- <path refid="com.arjuna.mwlabs.wsas.tests.lib.path"/>
- <path refid="com.arjuna.mwlabs.wsas.lib.classpath"/>
+ <pathelement path="${wsas.jar.dest}/${modulename}.jar"/>
+ <path refid="wsas.tests.lib.path"/>
+ <path refid="build.classpath"/>
</classpath>
- <src path="${com.arjuna.mwlabs.wsas.tests.src}"/>
+ <src path="${wsas.tests.src}"/>
</javac>
</target>
- <target name="com.arjuna.mwlabs.wsas.tests.webapps" depends="com.arjuna.mwlabs.wsas.tests.compile">
- <copy file="${com.arjuna.mwlabs.wsas.tests.dd}/wsas-tests_web-app.xml" tofile="${com.arjuna.mwlabs.wsas.tests.dd.dest}/web-app.xml">
+ <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">
</copy>
- <war warfile="${com.arjuna.mwlabs.wsas.tests.webapps.dest}/wsas-tests.war" webxml="${com.arjuna.mwlabs.wsas.tests.dd.dest}/web-app.xml">
- <classes dir="${com.arjuna.mwlabs.wsas.tests.dest}"/>
+ <war warfile="${wsas.tests.webapps.dest}/wsas-tests.war" webxml="${wsas.tests.dd.dest}/web-app.xml">
+ <classes dir="${wsas.tests.dest}"/>
</war>
- <ear earfile="${com.arjuna.mwlabs.wsas.tests.webapps.dest}/wsas-tests.ear" appxml="${com.arjuna.mwlabs.wsas.tests.dd}/wsas-tests_application.xml">
+ <ear earfile="${wsas.tests.webapps.dest}/wsas-tests.ear" appxml="${wsas.tests.dd}/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="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wsas.tests.webapps.dest}" includes="wsas-tests.war"/>
+ <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${wsas.tests.webapps.dest}" includes="wsas-tests.war"/>
</ear>
</target>
- <target name="com.arjuna.mwlabs.wsas.tests.deploy" depends="com.arjuna.mwlabs.wsas.tests.webapps, com.arjuna.mwlabs.wsas.tests.undeploy">
- <copy file="${com.arjuna.mwlabs.wsas.tests.webapps.dest}/wsas-tests.ear" tofile="${deploy.dir}/wsas-tests.ear"/>
+ <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>
- <target name="com.arjuna.mwlabs.wsas.tests.undeploy">
+ <target name="wsas.tests.undeploy">
<delete file="${deploy.dir}/wsas-tests.ear"/>
</target>
<!-- Clean targets -->
- <target name="com.arjuna.mw.wsas.clean">
+ <target name="wsas.clean">
<echo message="Cleaning module"/>
- <delete dir="${com.arjuna.mwlabs.wsas.dest}"/>
- <delete dir="${com.arjuna.mwlabs.wsas.dest.root}"/>
- <delete dir="${com.arjuna.mwlabs.wsas.htdocs.dest}"/>
- <delete file="${com.arjuna.mwlabs.wsas.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar"/>
- <delete file="${com.arjuna.mwlabs.wsas.info.dest}"/>
+ <delete dir="${wsas.dest}"/>
+ <delete dir="${wsas.dest.root}"/>
+ <delete dir="${wsas.htdocs.dest}"/>
+ <delete file="${wsas.jar.dest}/${modulename}.jar"/>
<!-- delete the test destination directories -->
- <delete dir="${com.arjuna.mwlabs.wsas.tests.dest.root}"/>
+ <delete dir="${wsas.tests.dest.root}"/>
</target>
<!-- Short target names -->
- <target name="compile" depends="com.arjuna.mw.wsas.compile"/>
- <target name="jar" depends="com.arjuna.mw.wsas.jar"/>
- <target name="clean" depends="com.arjuna.mw.wsas.clean"/>
- <target name="tests-webapps" depends="com.arjuna.mwlabs.wsas.tests.webapps"/>
+ <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="com.arjuna.mwlabs.wsas.tests.deploy"/>
- <target name="tests-undeploy" depends="com.arjuna.mwlabs.wsas.tests.undeploy"/>
+ <target name="tests-deploy" depends="wsas.tests.deploy"/>
+ <target name="tests-undeploy" depends="wsas.tests.undeploy"/>
</project>
Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-02-01 13:37:44 UTC (rev 31339)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-02-01 16:39:20 UTC (rev 31340)
@@ -19,73 +19,98 @@
(C) 2005-2006,
@author JBoss Inc.
-->
-<project name="WSCF" default="com.arjuna.mw.wscf.war" basedir=".">
+<project name="WSCF" default="wscf.war" basedir=".">
<!-- Set module name -->
- <property name="com.arjuna.mwlabs.ts.modulename" value="wscf"/>
+ <property name="modulename" value="wscf"/>
- <!-- Set default properties filename -->
- <property name="com.arjuna.mw.wscf.properties" value="wscf.properties"/>
+ <!-- location of JBossTS parent tree -->
+ <property name="jbossts.dir" location="../.."/>
- <!-- Load Build Properties File -->
- <property file="${com.arjuna.mw.wscf.properties}"/>
+ <!-- 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"/>
- <!-- Set hostname and port property defaults -->
- <property environment="env"/>
- <property name="jboss.home" value="${env.JBOSS_HOME}"/>
- <property name="jboss.server" value="default"/>
- <property name="jboss.lib.dir" location="${jboss.home}/lib"/>
- <property name="jboss.client.lib.dir" location="${jboss.home}/client"/>
- <property name="jboss.server.dir" location="${jboss.home}/server/${jboss.server}"/>
- <property name="jboss.server.lib.dir" location="${jboss.server.dir}/lib"/>
- <property name="jboss.common.lib.dir" location="${jboss.home}/common/lib"/>
+ <!-- JBossTS products are in parent install/lib -->
+ <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
+ <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
- <property name="deploy.dir" value="${jboss.server.dir}/deploy"/>
+ <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
+ <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
+ <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
- <!-- Set internal property defaults -->
- <!-- Path names -->
- <property name="com.arjuna.mwlabs.wscf.src" value="classes"/>
- <property name="com.arjuna.mwlabs.wscf.src10" value="classes10"/>
- <property name="com.arjuna.mwlabs.wscf.src11" value="classes11"/>
- <property name="com.arjuna.mwlabs.wscf.dest.root" value="build"/>
- <property name="com.arjuna.mwlabs.wscf.dest" value="build/classes"/>
- <property name="com.arjuna.mwlabs.wscf.dest10" value="build/classes10/classes"/>
- <property name="com.arjuna.mwlabs.wscf.dest11" value="build/classes11/classes"/>
- <property name="com.arjuna.mwlabs.wscf.jar.dest" value="build/lib"/>
- <property name="com.arjuna.mwlabs.wscf.war.dest" value="build/webapps"/>
- <property name="com.arjuna.mwlabs.wscf.htdocs.dest" value="build/htdocs"/>
+ <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
- <!-- test path names -->
- <property name="com.arjuna.mwlabs.wscf.tests.src" value="tests/classes"/>
- <property name="com.arjuna.mwlabs.wscf.tests.dd" value="tests/dd"/>
- <property name="com.arjuna.mwlabs.wscf.tests.dest.root" value="tests/build"/>
- <property name="com.arjuna.mwlabs.wscf.tests.dest" value="tests/build/classes"/>
- <property name="com.arjuna.mwlabs.wscf.tests.dd.dest" value="tests/build/dd"/>
- <property name="com.arjuna.mwlabs.wscf.tests.webapps.dest" value="tests/build/webapps"/>
- <property name="com.arjuna.mwlabs.wscf.tests.jar.dest" value="tests/build/lib"/>
+ <property name="xts.ext.dir" location="../ext"/>
- <property name="com.arjuna.buildsystem.dir" location="../../antbuildsystem"/>
- <property name="com.arjuna.jta.install" location="../../install"/>
+ <!-- required JBossTS product jars -->
+ <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
- <property name="com.arjuna.buildsystem.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
- <property name="com.arjuna.jta.install.lib" location="${com.arjuna.jta.install}/lib"/>
- <property name="com.arjuna.jta.install.ext" location="${com.arjuna.jta.install.lib}/ext"/>
- <property name="com.arjuna.xts.ext" location="../ext"/>
+ <!-- external jars also used by JBossTS -->
+ <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
- <property name="com.arjuna.buildsystem.lib.jars" value="buildsystem.jar"/>
+ <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
+ <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
- <property name="jta.lib.jars" value="jbossjta.jar jbossjts.jar"/>
- <property name="jta.ext.jars" value="jbossts-common.jar"/>
- <property name="jta.ext.compile.jars" value="commons-logging-1.1.jar jta-1_1-classes.zip"/>
- <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+ <!-- external jars used by XTS for CXF enabled builds -->
+ <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
geronimo-ws-metadata_2.0_spec.jar">
<isset property="cxf.build"/>
</condition>
- <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+
+ <!-- external jars used by XTS for all builds -->
+ <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
- <property name="jboss.common.lib.jars" value="servlet-api.jar"/>
- <property name="jboss.lib.jars" value="dom4j.jar"/>
+ jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
+ <!-- paths internal to build -->
+
+ <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}"/>
+ </path>
+
+ <path id="doclet.classpath">
+ <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
+ </path>
+
+ <property name="build.classpath" refid="build.classpath"/>
+
+ <property name="doclet.classpath" refid="doclet.classpath"/>
+
+ <!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
+ <property environment="env"/>
+ <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+ <property name="jboss.server" value="default"/>
+ <property name="deploy.dir" value="${jboss.home}/derver/${jboss.server}/deploy}"/>
+
+ <!-- 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"/>
+
+ <!-- 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"/>
+
+ <!--sibling module directories and jars -->
+
+ <property name="wsas.jar.dest" value="../WSAS/build/lib"/>
+ <property name="wsc.jar.dest" value="../WS-C/build/dev/lib"/>
+
<property name="wsas.libs" value="wsas.jar"/>
<property name="wsc.libs" value="ws-c.jar"/>
<property name="wsc.api.libs" value="ws-c-api.jar"/>
@@ -93,333 +118,303 @@
<property name="wsc10.api.libs" value="ws-c10-api.jar"/>
<property name="wsc11.libs" value="ws-c11.jar"/>
- <property name="com.arjuna.mwlabs.wscf.resourcebundle"
+ <property name="wscf.resourcebundle"
value="wscf_msg_en_US.properties"/>
- <!--Set external directories -->
-
- <property name="com.arjuna.mwlabs.wsas.jar.dest" value="../WSAS/build/lib"/>
- <property name="com.arjuna.mwlabs.wsc.jar.dest" value="../WS-C/build/dev/lib"/>
-
- <!-- Define classpath builder task -->
- <path id="com.arjuna.buildsystem.classpath">
- <fileset dir="${com.arjuna.buildsystem.lib}" includes="${com.arjuna.buildsystem.lib.jars}"/>
+ <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}"/>
</path>
- <property name="com.arjuna.buildsystem.classpath" refid="com.arjuna.buildsystem.classpath"/>
- <taskdef name="classpath-builder" classname="com.hp.mw.buildsystem.ant.ClasspathBuilder" classpathref="com.arjuna.buildsystem.classpath"/>
- <!-- class path behaviour -->
- <property name="build.sysclasspath" value="last"/>
- <property name="com.arjuna.mwlabs.classpathbuilderfilename" location="buildsystem.classpath"/>
- <path id="com.arjuna.mwlabs.wscf.lib.classpath">
- <fileset dir="${com.arjuna.jta.install.lib}" includes="${jta.lib.jars}"/>
- <fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars} ${jta.ext.compile.jars}"/>
- <fileset dir="${jboss.client.lib.dir}" includes="${jboss.client.lib.jars}"/>
- <fileset dir="${jboss.common.lib.dir}" includes="${jboss.common.lib.jars}"/>
- <fileset dir="${com.arjuna.mwlabs.wsas.jar.dest}" includes="${wsas.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wsc.jar.dest}" 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} ${com.arjuna.mwlabs.ts.modulename}.jar"/>
- <property name="tests.depend.libs" value="${tests.libs} ${com.arjuna.mwlabs.ts.modulename}.jar"/>
+ <property name="tests.depend.libs" value="${tests.libs} ${modulename}.jar"/>
+ <property name="tests.depend.libs" value="${tests.libs} ${modulename}.jar"/>
- <path id="com.arjuna.mwlabs.wscf.tests.lib.path">
- <fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
- <fileset dir="${jboss.lib.dir}" includes="${jboss.lib.jars}"/>
+ <path id="wscf.tests.lib.path">
+ <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <path refid="wscf.lib.classpath"/>
</path>
<!-- Initialisation -->
- <target name="com.arjuna.mwlabs.wscf.init">
+ <target name="wscf.init">
<!-- Define default build properties -->
<tstamp>
- <format property="com.arjuna.mw.wscf.date" pattern="yyyy/mm/dd hh:mm aa"/>
+ <format property="wscf.date" pattern="yyyy/mm/dd hh:mm aa"/>
</tstamp>
<!-- Make the destination directory -->
- <mkdir dir="${com.arjuna.mwlabs.wscf.dest}"/>
- <mkdir dir="${com.arjuna.mwlabs.wscf.dest10}"/>
- <mkdir dir="${com.arjuna.mwlabs.wscf.dest11}"/>
- <mkdir dir="${com.arjuna.mwlabs.wscf.war.dest}"/>
+ <mkdir dir="${wscf.dest}"/>
+ <mkdir dir="${wscf.dest10}"/>
+ <mkdir dir="${wscf.dest11}"/>
+ <mkdir dir="${wscf.war.dest}"/>
</target>
<!-- Compilation targets -->
- <target name="com.arjuna.mw.wscf.compile"
- depends="com.arjuna.mwlabs.wscf.compile,
- com.arjuna.mw.wscf.htdocs, com.arjuna.mwlabs.wscf.generateresourcebundle"/>
-
- <target name="com.arjuna.mwlabs.wscf.compile" depends="com.arjuna.mwlabs.wscf.compile10, com.arjuna.mwlabs.wscf.compile11"/>
- <target name="com.arjuna.mwlabs.wscf.compile11" depends="com.arjuna.mwlabs.wscf.compile-generic">
+ <target name="wscf.compile" depends="wscf.compile10, wscf.compile11"/>
+ <target name="wscf.compile11" depends="wscf.compile-generic">
<echo message="Compiling module 1.1 code"/>
- <javac srcdir="${com.arjuna.mwlabs.wscf.src11}"
- destdir="${com.arjuna.mwlabs.wscf.dest11}"
+ <javac srcdir="${wscf.src11}"
+ destdir="${wscf.dest11}"
debug="on">
<classpath>
<path>
- <pathelement path="${com.arjuna.mwlabs.wscf.dest}"/>
- <pathelement path="${com.arjuna.mwlabs.wsc.jar.dest}/${wsc11.libs}"/>
+ <pathelement path="${wscf.dest}"/>
+ <pathelement path="${wsc.jar.dest}/${wsc11.libs}"/>
</path>
- <path refid="com.arjuna.mwlabs.wscf.lib.classpath"/>
+ <path refid="wscf.lib.classpath"/>
</classpath>
</javac>
</target>
- <target name="com.arjuna.mwlabs.wscf.compile10" depends="com.arjuna.mwlabs.wscf.compile-generic">
+ <target name="wscf.compile10" depends="wscf.compile-generic">
<echo message="Compiling module 1.0 code"/>
- <javac srcdir="${com.arjuna.mwlabs.wscf.src10}"
- destdir="${com.arjuna.mwlabs.wscf.dest10}"
+ <javac srcdir="${wscf.src10}"
+ destdir="${wscf.dest10}"
debug="on">
<classpath>
<path>
- <pathelement path="${com.arjuna.mwlabs.wscf.dest}"/>
- <pathelement path="${com.arjuna.mwlabs.wsc.jar.dest}/${wsc10.libs}"/>
- <pathelement path="${com.arjuna.mwlabs.wsc.jar.dest}/${wsc10.api.libs}"/>
+ <pathelement path="${wscf.dest}"/>
+ <pathelement path="${wsc.jar.dest}/${wsc10.libs}"/>
+ <pathelement path="${wsc.jar.dest}/${wsc10.api.libs}"/>
</path>
- <path refid="com.arjuna.mwlabs.wscf.lib.classpath"/>
+ <path refid="wscf.lib.classpath"/>
</classpath>
</javac>
</target>
- <target name="com.arjuna.mwlabs.wscf.compile-generic" depends="com.arjuna.mwlabs.wscf.init">
+ <target name="wscf.compile-generic" depends="wscf.init">
<echo message="Compiling module generic code"/>
- <javac srcdir="${com.arjuna.mwlabs.wscf.src}"
- destdir="${com.arjuna.mwlabs.wscf.dest}"
+ <javac srcdir="${wscf.src}"
+ destdir="${wscf.dest}"
debug="on">
<classpath>
- <path refid="com.arjuna.mwlabs.wscf.lib.classpath"/>
+ <path refid="wscf.lib.classpath"/>
</classpath>
</javac>
</target>
<!-- htdocs paths -->
- <path id="com.arjuna.mw.wscf.htdocs.path">
+ <path id="wscf.htdocs.path">
<pathelement path="classes"/>
</path>
<!-- Build htdocs for just mw, or mw and mwlabs -->
- <property name="com.arjuna.mwlabs.wscf.htdocs.list"
- value="com.arjuna.mw.*"/>
+ <property name="wscf.htdocs.list"
+ value="*"/>
- <target name="com.arjuna.mw.wscf.war" depends="com.arjuna.mw.wscf.jar">
- <war warfile="${com.arjuna.mwlabs.wscf.war.dest}/${com.arjuna.mwlabs.ts.modulename}10.war" webxml="xml/wscf_web-app.xml"/>
- <war warfile="${com.arjuna.mwlabs.wscf.war.dest}/${com.arjuna.mwlabs.ts.modulename}11.war" webxml="xml/wscf11_web-app.xml"/>
+ <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>
<!-- Jar targets -->
- <target name="com.arjuna.mw.wscf.jar" depends="com.arjuna.mw.wscf.jar11, com.arjuna.mw.wscf.jar10"/>
+ <target name="wscf.jar" depends="wscf.jar11, wscf.jar10"/>
- <target name="com.arjuna.mw.wscf.jar11" depends="com.arjuna.mw.wscf.jar-generic">
+ <target name="wscf.jar11" depends="wscf.jar-generic">
<copy file="xml/ArjunaCoreHLS.xml"
- tofile="${com.arjuna.mwlabs.wscf.dest11}/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ArjunaCoreHLS.xml"/>
+ tofile="${wscf.dest11}/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ArjunaCoreHLS.xml"/>
<copy file="xml/JTAHLS.xml"
- tofile="${com.arjuna.mwlabs.wscf.dest11}/com/arjuna/mwlabs/wscf/model/as/coordinator/jta/JTAHLS.xml"/>
+ tofile="${wscf.dest11}/com/arjuna/mwlabs/wscf/model/as/coordinator/jta/JTAHLS.xml"/>
<copy file="xml/TwoPhase11HLSImple.xml"
- tofile="${com.arjuna.mwlabs.wscf.dest11}/com/arjuna/mwlabs/wscf11/model/twophase/arjunacore/TwoPhaseHLSImple.xml"/>
+ tofile="${wscf.dest11}/com/arjuna/mwlabs/wscf11/model/twophase/arjunacore/TwoPhaseHLSImple.xml"/>
<copy file="xml/Sagas11HLSImple.xml"
- tofile="${com.arjuna.mwlabs.wscf.dest11}/com/arjuna/mwlabs/wscf11/model/sagas/arjunacore/SagasHLSImple.xml"/>
+ tofile="${wscf.dest11}/com/arjuna/mwlabs/wscf11/model/sagas/arjunacore/SagasHLSImple.xml"/>
- <jar jarfile="${com.arjuna.mwlabs.wscf.jar.dest}/${com.arjuna.mwlabs.ts.modulename}11.jar"
- basedir="${com.arjuna.mwlabs.wscf.dest11}">
+ <jar jarfile="${wscf.jar.dest}/${modulename}11.jar"
+ basedir="${wscf.dest11}">
</jar>
</target>
- <target name="com.arjuna.mw.wscf.jar10" depends="com.arjuna.mw.wscf.jar-generic">
+ <target name="wscf.jar10" depends="wscf.jar-generic">
<copy file="xml/ArjunaCoreHLS.xml"
- tofile="${com.arjuna.mwlabs.wscf.dest10}/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ArjunaCoreHLS.xml"/>
+ tofile="${wscf.dest10}/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ArjunaCoreHLS.xml"/>
<copy file="xml/JTAHLS.xml"
- tofile="${com.arjuna.mwlabs.wscf.dest10}/com/arjuna/mwlabs/wscf/model/as/coordinator/jta/JTAHLS.xml"/>
+ tofile="${wscf.dest10}/com/arjuna/mwlabs/wscf/model/as/coordinator/jta/JTAHLS.xml"/>
<copy file="xml/TwoPhaseHLSImple.xml"
- tofile="${com.arjuna.mwlabs.wscf.dest10}/com/arjuna/mwlabs/wscf/model/twophase/arjunacore/TwoPhaseHLSImple.xml"/>
+ tofile="${wscf.dest10}/com/arjuna/mwlabs/wscf/model/twophase/arjunacore/TwoPhaseHLSImple.xml"/>
<copy file="xml/SagasHLSImple.xml"
- tofile="${com.arjuna.mwlabs.wscf.dest10}/com/arjuna/mwlabs/wscf/model/sagas/arjunacore/SagasHLSImple.xml"/>
+ tofile="${wscf.dest10}/com/arjuna/mwlabs/wscf/model/sagas/arjunacore/SagasHLSImple.xml"/>
<copy file="xml/JTAHLSImple.xml"
- tofile="${com.arjuna.mwlabs.wscf.dest10}/com/arjuna/mwlabs/wscf/model/jta/arjunajta/JTAHLSImple.xml"/>
+ tofile="${wscf.dest10}/com/arjuna/mwlabs/wscf/model/jta/arjunajta/JTAHLSImple.xml"/>
- <jar jarfile="${com.arjuna.mwlabs.wscf.jar.dest}/${com.arjuna.mwlabs.ts.modulename}10.jar"
- basedir="${com.arjuna.mwlabs.wscf.dest10}">
+ <jar jarfile="${wscf.jar.dest}/${modulename}10.jar"
+ basedir="${wscf.dest10}">
</jar>
</target>
- <target name="com.arjuna.mw.wscf.jar-generic" depends="com.arjuna.mw.wscf.compile">
+ <target name="wscf.jar-generic" depends="wscf.compile, wscf.htdocs, wscf.generateresourcebundle">
<echo message="Building jar files"/>
- <mkdir dir="${com.arjuna.mwlabs.wscf.jar.dest}"/>
- <jar jarfile="${com.arjuna.mwlabs.wscf.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar"
- basedir="${com.arjuna.mwlabs.wscf.dest}">
+ <mkdir dir="${wscf.jar.dest}"/>
+ <jar jarfile="${wscf.jar.dest}/${modulename}.jar"
+ basedir="${wscf.dest}">
</jar>
</target>
- <target name="com.arjuna.mw.wscf.htdocs"
- depends="com.arjuna.mwlabs.wscf.init">
+ <target name="wscf.htdocs"
+ depends="wscf.init">
<echo message="Building htdocs "/>
- <mkdir dir="${com.arjuna.mwlabs.wscf.htdocs.dest}"/>
- <path id="com.arjuna.mwlabs.wscf.htdocs.path">
- <path refid="com.arjuna.mw.wscf.htdocs.path"/>
- </path>
+ <mkdir dir="${wscf.htdocs.dest}"/>
<javadoc
- sourcepathref="com.arjuna.mwlabs.wscf.htdocs.path"
- destdir="${com.arjuna.mwlabs.wscf.htdocs.dest}"
- packagenames="${com.arjuna.mwlabs.wscf.htdocs.list}"
+ sourcepathref="wscf.htdocs.path"
+ destdir="${wscf.htdocs.dest}"
+ packagenames="${wscf.htdocs.list}"
>
<classpath>
- <path refid="com.arjuna.mwlabs.wscf.lib.classpath"/>
- <path path="${com.arjuna.mwlabs.wscf.src}"/>
+ <path refid="wscf.lib.classpath"/>
+ <path path="${wscf.src}"/>
</classpath>
</javadoc>
</target>
- <target name="com.arjuna.mwlabs.wscf.generateresourcebundle">
+ <target name="wscf.generateresourcebundle">
<echo message="Generating WSCF Bundle"/>
- <classpath-builder filename="${com.arjuna.mwlabs.classpathbuilderfilename}" inproperty="build.classpath"/>
-
<javadoc packagenames="com.arjuna.*"
failonerror="yes"
private="yes"
defaultexcludes="yes"
classpath="${build.classpath}">
- <packageset dir="${com.arjuna.mwlabs.wscf.src}" defaultexcludes="yes">
+ <packageset dir="${wscf.src}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
- <packageset dir="${com.arjuna.mwlabs.wscf.src10}" defaultexcludes="yes">
+ <packageset dir="${wscf.src10}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
- <packageset dir="${com.arjuna.mwlabs.wscf.src11}" defaultexcludes="yes">
+ <packageset dir="${wscf.src11}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
<doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
- <path>
- <pathelement path="${com.arjuna.buildsystem.classpath}"/>
- </path>
- <param name="-basedir" value="${basedir}/${com.arjuna.mwlabs.wscf.dest}"/>
- <param name="-resourcebundle" value="${com.arjuna.mwlabs.wscf.resourcebundle}"/>
+ <path refid="doclet.classpath"/>
+ <param name="-basedir" value="${basedir}/${wscf.dest}"/>
+ <param name="-resourcebundle" value="${wscf.resourcebundle}"/>
</doclet>
</javadoc>
</target>
<!-- test targets -->
- <target name="com.arjuna.mwlabs.wscf.tests.init">
+ <target name="wscf.tests.init">
<!-- delete the test destination directories -->
- <delete dir="${com.arjuna.mwlabs.wscf.tests.dest.root}"/>
+ <delete dir="${wscf.tests.dest.root}"/>
<!-- make the test destination directories -->
- <mkdir dir="${com.arjuna.mwlabs.wscf.tests.dest.root}"/>
- <mkdir dir="${com.arjuna.mwlabs.wscf.tests.dest}"/>
- <mkdir dir="${com.arjuna.mwlabs.wscf.tests.dd.dest}"/>
- <mkdir dir="${com.arjuna.mwlabs.wscf.tests.webapps.dest}"/>
- <mkdir dir="${com.arjuna.mwlabs.wscf.tests.jar.dest}"/>
+ <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}"/>
</target>
<!-- this assumes the required libs have already been built-->
- <target name="com.arjuna.mwlabs.wscf.tests.compile" depends="com.arjuna.mwlabs.wscf.tests.init">
- <javac destdir="${com.arjuna.mwlabs.wscf.tests.dest}" debug="yes" optimize="no">
+ <target name="wscf.tests.compile" depends="wscf.tests.init">
+ <javac destdir="${wscf.tests.dest}" debug="yes" optimize="no">
<classpath>
- <pathelement path="${com.arjuna.mwlabs.wscf.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar"/>
- <pathelement path="${com.arjuna.mwlabs.wscf.jar.dest}/${com.arjuna.mwlabs.ts.modulename}10.jar"/>
- <pathelement path="${com.arjuna.mwlabs.wscf.jar.dest}/${com.arjuna.mwlabs.ts.modulename}11.jar"/>
- <pathelement path="${com.arjuna.mwlabs.wsc.jar.dest}/${wsc10.libs}"/>
- <pathelement path="${com.arjuna.mwlabs.wsc.jar.dest}/${wsc10.api.libs}"/>
- <pathelement path="${com.arjuna.mwlabs.wsc.jar.dest}/${wsc11.libs}"/>
- <path refid="com.arjuna.mwlabs.wscf.tests.lib.path"/>
- <path refid="com.arjuna.mwlabs.wscf.lib.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"/>
+ <path refid="wscf.lib.classpath"/>
</classpath>
- <src path="${com.arjuna.mwlabs.wscf.tests.src}"/>
+ <src path="${wscf.tests.src}"/>
</javac>
</target>
<!-- this assumes the required libs have already been built-->
- <target name="com.arjuna.mwlabs.wscf.tests.compile11" depends="com.arjuna.mwlabs.wscf.tests.init">
- <javac destdir="${com.arjuna.mwlabs.wscf.tests.dest}" debug="yes" optimize="no">
+ <target name="wscf.tests.compile11" depends="wscf.tests.init">
+ <javac destdir="${wscf.tests.dest}" debug="yes" optimize="no">
<classpath>
- <pathelement path="${com.arjuna.mwlabs.wscf.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar"/>
- <pathelement path="${com.arjuna.mwlabs.wscf.jar.dest}/${com.arjuna.mwlabs.ts.modulename}11.jar"/>
- <pathelement path="${com.arjuna.mwlabs.wsc.jar.dest}/${wsc11.libs}"/>
- <path refid="com.arjuna.mwlabs.wscf.tests.lib.path"/>
- <path refid="com.arjuna.mwlabs.wscf.lib.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"/>
+ <path refid="wscf.lib.classpath"/>
</classpath>
- <src path="${com.arjuna.mwlabs.wscf.tests.src}"/>
+ <src path="${wscf.tests.src}"/>
<exclude name="com/arjuna/wscf/**"/>
</javac>
</target>
- <target name="com.arjuna.mwlabs.wscf.tests.webapps" depends="com.arjuna.mwlabs.wscf.tests.compile">
- <copy file="${com.arjuna.mwlabs.wscf.tests.dd}/wscf-tests_web-app.xml" tofile="${com.arjuna.mwlabs.wscf.tests.dd.dest}/web-app.xml">
+ <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">
</copy>
- <copy file="${com.arjuna.mwlabs.wscf.tests.dd}/wscf11-tests_web-app.xml" tofile="${com.arjuna.mwlabs.wscf.tests.dd.dest}/web-app11.xml">
+ <copy file="${wscf.tests.dd}/wscf11-tests_web-app.xml" tofile="${wscf.tests.dd.dest}/web-app11.xml">
</copy>
- <jar jarfile="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf-tests.jar">
- <fileset dir="${com.arjuna.mwlabs.wscf.tests.dest}"/>
+ <jar jarfile="${wscf.tests.webapps.dest}/wscf-tests.jar">
+ <fileset dir="${wscf.tests.dest}"/>
</jar>
- <war warfile="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf-tests.war" webxml="${com.arjuna.mwlabs.wscf.tests.dd.dest}/web-app.xml"/>
- <war warfile="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf11-tests.war" webxml="${com.arjuna.mwlabs.wscf.tests.dd.dest}/web-app11.xml"/>
- <ear earfile="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf-tests.ear" appxml="${com.arjuna.mwlabs.wscf.tests.dd}/wscf-tests_application.xml">
+ <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">
<!-- 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="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wscf.tests.webapps.dest}" includes="wscf-tests.war wscf11-tests.war wscf-tests.jar"/>
+ <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${wscf.tests.webapps.dest}" includes="wscf-tests.war wscf11-tests.war wscf-tests.jar"/>
</ear>
</target>
- <target name="com.arjuna.mwlabs.wscf.tests.webapps11" depends="com.arjuna.mwlabs.wscf.tests.compile11">
- <copy file="${com.arjuna.mwlabs.wscf.tests.dd}/wscf11-tests_web-app.xml" tofile="${com.arjuna.mwlabs.wscf.tests.dd.dest}/web-app11.xml">
+ <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">
</copy>
- <jar jarfile="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf-tests.jar">
- <fileset dir="${com.arjuna.mwlabs.wscf.tests.dest}"/>
+ <jar jarfile="${wscf.tests.webapps.dest}/wscf-tests.jar">
+ <fileset dir="${wscf.tests.dest}"/>
</jar>
- <war warfile="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf11-tests.war" webxml="${com.arjuna.mwlabs.wscf.tests.dd.dest}/web-app11.xml"/>
- <ear earfile="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf-tests.ear" appxml="${com.arjuna.mwlabs.wscf.tests.dd}/wscf11-tests_application.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}/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="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wscf.tests.webapps.dest}" includes="wscf11-tests.war wscf-tests.jar"/>
+ <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${wscf.tests.webapps.dest}" includes="wscf11-tests.war wscf-tests.jar"/>
</ear>
</target>
- <target name="com.arjuna.mwlabs.wscf.tests.deploy" depends="com.arjuna.mwlabs.wscf.tests.webapps, com.arjuna.mwlabs.wscf.tests.undeploy">
- <copy file="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf-tests.ear" tofile="${deploy.dir}/wscf-tests.ear"/>
+ <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>
- <target name="com.arjuna.mwlabs.wscf.tests.deploy11" depends="com.arjuna.mwlabs.wscf.tests.webapps11, com.arjuna.mwlabs.wscf.tests.undeploy">
- <copy file="${com.arjuna.mwlabs.wscf.tests.webapps.dest}/wscf-tests.ear" tofile="${deploy.dir}/wscf-tests.ear"/>
+ <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>
- <target name="com.arjuna.mwlabs.wscf.tests.undeploy">
+ <target name="wscf.tests.undeploy">
<delete file="${deploy.dir}/wscf-tests.ear"/>
</target>
<!-- Clean targets -->
- <target name="com.arjuna.mw.wscf.clean">
+ <target name="wscf.clean">
<echo message="Cleaning module"/>
- <delete dir="${com.arjuna.mwlabs.wscf.dest}"/>
- <delete dir="${com.arjuna.mwlabs.wscf.dest.root}"/>
- <delete dir="${com.arjuna.mwlabs.wscf.htdocs.dest}"/>
- <delete file="${com.arjuna.mwlabs.wscf.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar"/>
- <delete file="${com.arjuna.mwlabs.wscf.info.dest}"/>
+ <delete dir="${wscf.dest}"/>
+ <delete dir="${wscf.dest.root}"/>
+ <delete dir="${wscf.htdocs.dest}"/>
+ <delete file="${wscf.jar.dest}/${modulename}.jar"/>
<!-- delete the test destination directories -->
- <delete dir="${com.arjuna.mwlabs.wscf.tests.dest.root}"/>
+ <delete dir="${wscf.tests.dest.root}"/>
</target>
<!-- Short target names -->
- <target name="compile" depends="com.arjuna.mw.wscf.compile"/>
- <target name="jar" depends="com.arjuna.mw.wscf.jar"/>
- <target name="war" depends="com.arjuna.mw.wscf.war"/>
- <target name="clean" depends="com.arjuna.mw.wscf.clean"/>
- <target name="tests-webapps" depends="com.arjuna.mwlabs.wscf.tests.webapps"/>
- <target name="tests-webapps11" depends="com.arjuna.mwlabs.wscf.tests.webapps11"/>
+ <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="com.arjuna.mwlabs.wscf.tests.deploy"/>
+ <target name="tests-deploy" depends="wscf.tests.deploy"/>
<target name="tests-deploy11" depends="tests-webapps11"/>
- <target name="tests-undeploy" depends="com.arjuna.mwlabs.wscf.tests.undeploy"/>
+ <target name="tests-undeploy" depends="wscf.tests.undeploy"/>
</project>
Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-02-01 13:37:44 UTC (rev 31339)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-02-01 16:39:20 UTC (rev 31340)
@@ -19,40 +19,84 @@
(C) 2005-2006,
@author JBoss Inc.
-->
-<project name="WSTX" default="com.arjuna.mw.wstx.war" basedir=".">
+<project name="WSTX" default="wstx.war" basedir=".">
<!-- Set module name -->
- <property name="com.arjuna.mwlabs.ts.modulename" value="wstx"/>
+ <property name="modulename" value="wstx"/>
- <!-- Set default properties filename -->
- <property name="com.arjuna.mw.wstx.properties" value="wstx.properties"/>
+ <!-- location of JBossTS parent tree -->
+ <property name="jbossts.dir" location="../.."/>
- <!-- Load Build Properties File -->
- <property file="${com.arjuna.mw.wstx.properties}"/>
+ <!-- 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"/>
- <!-- Set property defaults -->
- <property environment="env"/>
- <property name="jboss.home" value="${env.JBOSS_HOME}"/>
- <property name="jboss.server" value="default"/>
- <property name="jboss.lib.dir" location="${jboss.home}/lib"/>
- <property name="jboss.client.lib.dir" location="${jboss.home}/client"/>
- <property name="jboss.server.dir" location="${jboss.home}/server/${jboss.server}"/>
- <property name="jboss.server.lib.dir" location="${jboss.server.dir}/lib"/>
- <property name="jboss.common.lib.dir" location="${jboss.home}/common/lib"/>
+ <!-- JBossTS products are in parent install/lib -->
+ <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
+ <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
- <property name="deploy.dir" value="${jboss.server.dir}/deploy"/>
+ <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
+ <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
+ <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
- <!-- Path names -->
- <property name="com.arjuna.mwlabs.wstx.src" value="classes"/>
- <property name="com.arjuna.mwlabs.wstx.src10" value="classes10"/>
- <property name="com.arjuna.mwlabs.wstx.src11" value="classes11"/>
- <property name="com.arjuna.mwlabs.wstx.dest.root" value="build"/>
- <property name="com.arjuna.mwlabs.wstx.dest" value="build/classes"/>
- <property name="com.arjuna.mwlabs.wstx.dest10" value="build/classes10/classes"/>
- <property name="com.arjuna.mwlabs.wstx.dest11" value="build/classes11/classes"/>
- <property name="com.arjuna.mwlabs.wstx.webapps.dest" value="build/webapps"/>
- <property name="com.arjuna.mwlabs.wstx.jar.dest" value="build/lib"/>
- <property name="com.arjuna.mwlabs.wstx.htdocs.dest" value="build/htdocs"/>
+ <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
+ <property name="xts.ext.dir" location="../ext"/>
+
+ <!-- required JBossTS product jars -->
+ <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
+
+ <!-- external jars also used by JBossTS -->
+ <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
+
+ <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
+ <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
+
+ <!-- external jars used by XTS for CXF enabled builds -->
+ <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+ geronimo-ws-metadata_2.0_spec.jar">
+ <isset property="cxf.build"/>
+ </condition>
+
+ <!-- external jars used by XTS for all builds -->
+ <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+ jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
+ jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
+
+ <!-- paths internal to build -->
+
+ <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}"/>
+ </path>
+
+ <path id="doclet.classpath">
+ <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
+ </path>
+
+ <property name="build.classpath" refid="build.classpath"/>
+
+ <property name="doclet.classpath" refid="doclet.classpath"/>
+
+ <!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
+ <property environment="env"/>
+ <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+ <property name="jboss.server" value="default"/>
+ <property name="deploy.dir" value="${jboss.home}/derver/${jboss.server}/deploy}"/>
+
+ <!-- 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"/>
+
<!-- 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
@@ -79,36 +123,16 @@
com/arjuna/mw/wst11/service/JaxBaseHeaderContextProcessor.class"/>
<property name="com.arjuna.mwlabs.wstx.tests.src" value="tests/classes"/>
- <property name="com.arjuna.mwlabs.wstx.tests.dd" value="tests/dd"/>
- <property name="com.arjuna.mwlabs.wstx.tests.dest.root" value="tests/build"/>
- <property name="com.arjuna.mwlabs.wstx.tests.dest" value="tests/build/classes"/>
- <property name="com.arjuna.mwlabs.wstx.tests.dd.dest" value="tests/build/dd"/>
- <property name="com.arjuna.mwlabs.wstx.tests.webapps.dest" value="tests/build/webapps"/>
- <property name="com.arjuna.mwlabs.wstx.tests.jar.dest" value="tests/build/lib"/>
+ <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="com.arjuna.buildsystem.dir" location="../../antbuildsystem"/>
- <property name="com.arjuna.jta.install" location="../../install"/>
- <property name="com.arjuna.buildsystem.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
- <property name="com.arjuna.jta.install.lib" location="${com.arjuna.jta.install}/lib"/>
- <property name="com.arjuna.jta.install.ext" location="${com.arjuna.jta.install.lib}/ext"/>
- <property name="com.arjuna.xts.ext" location="../ext"/>
+ <!--sibling module directories and jars -->
- <property name="com.arjuna.buildsystem.lib.jars" value="buildsystem.jar"/>
-
- <property name="jta.lib.jars" value="jbossjta.jar jbossjts.jar"/>
- <property name="jta.ext.jars" value="jbossts-common.jar"/>
- <property name="jta.ext.compile.jars" value="commons-logging.jar"/>
- <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
- <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
- <property name="jboss.common.lib.jars" value="servlet-api.jar"/>
- <property name="jboss.lib.jars" value="dom4j.jar"/>
-
<property name="wsas.libs" value="wsas.jar"/>
<property name="wsc.libs" value="ws-c.jar"/>
<property name="wsc-api.libs" value="ws-c-api.jar"/>
@@ -127,281 +151,262 @@
<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="${com.arjuna.mwlabs.ts.modulename}.jar"/>
- <property name="wstx10.libs" value="${com.arjuna.mwlabs.ts.modulename}10.jar"/>
- <property name="wstx11.libs" value="${com.arjuna.mwlabs.ts.modulename}11.jar"/>
+ <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"/>
- -->
- <property name="tests.libs" value="junit.jar"/>
+ <property name="tests.libs" value="junit.jar"/>
+
+ <path id="tests.lib.path">
+ <fileset dir="${xts.ext.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="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
- <fileset dir="${jboss.lib.dir}" includes="${jboss.lib.jars}"/>
+ <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <path refid="build.classpath"/>
</path>
- <!-- Define classpath builder task -->
- <path id="com.arjuna.buildsystem.classpath">
- <fileset dir="${com.arjuna.buildsystem.lib}" includes="${com.arjuna.buildsystem.lib.jars}"/>
- </path>
- <property name="com.arjuna.buildsystem.classpath" refid="com.arjuna.buildsystem.classpath"/>
- <taskdef name="classpath-builder" classname="com.hp.mw.buildsystem.ant.ClasspathBuilder" classpathref="com.arjuna.buildsystem.classpath"/>
- <!-- class path behaviour -->
- <property name="build.sysclasspath" value="last"/>
- <property name="com.arjuna.mwlabs.classpathbuilderfilename" location="buildsystem.classpath"/>
-
- <property name="com.arjuna.mwlabs.wstx.resourcebundle"
+ <property name="wstx.resourcebundle"
value="wstx_msg_en_US.properties"/>
<!--Set external directories -->
- <property name="com.arjuna.mwlabs.wsas.jar.dest" value="../WSAS/build/lib"/>
- <property name="com.arjuna.mwlabs.wsc.jar.dest" value="../WS-C/build/dev/lib"/>
- <property name="com.arjuna.mwlabs.wscf.jar.dest" value="../WSCF/build/lib"/>
- <property name="com.arjuna.mwlabs.wst.jar.dest" value="../WS-T/build/dev/lib"/>
+ <property name="wsas.build.lib.dir" value="../WSAS/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="com.arjuna.mwlabs.wstx.lib.classpath">
- <fileset dir="${com.arjuna.jta.install.lib}" includes="${jta.lib.jars}"/>
- <fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars} ${jta.ext.compile.jars}"/>
- <fileset dir="${jboss.client.lib.dir}" includes="${jboss.client.lib.jars}"/>
- <fileset dir="${jboss.common.lib.dir}" includes="${jboss.common.lib.jars}"/>
- <fileset dir="${com.arjuna.mwlabs.wsas.jar.dest}" includes="${wsas.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wsc.jar.dest}" includes="${wsc.libs} ${wsc-api.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wscf.jar.dest}" includes="${wscf.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wst.jar.dest}" includes="${wst.libs} ${wst-api.libs}"/>
+ <path id="wstx.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="${wscf.build.lib.dir}" includes="${wscf.libs}"/>
+ <fileset dir="${wst.build.dev.lib.dir}" includes="${wst.libs} ${wst-api.libs}"/>
</path>
- <path id="com.arjuna.mwlabs.wstx.lib.classpath10">
- <fileset dir="${com.arjuna.mwlabs.wsc.jar.dest}" includes="${wsc10.libs} ${wsc10-api.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wscf.jar.dest}" includes="${wscf10.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wst.jar.dest}" includes="${wst10.libs} ${wst10-api.libs}"/>
+ <path id="wstx.lib.classpath10">
+ <fileset dir="${wsc.build.dev.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}"/>
</path>
- <path id="com.arjuna.mwlabs.wstx.lib.classpath11">
- <fileset dir="${com.arjuna.mwlabs.wsc.jar.dest}" includes="${wsc11.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wscf.jar.dest}" includes="${wscf11.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wst.jar.dest}" includes="${wst11.libs} ${wst11-api.libs}"/>
+ <path id="wstx.lib.classpath11">
+ <fileset dir="${wsc.build.dev.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}"/>
</path>
<!-- Initialisation -->
- <target name="com.arjuna.mwlabs.wstx.init">
+ <target name="wstx.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="${com.arjuna.mwlabs.wstx.dest}"/>
- <mkdir dir="${com.arjuna.mwlabs.wstx.dest10}"/>
- <mkdir dir="${com.arjuna.mwlabs.wstx.dest11}"/>
- <mkdir dir="${com.arjuna.mwlabs.wstx.webapps.dest}"/>
+ <mkdir dir="${wstx.dest}"/>
+ <mkdir dir="${wstx.dest10}"/>
+ <mkdir dir="${wstx.dest11}"/>
+ <mkdir dir="${wstx.webapps.dest}"/>
</target>
<!-- Compilation targets -->
- <target name="com.arjuna.mw.wstx.compile"
- depends="com.arjuna.mwlabs.wstx.compile,
- com.arjuna.mw.wstx.htdocs, com.arjuna.mwlabs.wstx.generateresourcebundle"/>
+ <target name="wstx.compile" depends="wstx.compile11, wstx.compile10"/>
- <target name="com.arjuna.mwlabs.wstx.compile" depends="com.arjuna.mwlabs.wstx.compile11, com.arjuna.mwlabs.wstx.compile10"/>
-
- <target name="com.arjuna.mwlabs.wstx.compile10" depends="com.arjuna.mwlabs.wstx.compile-generic">
+ <target name="wstx.compile10" depends="wstx.compile-generic">
<echo message="Compiling module 1.0 code"/>
- <javac srcdir="${com.arjuna.mwlabs.wstx.src10}"
- destdir="${com.arjuna.mwlabs.wstx.dest10}"
+ <javac srcdir="${wstx.src10}"
+ destdir="${wstx.dest10}"
debug="on">
<classpath>
<path>
- <pathelement path="${com.arjuna.mwlabs.wstx.dest}"/>
+ <pathelement path="${wstx.dest}"/>
</path>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath10"/>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath"/>
+ <path refid="wstx.lib.classpath10"/>
+ <path refid="wstx.lib.classpath"/>
</classpath>
</javac>
</target>
- <target name="com.arjuna.mwlabs.wstx.compile11" depends="com.arjuna.mwlabs.wstx.compile-generic">
+ <target name="wstx.compile11" depends="wstx.compile-generic">
<echo message="Compiling module 1.1 code"/>
- <javac srcdir="${com.arjuna.mwlabs.wstx.src11}"
- destdir="${com.arjuna.mwlabs.wstx.dest11}"
+ <javac srcdir="${wstx.src11}"
+ destdir="${wstx.dest11}"
debug="on">
<classpath>
<path>
- <pathelement path="${com.arjuna.mwlabs.wstx.dest}"/>
+ <pathelement path="${wstx.dest}"/>
</path>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath11"/>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath"/>
+ <path refid="wstx.lib.classpath11"/>
+ <path refid="wstx.lib.classpath"/>
</classpath>
</javac>
</target>
- <target name="com.arjuna.mwlabs.wstx.compile-generic" depends="com.arjuna.mwlabs.wstx.init">
+ <target name="wstx.compile-generic" depends="wstx.init">
<echo message="Compiling module generic code"/>
- <javac srcdir="${com.arjuna.mwlabs.wstx.src}"
- destdir="${com.arjuna.mwlabs.wstx.dest}"
+ <javac srcdir="${wstx.src}"
+ destdir="${wstx.dest}"
debug="on">
<classpath>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath"/>
+ <path refid="wstx.lib.classpath"/>
</classpath>
</javac>
</target>
<!-- htdocs paths -->
- <path id="com.arjuna.mw.wstx.htdocs.path">
+ <path id="wstx.htdocs.path">
<pathelement path="classes"/>
</path>
<!-- Build htdocs for just mw, or mw and mwlabs -->
- <property name="com.arjuna.mwlabs.wstx.htdocs.list" value="com.arjuna.mw.*"/>
+ <property name="wstx.htdocs.list" value="com.arjuna.mw.*"/>
- <target name="com.arjuna.mw.wstx.war" depends="com.arjuna.mw.wstx.jar">
- <war warfile="${com.arjuna.mwlabs.wstx.webapps.dest}/${com.arjuna.mwlabs.ts.modulename}10.war" webxml="xml/wstx_web-app.xml"/>
- <war warfile="${com.arjuna.mwlabs.wstx.webapps.dest}/${com.arjuna.mwlabs.ts.modulename}11.war" webxml="xml/wstx_web-app11.xml"/>
+ <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>
<!-- Jar targets -->
- <target name="com.arjuna.mw.wstx.jar" depends="com.arjuna.mw.wstx.compile">
+ <target name="wstx.jar" depends="wstx.compile, wstx.htdocs, wstx.generateresourcebundle">
<echo message="Building jar file"/>
- <mkdir dir="${com.arjuna.mwlabs.wstx.jar.dest}"/>
+ <mkdir dir="${wstx.jar.dest}"/>
<copy file="xml/UserTwoPhaseTx.xml"
- tofile="${com.arjuna.mwlabs.wstx.dest10}/com/arjuna/mwlabs/wstx/model/as/twophase/UserTwoPhaseTx.xml"/>
+ tofile="${wstx.dest10}/com/arjuna/mwlabs/wstx/model/as/twophase/UserTwoPhaseTx.xml"/>
<copy file="xml/UserTwoPhaseTx.xml"
- tofile="${com.arjuna.mwlabs.wstx.dest11}/com/arjuna/mwlabs/wstx11/model/as/twophase/UserTwoPhaseTx.xml"/>
+ tofile="${wstx.dest11}/com/arjuna/mwlabs/wstx11/model/as/twophase/UserTwoPhaseTx.xml"/>
<copy file="xml/AtomicTransaction.xml"
- tofile="${com.arjuna.mwlabs.wstx.dest10}/com/arjuna/mwlabs/wst/at/ContextFactoryImple.xml"/>
+ tofile="${wstx.dest10}/com/arjuna/mwlabs/wst/at/ContextFactoryImple.xml"/>
<copy file="xml/BusinessActivity.xml"
- tofile="${com.arjuna.mwlabs.wstx.dest10}/com/arjuna/mwlabs/wst/ba/ContextFactoryImple.xml"/>
+ tofile="${wstx.dest10}/com/arjuna/mwlabs/wst/ba/ContextFactoryImple.xml"/>
<copy file="xml/AtomicTransaction11.xml"
- tofile="${com.arjuna.mwlabs.wstx.dest11}/com/arjuna/mwlabs/wst11/at/ContextFactoryImple.xml"/>
+ tofile="${wstx.dest11}/com/arjuna/mwlabs/wst11/at/ContextFactoryImple.xml"/>
<copy file="xml/BusinessActivity11.xml"
- tofile="${com.arjuna.mwlabs.wstx.dest11}/com/arjuna/mwlabs/wst11/ba/ContextFactoryImple.xml"/>
+ tofile="${wstx.dest11}/com/arjuna/mwlabs/wst11/ba/ContextFactoryImple.xml"/>
- <jar jarfile="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar">
+ <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="${com.arjuna.mwlabs.wstx.dest}" excludes="${wstx.api.classes}"/>
+ <fileset dir="${wstx.dest}" excludes="${wstx.api.classes}"/>
</jar>
- <jar jarfile="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}-api.jar">
- <fileset dir="${com.arjuna.mwlabs.wstx.dest}" includes="${wstx.api.classes}"/>
+ <jar jarfile="${wstx.jar.dest}/${modulename}-api.jar">
+ <fileset dir="${wstx.dest}" includes="${wstx.api.classes}"/>
</jar>
- <jar jarfile="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}10.jar">
- <fileset dir="${com.arjuna.mwlabs.wstx.dest10}" excludes="${wstx10.api.classes}"/>
+ <jar jarfile="${wstx.jar.dest}/${modulename}10.jar">
+ <fileset dir="${wstx.dest10}" excludes="${wstx10.api.classes}"/>
</jar>
- <jar jarfile="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}10-api.jar">
- <fileset dir="${com.arjuna.mwlabs.wstx.dest10}" includes="${wstx10.api.classes}"/>
+ <jar jarfile="${wstx.jar.dest}/${modulename}10-api.jar">
+ <fileset dir="${wstx.dest10}" includes="${wstx10.api.classes}"/>
</jar>
- <jar jarfile="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}11.jar">
- <fileset dir="${com.arjuna.mwlabs.wstx.dest11}" excludes="${wstx11.api.classes}"/>
+ <jar jarfile="${wstx.jar.dest}/${modulename}11.jar">
+ <fileset dir="${wstx.dest11}" excludes="${wstx11.api.classes}"/>
</jar>
- <jar jarfile="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}11-api.jar">
- <fileset dir="${com.arjuna.mwlabs.wstx.dest11}" includes="${wstx11.api.classes}"/>
+ <jar jarfile="${wstx.jar.dest}/${modulename}11-api.jar">
+ <fileset dir="${wstx.dest11}" includes="${wstx11.api.classes}"/>
</jar>
</target>
- <target name="com.arjuna.mw.wstx.htdocs"
- depends="com.arjuna.mwlabs.wstx.init">
+ <target name="wstx.htdocs"
+ depends="wstx.init">
<echo message="Building htdocs "/>
- <mkdir dir="${com.arjuna.mwlabs.wstx.htdocs.dest}"/>
- <path id="com.arjuna.mwlabs.wstx.htdocs.path">
- <path refid="com.arjuna.mw.wstx.htdocs.path"/>
- </path>
+ <mkdir dir="${wstx.htdocs.dest}"/>
<javadoc
- sourcepathref="com.arjuna.mwlabs.wstx.htdocs.path"
- destdir="${com.arjuna.mwlabs.wstx.htdocs.dest}"
- packagenames="${com.arjuna.mwlabs.wstx.htdocs.list}"
+ sourcepathref="wstx.htdocs.path"
+ destdir="${wstx.htdocs.dest}"
+ packagenames="${wstx.htdocs.list}"
>
<classpath>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath"/>
- <path path="${com.arjuna.mwlabs.wstx.src}"/>
+ <path refid="wstx.lib.classpath"/>
+ <path path="${wstx.src}"/>
</classpath>
</javadoc>
</target>
- <target name="com.arjuna.mwlabs.wstx.generateresourcebundle">
+ <target name="wstx.generateresourcebundle">
<echo message="Generating WSTX Bundle"/>
- <classpath-builder filename="${com.arjuna.mwlabs.classpathbuilderfilename}" inproperty="build.classpath"/>
-
<javadoc packagenames="com.arjuna.*"
failonerror="yes"
private="yes"
defaultexcludes="yes"
classpath="${build.classpath}">
- <packageset dir="${com.arjuna.mwlabs.wstx.src}" defaultexcludes="yes">
+ <packageset dir="${wstx.src}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
- <packageset dir="${com.arjuna.mwlabs.wstx.src10}" defaultexcludes="yes">
+ <packageset dir="${wstx.src10}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
- <packageset dir="${com.arjuna.mwlabs.wstx.src11}" defaultexcludes="yes">
+ <packageset dir="${wstx.src11}" defaultexcludes="yes">
<include name="com/arjuna/**"/>
</packageset>
<doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
- <path>
- <pathelement path="${com.arjuna.buildsystem.classpath}"/>
- </path>
- <param name="-basedir" value="${basedir}/${com.arjuna.mwlabs.wstx.dest}"/>
- <param name="-resourcebundle" value="${com.arjuna.mwlabs.wstx.resourcebundle}"/>
+ <path refid="doclet.classpath"/>
+ <param name="-basedir" value="${basedir}/${wstx.dest}"/>
+ <param name="-resourcebundle" value="${wstx.resourcebundle}"/>
</doclet>
</javadoc>
</target>
- <target name="com.arjuna.mwlabs.wstx.tests.init">
+ <target name="wstx.tests.init">
<!-- delete the test destination directories -->
- <delete dir="${com.arjuna.mwlabs.wstx.tests.dest.root}"/>
+ <delete dir="${wstx.tests.dest.root}"/>
<!-- make the test destination directories -->
- <mkdir dir="${com.arjuna.mwlabs.wstx.tests.dest.root}"/>
- <mkdir dir="${com.arjuna.mwlabs.wstx.tests.dest}"/>
- <mkdir dir="${com.arjuna.mwlabs.wstx.tests.dd.dest}"/>
- <mkdir dir="${com.arjuna.mwlabs.wstx.tests.webapps.dest}"/>
- <mkdir dir="${com.arjuna.mwlabs.wstx.tests.jar.dest}"/>
+ <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}"/>
</target>
<!-- this assumes all the rwuired libs have been built -->
- <target name="com.arjuna.mwlabs.wstx.tests.compile" depends="com.arjuna.mwlabs.wstx.tests.init">
- <javac destdir="${com.arjuna.mwlabs.wstx.tests.dest}" debug="yes" optimize="no">
+ <target name="wstx.tests.compile" depends="wstx.tests.init">
+ <javac destdir="${wstx.tests.dest}" debug="yes" optimize="no">
<classpath>
- <pathelement path="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar"/>
- <pathelement path="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}-api.jar"/>
- <pathelement path="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}10.jar"/>
- <pathelement path="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}10-api.jar"/>
- <pathelement path="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}11.jar"/>
- <pathelement path="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}11-api.jar"/>
+ <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"/>
<path refid="com.arjuna.mwlabs.wstx.tests.lib.path"/>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath10"/>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath11"/>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath"/>
+ <path refid="wstx.lib.classpath10"/>
+ <path refid="wstx.lib.classpath11"/>
+ <path refid="wstx.lib.classpath"/>
</classpath>
<src path="${com.arjuna.mwlabs.wstx.tests.src}"/>
</javac>
</target>
<!-- this assumes all the rwuired libs have been built -->
- <target name="com.arjuna.mwlabs.wstx.tests.compile11" depends="com.arjuna.mwlabs.wstx.tests.init">
- <javac destdir="${com.arjuna.mwlabs.wstx.tests.dest}" debug="yes" optimize="no">
+ <target name="wstx.tests.compile11" depends="wstx.tests.init">
+ <javac destdir="${wstx.tests.dest}" debug="yes" optimize="no">
<classpath>
- <pathelement path="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar"/>
- <pathelement path="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}-api.jar"/>
- <pathelement path="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}11.jar"/>
- <pathelement path="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}11-api.jar"/>
+ <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"/>
<path refid="com.arjuna.mwlabs.wstx.tests.lib.path"/>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath10"/>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath11"/>
- <path refid="com.arjuna.mwlabs.wstx.lib.classpath"/>
+ <path refid="wstx.lib.classpath10"/>
+ <path refid="wstx.lib.classpath11"/>
+ <path refid="wstx.lib.classpath"/>
</classpath>
<src path="${com.arjuna.mwlabs.wstx.tests.src}"/>
<include name="com/arjuna/qa/**"/>
@@ -411,89 +416,74 @@
</javac>
</target>
- <target name="com.arjuna.mwlabs.wstx.tests.webapps" depends="com.arjuna.mwlabs.wstx.tests.compile">
- <copy file="${com.arjuna.mwlabs.wstx.tests.dd}/wstx-tests_web-app.xml" tofile="${com.arjuna.mwlabs.wstx.tests.dd.dest}/web-app.xml">
+ <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">
</copy>
- <copy file="${com.arjuna.mwlabs.wstx.tests.dd}/wstx11-tests_web-app.xml" tofile="${com.arjuna.mwlabs.wstx.tests.dd.dest}/web-app11.xml">
+ <copy file="${wstx.tests.dd}/wstx11-tests_web-app.xml" tofile="${wstx.tests.dd.dest}/web-app11.xml">
</copy>
- <jar jarfile="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx-tests.jar">
- <fileset dir="${com.arjuna.mwlabs.wstx.tests.dest}"/>
+ <jar jarfile="${wstx.tests.webapps.dest}/wstx-tests.jar">
+ <fileset dir="${wstx.tests.dest}"/>
</jar>
- <war warfile="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx-tests.war" webxml="${com.arjuna.mwlabs.wstx.tests.dd.dest}/web-app.xml">
- <classes dir="${com.arjuna.mwlabs.wstx.tests.dest}"/>
+ <war warfile="${wstx.tests.webapps.dest}/wstx-tests.war" webxml="${wstx.tests.dd.dest}/web-app.xml">
+ <classes dir="${wstx.tests.dest}"/>
</war>
- <war warfile="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx11-tests.war" webxml="${com.arjuna.mwlabs.wstx.tests.dd.dest}/web-app11.xml"/>
- <ear earfile="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx-tests.ear" appxml="${com.arjuna.mwlabs.wstx.tests.dd}/wstx-tests_application.xml">
+ <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">
<!--
<fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars}"/>
-->
- <fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
- <!-- we don't need to include these libs if we are
- deploying to JBossAs. The XTS libs are already
- deployed as a sar and the JTA lib is in the app
- server lib directory
-
-
- <fileset dir="${com.arjuna.jta.install.lib}" includes="${jta.lib.jars}"/>
- <fileset dir="${com.arjuna.mwlabs.wsas.jar.dest}" includes="${wsas.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wsc.jar.dest}" includes="${wsc.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wscf.jar.dest}" includes="${wscf.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wst.jar.dest}" includes="${wst.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wstx.jar.dest}" includes="${wstx.libs}"/>
- -->
- <fileset dir="${com.arjuna.mwlabs.wstx.tests.webapps.dest}" includes="wstx-tests.war wstx11-tests.war wstx-tests.jar"/>
+ <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${wstx.tests.webapps.dest}" includes="wstx-tests.war wstx11-tests.war wstx-tests.jar"/>
</ear>
</target>
- <target name="com.arjuna.mwlabs.wstx.tests.webapps11" depends="com.arjuna.mwlabs.wstx.tests.compile11">
- <copy file="${com.arjuna.mwlabs.wstx.tests.dd}/wstx11-tests_web-app.xml" tofile="${com.arjuna.mwlabs.wstx.tests.dd.dest}/web-app11.xml">
+ <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">
</copy>
- <jar jarfile="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx-tests.jar">
- <fileset dir="${com.arjuna.mwlabs.wstx.tests.dest}"/>
+ <jar jarfile="${wstx.tests.webapps.dest}/wstx-tests.jar">
+ <fileset dir="${wstx.tests.dest}"/>
</jar>
- <war warfile="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx11-tests.war" webxml="${com.arjuna.mwlabs.wstx.tests.dd.dest}/web-app11.xml"/>
- <ear earfile="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx-tests.ear" appxml="${com.arjuna.mwlabs.wstx.tests.dd}/wstx11-tests_application.xml">
- <fileset dir="${com.arjuna.xts.ext}" includes="${tests.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wstx.tests.webapps.dest}" includes="wstx11-tests.war wstx-tests.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">
+ <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${wstx.tests.webapps.dest}" includes="wstx11-tests.war wstx-tests.jar"/>
</ear>
</target>
- <target name="com.arjuna.mwlabs.wstx.tests.deploy" depends="com.arjuna.mwlabs.wstx.tests.webapps, com.arjuna.mwlabs.wstx.tests.undeploy">
- <copy file="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx-tests.ear" tofile="${deploy.dir}/wstx-tests.ear"/>
+ <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>
- <target name="com.arjuna.mwlabs.wstx.tests.deploy11" depends="com.arjuna.mwlabs.wstx.tests.webapps11, com.arjuna.mwlabs.wstx.tests.undeploy">
- <copy file="${com.arjuna.mwlabs.wstx.tests.webapps.dest}/wstx-tests.ear" tofile="${deploy.dir}/wstx-tests.ear"/>
+ <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>
- <target name="com.arjuna.mwlabs.wstx.tests.undeploy">
+ <target name="wstx.tests.undeploy">
<delete file="${deploy.dir}/wstx-tests.ear"/>
</target>
<!-- Clean targets -->
- <target name="com.arjuna.mw.wstx.clean">
+ <target name="wstx.clean">
<echo message="Cleaning module"/>
- <delete dir="${com.arjuna.mwlabs.wstx.dest}"/>
- <delete dir="${com.arjuna.mwlabs.wstx.dest.root}"/>
- <delete dir="${com.arjuna.mwlabs.wstx.htdocs.dest}"/>
- <delete file="${com.arjuna.mwlabs.wstx.jar.dest}/${com.arjuna.mwlabs.ts.modulename}.jar"/>
- <delete file="${com.arjuna.mwlabs.wstx.info.dest}"/>
+ <delete dir="${wstx.dest}"/>
+ <delete dir="${wstx.htdocs.dest}"/>
+ <delete file="${wstx.jar.dest}/${modulename}.jar"/>
<!-- delete the test destination directories -->
- <delete dir="${com.arjuna.mwlabs.wstx.tests.dest.root}"/>
+ <delete dir="${wstx.tests.dest.root}"/>
</target>
<!-- Short target names -->
- <target name="compile" depends="com.arjuna.mw.wstx.compile"/>
- <target name="jar" depends="com.arjuna.mw.wstx.jar"/>
- <target name="war" depends="com.arjuna.mw.wstx.war"/>
- <target name="clean" depends="com.arjuna.mw.wstx.clean"/>
- <target name="tests-webapps" depends="com.arjuna.mwlabs.wstx.tests.webapps"/>
- <target name="tests-webapps11" depends="com.arjuna.mwlabs.wstx.tests.webapps11"/>
+ <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="com.arjuna.mwlabs.wstx.tests.deploy"/>
- <target name="tests-deploy11" depends="com.arjuna.mwlabs.wstx.tests.deploy11"/>
- <target name="tests-undeploy" depends="com.arjuna.mwlabs.wstx.tests.undeploy"/>
+ <target name="tests-deploy" depends="wstx.tests.deploy"/>
+ <target name="tests-deploy11" depends="wstx.tests.deploy11"/>
+ <target name="tests-undeploy" depends="wstx.tests.undeploy"/>
</project>
Modified: labs/jbosstm/trunk/XTS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/build.xml 2010-02-01 13:37:44 UTC (rev 31339)
+++ labs/jbosstm/trunk/XTS/build.xml 2010-02-01 16:39:20 UTC (rev 31340)
@@ -20,125 +20,93 @@
@author JBoss Inc.
-->
<project name="XTS" default="build" basedir=".">
- <!-- Set default properties filename -->
- <property name="com.arjuna.mw.xts.properties" value="xts.properties"/>
- <property name="current.dir" value="${basedir}"/>
+ <!-- location of JBossTS parent tree -->
+ <property name="jbossts.dir" location=".."/>
- <!-- class path behaviour -->
- <property name="build.sysclasspath" value="last"/>
+ <!-- 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"/>
- <!-- Load Build Properties File -->
- <property file="${com.arjuna.mw.xts.properties}"/>
+ <!-- JBossTS products are in parent install/lib -->
+ <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
+ <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
- <!-- need to locate env var setting for JBOSS_HOME -->
- <property environment="env"/>
+ <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
+ <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
+ <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
- <!-- Configure dependencies -->
- <property name="com.arjuna.jta.dir" location=".."/>
- <property name="com.arjuna.buildsystem.dir" location="${com.arjuna.jta.dir}/antbuildsystem"/>
- <property name="com.arjuna.jta.install" location="${com.arjuna.jta.dir}/install"/>
+ <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
- <property name="com.arjuna.buildsystem.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
- <property name="com.arjuna.jta.install.lib" location="${com.arjuna.jta.install}/lib"/>
- <property name="com.arjuna.jta.install.ext" location="${com.arjuna.jta.install.lib}/ext"/>
- <property name="com.arjuna.xts.ext" location="ext"/>
+ <property name="xts.ext.dir" location="ext"/>
- <property name="com.arjuna.buildsystem.lib.jars" value="buildsystem.jar"/>
- <property name="com.arjuna.jta.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
- <property name="com.arjuna.jta.install.ext.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
- <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+ <!-- required JBossTS product jars -->
+ <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
+
+ <!-- external jars also used by JBossTS -->
+ <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
+
+ <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
+ <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
+
+ <!-- external jars used by XTS for CXF enabled builds -->
+ <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
geronimo-ws-metadata_2.0_spec.jar">
<isset property="cxf.build"/>
</condition>
- <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+
+ <!-- external jars used by XTS for all builds -->
+ <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
- <condition property="jboss.home" value="${env.JBOSS_HOME}">
- <isset property="env.JBOSS_HOME"/>
- </condition>
+ jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
- <fail unless="jboss.home">
- The JBoss installation directory must be specified with the JBOSS_HOME environment variable or the jboss.home property.
- </fail>
+ <!-- paths internal to build -->
- <property name="jboss.server" value="default"/>
+ <property name="xts.htdocs.dest" location="htdocs"/>
- <available property="jboss.server.exists" type="dir"
- file="${jboss.home}/server/${jboss.server}"/>
+ <property name="xts.demo.dir" value="demo"/>
- <fail unless="jboss.server.exists">
- The JBoss server '${jboss.server}' does not appear to exist in the installation directory. Please set jboss.server to the name of the JBoss server instance.
- </fail>
-
- <property name="jboss.lib.dir" location="${jboss.home}/lib"/>
- <property name="jboss.client.lib.dir" location="${jboss.home}/client"/>
- <property name="jboss.server.dir" location="${jboss.home}/server/${jboss.server}"/>
- <property name="jboss.server.lib.dir" location="${jboss.server.dir}/lib"/>
-
- <!-- Set internal property defaults -->
-
- <property name="com.arjuna.mwlabs.xts.jar.dest" location="lib"/>
- <property name="com.arjuna.mwlabs.xts.htdocs.dest" location="htdocs"/>
-
- <property name="com.arjuna.mwlabs.coordinator.dir" location="coordinator"/>
- <property name="com.hp.mwlabs.classpathbuilderfilename"
- location="buildsystem.classpath"/>
-
- <property name="com.arjuna.xts-demo.dir" value="demo"/>
-
<path id="build.classpath">
- <fileset dir="${com.arjuna.jta.install.lib}" includes="${com.arjuna.jta.install.lib.jars}"/>
- <fileset dir="${com.arjuna.jta.install.ext}" includes="${com.arjuna.jta.install.ext.jars}"/>
- <fileset dir="${jboss.client.lib.dir}" includes="${jboss.client.lib.jars}"/>
+ <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}"/>
</path>
- <property name="build.classpath" refid="build.classpath"/>
-
- <path id="com.arjuna.buildsystem.classpath">
- <fileset dir="${com.arjuna.buildsystem.lib}" includes="${com.arjuna.buildsystem.lib.jars}"/>
+
+ <path id="doclet.classpath">
+ <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
</path>
- <property name="com.arjuna.buildsystem.classpath" refid="com.arjuna.buildsystem.classpath"/>
- <!-- Define classpath builder task and add this JAR to the classpath -->
- <taskdef name="classpath-builder" classname="com.hp.mw.buildsystem.ant.ClasspathBuilder" classpathref="com.arjuna.buildsystem.classpath"/>
+ <property name="build.classpath" refid="build.classpath"/>
+ <property name="doclet.classpath" refid="doclet.classpath"/>
+
<!-- Initialisation -->
- <target name="com.arjuna.mwlabs.xts.init">
+ <target name="init">
<!-- Define default build properties -->
<tstamp>
- <format property="com.arjuna.mw.date" pattern="yyyy/MMM/dd HH:mm"/>
+ <format property="xts.date" pattern="yyyy/MMM/dd HH:mm"/>
</tstamp>
- <property name="com.arjuna.mw.installationdirectory" location="xts-install"/>
- <property name="com.arjuna.mw.sourceid" value="unknown"/>
- <property name="com.arjuna.mw.version" value="unknown"/>
+ <property name="xts.installationdirectory" location="xts-install"/>
+ <property name="xts.sourceid" value="unknown"/>
+ <property name="xts.version" value="unknown"/>
- <property name="com.arjuna.mw.builder" value="JBoss Inc. [${user.name}] (${os.name} ${os.version})"/>
- <property name="com.arjuna.mw.notes" value=""/>
+ <property name="xts.builder" value="JBoss Inc. [${user.name}] (${os.name} ${os.version})"/>
+ <property name="xts.notes" value=""/>
- <echo message="Source ID = ${com.arjuna.mw.sourceid}"/>
- <echo message="Version = ${com.arjuna.mw.version}"/>
- <echo message="Builder = ${com.arjuna.mw.builder}"/>
- <echo message="Date = ${com.arjuna.mw.date}"/>
- <echo message="Notes = ${com.arjuna.mw.notes}"/>
+ <echo message="Source ID = ${xts.sourceid}"/>
+ <echo message="Version = ${xts.version}"/>
+ <echo message="Builder = ${xts.builder}"/>
+ <echo message="Date = ${xts.date}"/>
+ <echo message="Notes = ${xts.notes}"/>
- <!-- Installation directory -->
- <property name="com.arjuna.mwlabs.installationdirectory"
- location="${com.arjuna.mw.installationdirectory}"/>
-
<!-- Compile with debugging? -->
- <condition property="com.arjuna.mwlabs.debug" value="no">
- <equals arg1="${com.arjuna.mw.debug}" arg2="no"/>
- </condition>
- <property name="com.arjuna.mwlabs.debug" value="yes"/>
+ <property name="xts.debug" value="yes"/>
<!-- Compile with deprecation? -->
- <condition property="com.arjuna.mwlabs.deprecation" value="yes">
- <equals arg1="${com.arjuna.mw.deprecation}" arg2="yes"/>
- </condition>
- <property name="com.arjuna.mwlabs.deprecation" value="no"/>
+ <property name="xts.deprecation" value="no"/>
- <property name="com.arjuna.mwlabs.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.*"/>
<!-- Empty directories -->
<mkdir dir="WS-C/dev/lib"/>
@@ -146,39 +114,38 @@
</target>
<!-- Project targets - must add all module names to each target -->
- <target name="build-projects" depends="com.arjuna.mwlabs.xts.init, com.arjuna.mwlabs.xts.wsas.build,
- com.arjuna.mwlabs.xts.ws-c.build, com.arjuna.mwlabs.xts.wscf.build,
- com.arjuna.mwlabs.xts.ws-t.build, com.arjuna.mwlabs.xts.wstx.build,
- org.jboss.jbossts.xts.recovery.build, htdocs">
+ <target name="build-projects" depends="init, wsas.build,
+ ws-c.build, wscf.build,
+ ws-t.build, wstx.build,
+ recovery.build, htdocs">
</target>
<!-- sar build target - note, requires prior build and *install* of the projects -->
- <target name="build-sar" depends="install-projects, com.arjuna.mwlabs.xts.sar.build">
+ <target name="build-sar" depends="install-projects, sar.build">
</target>
- <target name="build-tests" depends="install-projects, com.arjuna.mwlabs.xts.tests.build">
+ <target name="build-tests" depends="install-projects, tests.build">
</target>
- <target name="build-interop-tests" depends="install-projects, com.arjuna.mwlabs.xts.interop-tests.build">
+ <target name="build-interop-tests" depends="install-projects, interop-tests.build">
</target>
- <target name="htdocs" depends="com.arjuna.mwlabs.xts.init">
+ <target name="htdocs" depends="init">
<echo message="Building htdocs "/>
- <mkdir dir="${com.arjuna.mwlabs.xts.htdocs.dest}"/>
+ <mkdir dir="${xts.htdocs.dest}"/>
- <path id="com.arjuna.mwlabs.xts.htdocs.path">
+ <path id="xts.htdocs.path">
<pathelement path="WS-C/dev/src"/>
<pathelement path="WS-T/dev/src"/>
<pathelement path="WSTX/classes"/>
</path>
- <path id="com.arjuna.mwlabs.xts.lib.classpath">
+ <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"/>
@@ -187,22 +154,22 @@
</path>
<javadoc
- sourcepathref="com.arjuna.mwlabs.xts.htdocs.path"
- destdir="${com.arjuna.mwlabs.xts.htdocs.dest}"
- packagenames="${com.arjuna.mwlabs.xts.htdocs.list}"
+ sourcepathref="xts.htdocs.path"
+ destdir="${xts.htdocs.dest}"
+ packagenames="${xts.htdocs.list}"
>
<classpath>
- <path refid="com.arjuna.mwlabs.xts.lib.classpath"/>
+ <path refid="xts.lib.classpath"/>
</classpath>
</javadoc>
</target>
<target name="install-projects" depends="build-projects">
- <echo message="Installation directory : ${com.arjuna.mwlabs.installationdirectory}"/>
+ <echo message="Installation directory : ${xts.installationdirectory}"/>
<echo message="Installing jar files"/>
- <mkdir dir="${com.arjuna.mwlabs.installationdirectory}/lib"/>
- <copy todir="${com.arjuna.mwlabs.installationdirectory}/lib">
+ <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="WSCF/build/lib" includes="*.jar"/>
@@ -210,70 +177,59 @@
<fileset dir="WSTX/build/lib" includes="*.jar"/>
<fileset dir="recovery/build/lib" includes="*.jar"/>
</copy>
- <mkdir dir="${com.arjuna.mwlabs.installationdirectory}/lib/ext"/>
- <copy todir="${com.arjuna.mwlabs.installationdirectory}/lib/ext">
- <fileset dir="${com.arjuna.jta.install.lib}" includes="${com.arjuna.jta.install.lib.jars}"/>
- <fileset dir="${com.arjuna.jta.install.ext}" includes="${com.arjuna.jta.install.ext.jars}"/>
- </copy>
<echo message="Installing webapps"/>
- <mkdir dir="${com.arjuna.mwlabs.installationdirectory}/webapps"/>
- <copy todir="${com.arjuna.mwlabs.installationdirectory}/webapps">
+ <mkdir dir="${xts.installationdirectory}/webapps"/>
+ <copy todir="${xts.installationdirectory}/webapps">
<fileset dir="WS-C/build/dev/webapps"/>
<fileset dir="WSCF/build/webapps"/>
<fileset dir="WS-T/build/dev/webapps"/>
<fileset dir="WSTX/build/webapps"/>
</copy>
- <echo message="Installing configuration"/>
- <mkdir dir="${com.arjuna.mwlabs.installationdirectory}/conf"/>
- <copy todir="${com.arjuna.mwlabs.installationdirectory}/conf">
- <fileset dir="WSCF/config"/>
- <fileset dir="WSTX/config" includes="*.xml"/>
- </copy>
+ <echo message="Installing configuration"/>
+ <mkdir dir="${xts.installationdirectory}/conf"/>
+ <copy todir="${xts.installationdirectory}/conf">
+ <fileset dir="WSCF/config"/>
+ <fileset dir="WSTX/config" includes="*.xml"/>
+ </copy>
<echo message="Installing htdocs"/>
- <mkdir dir="${com.arjuna.mwlabs.installationdirectory}/docs/api"/>
- <copy todir="${com.arjuna.mwlabs.installationdirectory}/docs/api">
- <fileset dir="${com.arjuna.mwlabs.xts.htdocs.dest}"/>
+ <mkdir dir="${xts.installationdirectory}/docs/api"/>
+ <copy todir="${xts.installationdirectory}/docs/api">
+ <fileset dir="${xts.htdocs.dest}"/>
</copy>
- <copy todir="${com.arjuna.mwlabs.installationdirectory}/docs">
+ <copy todir="${xts.installationdirectory}/docs">
<fileset dir="docs" includes="*.pdf"/>
</copy>
<echo message="Installing licences"/>
- <copy todir="${com.arjuna.mwlabs.installationdirectory}/lib/ext">
+ <mkdir dir="${xts.installationdirectory}/lib/ext"/>
+ <copy todir="${xts.installationdirectory}/lib/ext">
<fileset dir="${basedir}" includes="third_party_licenses.txt"/>
</copy>
- <echo message="Installing coordinator"/>
- <mkdir dir="${com.arjuna.mwlabs.installationdirectory}/coordinator"/>
- <copy todir="${com.arjuna.mwlabs.installationdirectory}/coordinator/dd">
- <fileset dir="WS-C/dev/dd" includes="ws-c_web-app.xml ws-c11_web-app.xml"/>
- <fileset dir="WS-T/dev/dd" includes="ws-t_web-app.xml ws-t11_web-app.xml"/>
- </copy>
-
</target>
<target name="install-demo">
<echo message="Installing demo"/>
- <mkdir dir="${com.arjuna.mwlabs.installationdirectory}/demo"/>
+ <mkdir dir="${xts.installationdirectory}/demo"/>
<!-- overlay the demo app onto the install -->
- <ant dir="${com.arjuna.xts-demo.dir}" target="distribution"/>
+ <ant dir="${xts.demo.dir}" target="distribution"/>
</target>
<target name="install-sar" depends="build-sar">
<echo message="Installing service archive"/>
- <mkdir dir="${com.arjuna.mwlabs.installationdirectory}/sar"/>
- <copy todir="${com.arjuna.mwlabs.installationdirectory}/sar">
+ <mkdir dir="${xts.installationdirectory}/sar"/>
+ <copy todir="${xts.installationdirectory}/sar">
<fileset dir="sar/build" includes="jbossxts.sar"/>
</copy>
</target>
<target name="install-tests" depends="build-tests">
<echo message="Installing service tests"/>
- <mkdir dir="${com.arjuna.mwlabs.installationdirectory}/tests"/>
- <copy todir="${com.arjuna.mwlabs.installationdirectory}/tests">
+ <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"/>
@@ -284,15 +240,15 @@
<fileset dir="localjunit/build/" includes="localjunit.jar"/>
<fileset dir="localjunit" includes="run-tests.xml"/>
</copy>
- <zip destfile="${com.arjuna.mwlabs.installationdirectory}/tests/jbossxts-tests.zip">
- <fileset dir="${com.arjuna.mwlabs.installationdirectory}/tests" includes="*.ear *.jar *.xml"/>
- </zip>
+ <zip destfile="${xts.installationdirectory}/tests/jbossxts-tests.zip">
+ <fileset dir="${xts.installationdirectory}/tests" includes="*.ear *.jar *.xml"/>
+ </zip>
</target>
<target name="install-interop-tests" depends="build-interop-tests">
<echo message="Installing service tests"/>
- <mkdir dir="${com.arjuna.mwlabs.installationdirectory}/interop-tests"/>
- <copy todir="${com.arjuna.mwlabs.installationdirectory}/interop-tests">
+ <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"/>
@@ -300,8 +256,8 @@
<fileset dir="localjunit/build/" includes="localjunit.jar"/>
<fileset dir="localjunit" includes="run-interop-tests.xml"/>
</copy>
- <zip destfile="${com.arjuna.mwlabs.installationdirectory}/interop-tests/jbossxts-interop-tests.zip">
- <fileset dir="${com.arjuna.mwlabs.installationdirectory}/interop-tests" includes="*.war *.jar *.xml"/>
+ <zip destfile="${xts.installationdirectory}/interop-tests/jbossxts-interop-tests.zip">
+ <fileset dir="${xts.installationdirectory}/interop-tests" includes="*.war *.jar *.xml"/>
</zip>
</target>
@@ -313,61 +269,60 @@
then builds and installs the sar then installs the demo -->
<target name="install" depends="install-sar, install-tests, install-interop-tests, install-demo"/>
- <target name="clean" depends="com.arjuna.mwlabs.xts.init,
- com.arjuna.mwlabs.xts.wsas.clean,
- com.arjuna.mwlabs.xts.ws-c.clean,
- com.arjuna.mwlabs.xts.wscf.clean,
- com.arjuna.mwlabs.xts.ws-t.clean,
- com.arjuna.mwlabs.xts.wstx.clean,
- com.arjuna.mwlabs.xts.wstx.clean,
- org.jboss.jbossts.xts.recovery.clean,
- com.arjuna.mwlabs.xts.interop-tests.clean">
+ <!-- TODO why do we need to depend on init here? -->
+ <target name="clean" depends="init,
+ wsas.clean,
+ ws-c.clean,
+ wscf.clean,
+ ws-t.clean,
+ wstx.clean,
+ wstx.clean,
+ recovery.clean,
+ sar.clean,
+ interop-tests.clean">
- <delete dir="${com.arjuna.mwlabs.xts.htdocs.dest}"/>
- <delete dir="${com.arjuna.mwlabs.xts.jar.dest}"/>
- <delete dir="${com.arjuna.mw.installationdirectory}"/>
+ <delete dir="${xts.htdocs.dest}"/>
+ <delete dir="${xts.installationdirectory}"/>
- <ant dir="${com.arjuna.xts-demo.dir}" target="clean"/>
+ <ant dir="${xts.demo.dir}" target="clean"/>
</target>
<!-- Module targets -->
- <target name="com.arjuna.mwlabs.xts.wsas.build">
+ <target name="wsas.build">
<ant dir="WSAS"/>
</target>
- <target name="com.arjuna.mwlabs.xts.ws-c.build">
+ <target name="ws-c.build">
<ant dir="WS-C"/>
</target>
- <target name="com.arjuna.mwlabs.xts.wscf.build">
+ <target name="wscf.build">
<ant dir="WSCF"/>
</target>
- <target name="com.arjuna.mwlabs.xts.ws-t.build">
- <ant dir="WS-T">
- <property name="ws-c.home" location="WS-C"/>
- </ant>
+ <target name="ws-t.build">
+ <ant dir="WS-T"/>
</target>
- <target name="com.arjuna.mwlabs.xts.wstx.build">
+ <target name="wstx.build">
<ant dir="WSTX"/>
</target>
- <target name="org.jboss.jbossts.xts.recovery.build">
+ <target name="recovery.build">
<ant dir="recovery"/>
</target>
- <target name="com.arjuna.mwlabs.xts.sar.build">
+ <target name="sar.build">
<!-- by default we build 1.0 and 1.1 for ease of testing,
but release bundles should use -Dsartype=sar-11 so that
- thay contain only the supported version. -->
+ they contain only the supported version. -->
<property name="sartype" value="sar-both"/>
<ant dir="sar" target="${sartype}"/>
</target>
- <target name="com.arjuna.mwlabs.xts.tests.build">
+ <target name="tests.build">
<!-- by default we build 1.0 and 1.1 for ease of testing,
but release bundles should use -Dtesttype=tests-11 so that
thay contain only the supported version. -->
@@ -380,45 +335,45 @@
<ant dir="localjunit" target="all"/>
</target>
- <target name="com.arjuna.mwlabs.xts.interop-tests.build">
- <property name="xts.home" location="${com.arjuna.mw.installationdirectory}"/>
+ <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"/>
</target>
- <target name="com.arjuna.mwlabs.xts.interop-tests.clean">
- <property name="xts.home" location="${com.arjuna.mw.installationdirectory}"/>
- <ant dir="interop/WSTFSC07-interop" target="clean"/>
- <ant dir="interop/WSTX11-interop" target="clean"/>
- </target>
-
- <target name="com.arjuna.mwlabs.xts.wsas.clean">
+ <target name="wsas.clean">
<ant dir="WSAS" target="clean"/>
</target>
- <target name="com.arjuna.mwlabs.xts.ws-c.clean">
+ <target name="ws-c.clean">
<ant dir="WS-C" target="clean"/>
</target>
- <target name="com.arjuna.mwlabs.xts.wscf.clean">
+ <target name="wscf.clean">
<ant dir="WSCF" target="clean"/>
</target>
- <target name="com.arjuna.mwlabs.xts.ws-t.clean">
+ <target name="ws-t.clean">
<ant dir="WS-T" target="clean"/>
</target>
- <target name="com.arjuna.mwlabs.xts.wstx.clean">
+ <target name="wstx.clean">
<ant dir="WSTX" target="clean"/>
</target>
- <target name="org.jboss.jbossts.xts.recovery.clean">
+ <target name="recovery.clean">
<ant dir="recovery" target="clean"/>
</target>
- <target name="com.arjuna.mwlabs.xts.sar.clean">
+ <target name="sar.clean">
<ant dir="sar" 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"/>
+ </target>
+
</project>
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2010-02-01 13:37:44 UTC (rev 31339)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2010-02-01 16:39:20 UTC (rev 31340)
@@ -24,13 +24,87 @@
JBoss Transactions WS-Addressing interop test
</description>
- <property environment="env"/>
-
+ <!-- Set module name -->
+ <property name="modulename" value="wstf-sc007-interop"/>
+
+ <!-- the directory in which XTS resides -->
+ <property name="xts.home" value="../../xts-install"/>
+
+ <!-- the name of the host where the coordinator resides. this defaults to the
+ special symbol server.bind.address which will be substituted with the actual
+ server bind address employed when jboss is started -->
+ <property name="coordinator.hostname" value="server.bind.address"/>
+
+ <!-- the name of the port the coordinator is listening on. this defaults to the
+ special symbol jboss.web.bind.port which will be substituted with the actual
+ jboss web service HTTP listener port employed when jboss is started -->
+ <property name="coordinator.port" value="jboss.web.bind.port"/>
+
+ <!-- location of JBossTS parent tree -->
+ <property name="jbossts.dir" location="../../.."/>
+
+ <!-- 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"/>
+
+ <!-- JBossTS products are in parent install/lib -->
+ <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
+ <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
+
+ <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
+ <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
+ <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
+
+ <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
+
+ <property name="xts.ext.dir" location="../../ext"/>
+
+ <!-- required JBossTS product jars -->
+ <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
+
+ <!-- external jars also used by JBossTS -->
+ <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
+
+ <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
+ <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
+
+ <!-- external jars used by XTS for CXF enabled builds -->
+ <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+ geronimo-ws-metadata_2.0_spec.jar">
+ <isset property="cxf.build"/>
+ </condition>
+
+ <!-- external jars used by XTS for all builds -->
+ <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+ jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
+ jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
+
+ <!-- paths internal to build -->
+
+ <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}"/>
+ </path>
+
+ <path id="doclet.classpath">
+ <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
+ </path>
+
+ <property name="build.classpath" refid="build.classpath"/>
+
+ <property name="doclet.classpath" refid="doclet.classpath"/>
+
+ <!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
+ <property environment="env"/>
+ <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+ <property name="jboss.server" value="default"/>
+ <property name="deploy.dir" value="${jboss.home}/derver/${jboss.server}/deploy}"/>
+
<property name="host" value="localhost"/>
<property name="port" value="8080"/>
- <property name="jboss.dir" location="${env.JBOSS_HOME}"/>
- <property name="jboss.deploy.dir" location="${jboss.dir}/server/default/deploy"/>
+ <!-- we assume the core XTS modules have already been installedi.e. WSAS, WS-C, WS-T, WSCF, WSTX, recovery -->
<property name="build.dir" location="build"/>
<property name="build.classes.dir" location="${build.dir}/classes"/>
@@ -44,44 +118,14 @@
<property name="lib.dir" location="lib"/>
<property name="web.dir" location="web"/>
- <property name="jboss.client.lib.dir" location="${jboss.dir}/client"/>
- <property name="jboss.lib.dir" location="${jboss.dir}/lib"/>
- <property name="jboss.common.lib.dir" location="${jboss.dir}/common/lib"/>
- <!-- export XTS_HOME=/home/adinn/jboss/jbossts/trunk/XTS/xts-install -->
- <property name="xts.home" location="${env.XTS_HOME}"/>
- <property name="xts.lib.dir" location="${xts.home}/lib"/>
- <property name="xts.ext.lib.dir" location="${xts.lib.dir}/ext"/>
+ <property name="xts.lib.dir" location="${xts.home}/lib"/>
- <echo>jboss.dir = ${jboss.dir}</echo>
- <echo>xts.home = ${xts.home}</echo>
-
- <!--
- <property name="dist.compile.libs" value="ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar jbossjta.jar jbossts-common.jar stax-api-1.0.jar junit-3.8.1.jar saxon8.jar"/>
- -->
<property name="xts11.compile.libs" value="ws-c11.jar ws-t11.jar wscf11.jar wstx11.jar"/>
<property name="xts.compile.libs" value="jbossxts-api.jar ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar"/>
- <property name="xts.ext.compile.libs" value="jbossjta.jar jbossjts.jar"/>
- <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
- <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
- <property name="jboss.compile.client.libs" value="${jboss.client.lib.jars}"/>
- <property name="jboss.compile.lib.jars" value="dom4j.jar"/>
- <property name="jboss.compile.common.lib.jars" value="servlet-api.jar"/>
+ <property name="xts.libs" value="${xts11.compile.libs} ${xts.compile.libs}"/>
- <property name="dist.compile.libs" value="junit.jar"/>
+ <property name="xts.ext.libs" value="junit.jar"/>
- <!--
- <property name="dist.dependency.libs" value="wstx-asl-2.0.3.jar"/>
- <property name="dist.libs" value="${dist.compile.libs} ${dist.dependency.libs}"/>
- -->
- <property name="dist.libs" value="${dist.compile.libs}"/>
- <property name="dist.xts.libs" value="${xts11.compile.libs} ${xts.compile.libs}"/>
- <property name="dist.xts.ext.libs" value="${xts.ext.compile.libs}"/>
-
<property name="compile.debug" value="true"/>
<target name="init">
@@ -93,12 +137,9 @@
<target name="compile" depends="init">
<javac destdir="${build.classes.dir}" srcdir="${src.dir}" debug="${compile.debug}">
<classpath>
- <fileset dir="${lib.dir}" includes="${dist.compile.libs}"/>
- <fileset dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
- <fileset dir="${xts.ext.lib.dir}" includes="${dist.xts.ext.libs}"/>
- <fileset dir="${jboss.client.lib.dir}" includes="${jboss.compile.client.libs}"/>
- <fileset dir="${jboss.lib.dir}" includes="${jboss.compile.lib.jars}"/>
- <fileset dir="${jboss.common.lib.dir}" includes="${jboss.compile.common.lib.jars}"/>
+ <path refid="build.classpath"/>
+ <fileset dir="${xts.lib.dir}" includes="${xts.libs}"/>
+ <fileset dir="${xts.ext.dir}" includes="${xts.ext.libs}"/>
</classpath>
</javac>
</target>
@@ -122,7 +163,7 @@
<war destfile="${build.war.file}" webxml="${build.webxml.file}">
<classes dir="${build.classes.dir}"/>
<classes dir="${src.dir}" excludes="**/*.java"/>
- <lib dir="${lib.dir}" includes="${dist.libs}"/>
+ <lib dir="${lib.dir}" includes="${xts.ext.libs}"/>
<!--
<lib dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
-->
@@ -132,11 +173,11 @@
</target>
<target name="deploy" depends="war">
- <copy file="${build.war.file}" todir="${jboss.deploy.dir}"/>
+ <copy file="${build.war.file}" todir="${deploy.dir}"/>
</target>
<target name="undeploy">
- <delete file="${jboss.deploy.dir}/sc007.war"/>
+ <delete file="${deploy.dir}/sc007.war"/>
</target>
<target name="clean">
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2010-02-01 13:37:44 UTC (rev 31339)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2010-02-01 16:39:20 UTC (rev 31340)
@@ -24,14 +24,87 @@
JBoss Transactions WS-Addressing interop test
</description>
+ <!-- Set module name -->
+ <property name="modulename" value="wstx11-interop"/>
+
+ <!-- the directory in which XTS resides -->
+ <property name="xts.home" value="../../xts-install"/>
+
+ <!-- the name of the host where the coordinator resides. this defaults to the
+ special symbol server.bind.address which will be substituted with the actual
+ server bind address employed when jboss is started -->
+ <property name="coordinator.hostname" value="server.bind.address"/>
+
+ <!-- the name of the port the coordinator is listening on. this defaults to the
+ special symbol jboss.web.bind.port which will be substituted with the actual
+ jboss web service HTTP listener port employed when jboss is started -->
+ <property name="coordinator.port" value="jboss.web.bind.port"/>
+
+ <!-- location of JBossTS parent tree -->
+ <property name="jbossts.dir" location="../../.."/>
+
+ <!-- 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"/>
+
+ <!-- JBossTS products are in parent install/lib -->
+ <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
+ <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
+
+ <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
+ <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
+ <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
+
+ <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
+
+ <property name="xts.ext.dir" location="../../ext"/>
+
+ <!-- required JBossTS product jars -->
+ <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
+
+ <!-- external jars also used by JBossTS -->
+ <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
+
+ <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
+ <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
+
+ <!-- external jars used by XTS for CXF enabled builds -->
+ <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+ geronimo-ws-metadata_2.0_spec.jar">
+ <isset property="cxf.build"/>
+ </condition>
+
+ <!-- external jars used by XTS for all builds -->
+ <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+ jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
+ jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
+
+ <!-- paths internal to build -->
+
+ <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}"/>
+ </path>
+
+ <path id="doclet.classpath">
+ <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
+ </path>
+
+ <property name="build.classpath" refid="build.classpath"/>
+
+ <property name="doclet.classpath" refid="doclet.classpath"/>
+
+ <!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
+ <property environment="env"/>
+ <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+ <property name="jboss.server" value="default"/>
+ <property name="deploy.dir" value="${jboss.home}/derver/${jboss.server}/deploy}"/>
<property environment="env"/>
<property name="host" value="localhost"/>
<property name="port" value="8080"/>
- <property name="jboss.dir" location="${env.JBOSS_HOME}"/>
- <property name="jboss.deploy.dir" location="${jboss.dir}/server/default/deploy"/>
-
<property name="build.dir" location="build"/>
<property name="build.classes.dir" location="${build.dir}/classes"/>
<property name="build.lib.dir" location="${build.dir}/lib"/>
@@ -44,43 +117,12 @@
<property name="lib.dir" location="lib"/>
<property name="web.dir" location="web"/>
- <property name="jboss.client.lib.dir" location="${jboss.dir}/client"/>
- <property name="jboss.lib.dir" location="${jboss.dir}/lib"/>
- <property name="jboss.common.lib.dir" location="${jboss.dir}/common/lib"/>
- <!-- export XTS_HOME=/home/adinn/jboss/jbossts/trunk/XTS/xts-install -->
- <property name="xts.home" location="${env.XTS_HOME}"/>
- <property name="xts.lib.dir" location="${xts.home}/lib"/>
- <property name="xts.ext.lib.dir" location="${xts.lib.dir}/ext"/>
-
- <echo>jboss.dir = ${jboss.dir}</echo>
- <echo>xts.home = ${xts.homexf}</echo>
-
- <!--
- <property name="dist.compile.libs" value="ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar jbossjta.jar jbossts-common.jar stax-api-1.0.jar junit-3.8.1.jar saxon8.jar"/>
- -->
<property name="xts11.compile.libs" value="ws-c11.jar ws-t11.jar wscf11.jar wstx11.jar"/>
<property name="xts.compile.libs" value="jbossxts-api.jar ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar"/>
- <property name="xts.ext.compile.libs" value="jbossjta.jar jbossjts.jar"/>
- <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
- <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
- <property name="jboss.compile.client.libs" value="${jboss.client.lib.jars}"/>
- <property name="jboss.compile.lib.jars" value="dom4j.jar"/>
- <property name="jboss.compile.common.libs" value="servlet-api.jar"/>
- <property name="dist.compile.libs" value="junit.jar"/>
+ <property name="xts.ext.libs" value="junit.jar"/>
- <!--
- <property name="dist.dependency.libs" value="wstx-asl-2.0.3.jar"/>
- <property name="dist.libs" value="${dist.compile.libs} ${dist.dependency.libs}"/>
- -->
- <property name="dist.libs" value="${dist.compile.libs}"/>
- <property name="dist.xts.libs" value="${xts11.compile.libs} ${xts.compile.libs}"/>
- <property name="dist.xts.ext.libs" value="${xts.ext.compile.libs}"/>
+ <property name="xts.libs" value="${xts11.compile.libs} ${xts.compile.libs}"/>
<property name="compile.debug" value="true"/>
@@ -93,12 +135,9 @@
<target name="compile" depends="init">
<javac destdir="${build.classes.dir}" srcdir="${src.dir}" debug="${compile.debug}">
<classpath>
- <fileset dir="${lib.dir}" includes="${dist.compile.libs}"/>
- <fileset dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
- <fileset dir="${xts.ext.lib.dir}" includes="${dist.xts.ext.libs}"/>
- <fileset dir="${jboss.client.lib.dir}" includes="${jboss.compile.client.libs}"/>
- <fileset dir="${jboss.lib.dir}" includes="${jboss.compile.lib.jars}"/>
- <fileset dir="${jboss.common.lib.dir}" includes="${jboss.compile.common.libs}"/>
+ <fileset dir="${xts.home}/lib" includes="${xts.libs}"/>
+ <fileset dir="${xts.ext.dir}" includes="${xts.ext.libs}"/>
+ <path refid="build.classpath"/>
</classpath>
</javac>
</target>
@@ -134,21 +173,17 @@
<war destfile="${build.war.file}" webxml="${build.webxml.file}">
<classes dir="${build.classes.dir}"/>
<classes dir="${src.dir}" excludes="**/*.java"/>
- <lib dir="${lib.dir}" includes="${dist.libs}"/>
- <!--
- <lib dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
- -->
<webinf dir="${dd.dir}/interop11" includes="wsdl/*.wsdl"/>
- <fileset dir="${web.dir}"/>
+ <fileset dir="${web.dir}"/>
</war>
</target>
<target name="deploy" depends="war">
- <copy file="${build.war.file}" todir="${jboss.deploy.dir}"/>
+ <copy file="${build.war.file}" todir="${deploy.dir}"/>
</target>
<target name="undeploy">
- <delete file="${jboss.deploy.dir}/interop11.war"/>
+ <delete file="${deploy.dir}/interop11.war"/>
</target>
<target name="clean">
Modified: labs/jbosstm/trunk/XTS/recovery/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/build.xml 2010-02-01 13:37:44 UTC (rev 31339)
+++ labs/jbosstm/trunk/XTS/recovery/build.xml 2010-02-01 16:39:20 UTC (rev 31340)
@@ -20,55 +20,80 @@
@author JBoss Inc.
-->
<project name="recovery" default="jar" basedir=".">
- <!-- Set module name -->
- <property name="modulename" value="recovery"/>
+ <!-- Set module name -->
+ <property name="modulename" value="recovery"/>
- <!-- Set default properties filename -->
- <property name="org.jboss.jbossts.xts.recovery.properties" value="recovery.properties"/>
+ <!-- location of JBossTS parent tree -->
+ <property name="jbossts.dir" location="../.."/>
- <!-- Load Build Properties File -->
- <property file="${org.jboss.jbossts.xts.recovery.properties}"/>
+ <!-- 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"/>
- <!-- Set property defaults -->
- <property environment="env"/>
- <property name="jboss.home" value="${env.JBOSS_HOME}"/>
- <property name="jboss.server" value="default"/>
- <property name="jboss.lib.dir" location="${jboss.home}/lib"/>
- <property name="jboss.client.lib.dir" location="${jboss.home}/client"/>
- <property name="jboss.server.dir" location="${jboss.home}/server/${jboss.server}"/>
- <property name="jboss.server.lib.dir" location="${jboss.server.dir}/lib"/>
- <property name="jboss.common.lib.dir" location="${jboss.home}/common/lib"/>
+ <!-- JBossTS products are in parent install/lib -->
+ <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
+ <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
- <!-- Path names -->
- <property name="org.jboss.jbossts.xts.recovery.src" value="src"/>
- <property name="org.jboss.jbossts.xts.recovery.dest.root" value="build"/>
- <property name="org.jboss.jbossts.xts.recovery.dest" value="build/classes"/>
- <property name="org.jboss.jbossts.xts.recovery.jar.dest" value="build/lib"/>
- <property name="org.jboss.jbossts.xts.recovery.htdocs.dest" value="build/htdocs"/>
+ <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
+ <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
+ <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
- <property name="com.arjuna.buildsystem.dir" location="../../antbuildsystem"/>
- <property name="com.arjuna.jta.install" location="../../install"/>
+ <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
- <property name="com.arjuna.buildsystem.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
- <property name="com.arjuna.jta.install.lib" location="${com.arjuna.jta.install}/lib"/>
- <property name="com.arjuna.jta.install.ext" location="${com.arjuna.jta.install.lib}/ext"/>
- <property name="com.arjuna.xts.ext" location="../ext"/>
+ <property name="xts.ext.dir" location="../ext"/>
- <property name="com.arjuna.buildsystem.lib.jars" value="buildsystem.jar"/>
+ <!-- required JBossTS product jars -->
+ <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
- <property name="jta.lib.jars" value="jbossjta.jar jbossjts.jar"/>
- <property name="jta.ext.jars" value="jbossts-common.jar"/>
- <property name="jta.ext.compile.jars" value="commons-logging.jar"/>
- <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+ <!-- external jars also used by JBossTS -->
+ <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
+
+ <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
+ <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
+
+ <!-- external jars used by XTS for CXF enabled builds -->
+ <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
geronimo-ws-metadata_2.0_spec.jar">
<isset property="cxf.build"/>
</condition>
- <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+
+ <!-- external jars used by XTS for all builds -->
+ <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
- <property name="jboss.common.lib.jars" value="servlet-api.jar"/>
- <property name="jboss.lib.jars" value="dom4j.jar"/>
+ jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
+ <!-- paths internal to build -->
+
+ <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}"/>
+ </path>
+
+ <path id="doclet.classpath">
+ <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
+ </path>
+
+ <property name="build.classpath" refid="build.classpath"/>
+
+ <property name="doclet.classpath" refid="doclet.classpath"/>
+
+ <!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
+ <property environment="env"/>
+ <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+ <property name="jboss.server" value="default"/>
+ <property name="deploy.dir" value="${jboss.home}/derver/${jboss.server}/deploy}"/>
+
+ <!-- internal paths and jars -->
+
+ <property name="recovery.src" value="src"/>
+ <property name="recovery.dest.root" value="build"/>
+ <property name="recovery.dest" value="build/classes"/>
+ <property name="recovery.jar.dest" value="build/lib"/>
+ <property name="recovery.htdocs.dest" value="build/htdocs"/>
+
+ <!--sibling module directories and jars -->
+
<property name="wsas.libs" value="wsas.jar"/>
<property name="wsc.libs" value="ws-c.jar"/>
<property name="wsc-api.libs" value="ws-c-api.jar"/>
@@ -81,149 +106,120 @@
<property name="recovery-api.libs" value="${modulename}-api.jar"/>
<property name="recovery.all.libs" value="${recovery.libs}"/>
- <!-- Define classpath builder task -->
- <path id="com.arjuna.buildsystem.classpath">
- <fileset dir="${com.arjuna.buildsystem.lib}" includes="${com.arjuna.buildsystem.lib.jars}"/>
- </path>
- <property name="com.arjuna.buildsystem.classpath" refid="com.arjuna.buildsystem.classpath"/>
- <taskdef name="classpath-builder" classname="com.hp.mw.buildsystem.ant.ClasspathBuilder" classpathref="com.arjuna.buildsystem.classpath"/>
- <!-- class path behaviour -->
- <property name="build.sysclasspath" value="last"/>
- <property name="com.arjuna.mwlabs.classpathbuilderfilename" location="buildsystem.classpath"/>
-
- <property name="org.jboss.jbossts.xts.recovery.resourcebundle"
+ <property name="recovery.resourcebundle"
value="recovery_msg_en_US.properties"/>
<!--Set external directories -->
- <property name="com.arjuna.mwlabs.wsas.jar.dest" value="../WSAS/build/lib"/>
- <property name="com.arjuna.mwlabs.wsc.jar.dest" value="../WS-C/build/dev/lib"/>
- <property name="com.arjuna.mwlabs.wscf.jar.dest" value="../WSCF/build/lib"/>
- <property name="com.arjuna.mwlabs.wst.jar.dest" value="../WS-T/build/dev/lib"/>
- <property name="com.arjuna.mwlabs.wstx.jar.dest" value="../WSTX/build/lib"/>
+ <property name="wsas.jar.dest" value="../WSAS/build/lib"/>
+ <property name="wsc.jar.dest" value="../WS-C/build/dev/lib"/>
+ <property name="wscf.jar.dest" value="../WSCF/build/lib"/>
+ <property name="wst.jar.dest" value="../WS-T/build/dev/lib"/>
+ <property name="wstx.jar.dest" value="../WSTX/build/lib"/>
- <path id="org.jboss.jbossts.xts.recovery.lib.classpath">
- <fileset dir="${com.arjuna.jta.install.lib}" includes="${jta.lib.jars}"/>
- <fileset dir="${com.arjuna.jta.install.ext}" includes="${jta.ext.jars} ${jta.ext.compile.jars}"/>
- <fileset dir="${jboss.client.lib.dir}" includes="${jboss.client.lib.jars}"/>
- <fileset dir="${jboss.common.lib.dir}" includes="${jboss.common.lib.jars}"/>
- <fileset dir="${com.arjuna.mwlabs.wsas.jar.dest}" includes="${wsas.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wsc.jar.dest}" includes="${wsc.libs} ${wsc-api.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wscf.jar.dest}" includes="${wscf.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wst.jar.dest}" includes="${wst.libs} ${wst-api.libs}"/>
- <fileset dir="${com.arjuna.mwlabs.wstx.jar.dest}" includes="${wstx.libs} ${wstx-api.libs}"/>
+ <path id="recovery.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="${wscf.jar.dest}" includes="${wscf.libs}"/>
+ <fileset dir="${wst.jar.dest}" includes="${wst.libs} ${wst-api.libs}"/>
+ <fileset dir="${wstx.jar.dest}" includes="${wstx.libs} ${wstx-api.libs}"/>
</path>
<!-- Initialisation -->
- <target name="org.jboss.jbossts.xts.recovery.init">
+ <target name="recovery.init">
<!-- Define default build properties -->
<tstamp>
- <format property="org.jboss.jbossts.xts.recovery.date" pattern="yyyy/mm/dd hh:mm aa"/>
+ <format property="recovery.date" pattern="yyyy/mm/dd hh:mm aa"/>
</tstamp>
<!-- Make the destination directory -->
- <mkdir dir="${org.jboss.jbossts.xts.recovery.dest}"/>
+ <mkdir dir="${recovery.dest}"/>
</target>
<!-- Compilation targets -->
- <target name="org.jboss.jbossts.xts.recovery.compile"
- depends="org.jboss.jbossts.xts.recovery.compile-generic,
- org.jboss.jbossts.xts.recovery.htdocs, org.jboss.jbossts.xts.recovery.generateresourcebundle"/>
+ <target name="recovery.compile"
+ depends="recovery.compile-generic,
+ recovery.htdocs, recovery.generateresourcebundle"/>
- <target name="org.jboss.jbossts.xts.recovery.compile-generic" depends="org.jboss.jbossts.xts.recovery.init">
+ <target name="recovery.compile-generic" depends="recovery.init">
<echo message="Compiling module generic code"/>
- <javac srcdir="${org.jboss.jbossts.xts.recovery.src}"
- destdir="${org.jboss.jbossts.xts.recovery.dest}"
+ <javac srcdir="${recovery.src}"
+ destdir="${recovery.dest}"
debug="on">
<classpath>
- <path refid="org.jboss.jbossts.xts.recovery.lib.classpath"/>
+ <path refid="recovery.lib.classpath"/>
</classpath>
</javac>
</target>
<!-- Build htdocs for just mw, or mw and mwlabs -->
- <property name="org.jboss.jbossts.xts.recovery.htdocs.list" value="org.jboss.jbosts.xts.*"/>
+ <property name="recovery.htdocs.list" value="org.jboss.jbosts.xts.*"/>
<!-- Jar targets -->
- <target name="org.jboss.jbossts.xts.recovery.jar" depends="org.jboss.jbossts.xts.recovery.compile">
+ <target name="xts.recovery.jar" depends="recovery.compile">
<echo message="Building jar file"/>
- <mkdir dir="${org.jboss.jbossts.xts.recovery.jar.dest}"/>
+ <mkdir dir="${recovery.jar.dest}"/>
- <jar jarfile="${org.jboss.jbossts.xts.recovery.jar.dest}/${modulename}.jar">
- <fileset dir="${org.jboss.jbossts.xts.recovery.dest}"/>
+ <jar jarfile="${recovery.jar.dest}/${modulename}.jar">
+ <fileset dir="${recovery.dest}"/>
</jar>
</target>
- <target name="org.jboss.jbossts.xts.recovery.htdocs"
- depends="org.jboss.jbossts.xts.recovery.init">
+ <target name="recovery.htdocs"
+ depends="recovery.init">
<echo message="Building htdocs "/>
- <mkdir dir="${org.jboss.jbossts.xts.recovery.htdocs.dest}"/>
+ <mkdir dir="${recovery.htdocs.dest}"/>
<path id="org.jboss.jbossts.xts.recovery.htdocs.path">
<pathelement path="src"/>
</path>
- <!--
- <javadoc
- sourcepathref="org.jboss.jbossts.xts.recovery.htdocs.path"
- destdir="${org.jboss.jbossts.xts.recovery.htdocs.dest}"
- packagenames="${org.jboss.jbossts.xts.recovery.htdocs.list}"
- >
- <classpath>
- <path refid="org.jboss.jbossts.xts.recovery.lib.classpath"/>
- <path path="${org.jboss.jbossts.xts.recovery.src}"/>
- </classpath>
- </javadoc>
- -->
<javadoc
- destdir="${org.jboss.jbossts.xts.recovery.htdocs.dest}"
- packagenames="${org.jboss.jbossts.xts.recovery.htdocs.list}"
+ destdir="${recovery.htdocs.dest}"
+ packagenames="${recovery.htdocs.list}"
>
<fileset dir="src" includes="**"/>
<classpath>
- <path refid="org.jboss.jbossts.xts.recovery.lib.classpath"/>
- <path path="${org.jboss.jbossts.xts.recovery.src}"/>
+ <path refid="recovery.lib.classpath"/>
+ <path path="${recovery.src}"/>
</classpath>
</javadoc>
</target>
- <target name="org.jboss.jbossts.xts.recovery.generateresourcebundle">
+ <target name="recovery.generateresourcebundle">
<echo message="Generating recovery Bundle"/>
- <classpath-builder filename="${com.arjuna.mwlabs.classpathbuilderfilename}" inproperty="build.classpath"/>
-
<javadoc packagenames="com.arjuna.*"
failonerror="yes"
private="yes"
defaultexcludes="yes"
classpath="${build.classpath}">
- <packageset dir="${org.jboss.jbossts.xts.recovery.src}" defaultexcludes="yes">
+ <packageset dir="${recovery.src}" defaultexcludes="yes">
<include name="org/jboss/jbossts/**"/>
</packageset>
<doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
- <path>
- <pathelement path="${com.arjuna.buildsystem.classpath}"/>
- </path>
- <param name="-basedir" value="${basedir}/${org.jboss.jbossts.xts.recovery.dest}"/>
- <param name="-resourcebundle" value="${org.jboss.jbossts.xts.recovery.resourcebundle}"/>
+ <path refid="doclet.classpath"/>
+ <param name="-basedir" value="${basedir}/${recovery.dest}"/>
+ <param name="-resourcebundle" value="${recovery.resourcebundle}"/>
</doclet>
</javadoc>
</target>
<!-- Clean targets -->
- <target name="org.jboss.jbossts.xts.recovery.clean">
+ <target name="recovery.clean">
<echo message="Cleaning module"/>
- <delete dir="${org.jboss.jbossts.xts.recovery.dest}"/>
- <delete dir="${org.jboss.jbossts.xts.recovery.dest.root}"/>
- <delete dir="${org.jboss.jbossts.xts.recovery.htdocs.dest}"/>
- <delete file="${org.jboss.jbossts.xts.recovery.jar.dest}/${modulename}.jar"/>
+ <delete dir="${recovery.dest}"/>
+ <delete dir="${recovery.dest.root}"/>
+ <delete dir="${recovery.htdocs.dest}"/>
+ <delete file="${recovery.jar.dest}/${modulename}.jar"/>
</target>
<!-- Short target names -->
- <target name="compile" depends="org.jboss.jbossts.xts.recovery.compile"/>
- <target name="jar" depends="org.jboss.jbossts.xts.recovery.jar"/>
- <target name="clean" depends="org.jboss.jbossts.xts.recovery.clean"/>
+ <target name="compile" depends="recovery.compile"/>
+ <target name="jar" depends="xts.recovery.jar"/>
+ <target name="clean" depends="recovery.clean"/>
</project>
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2010-02-01 13:37:44 UTC (rev 31339)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2010-02-01 16:39:20 UTC (rev 31340)
@@ -28,12 +28,14 @@
<!-- The properties to override are the following: -->
<!-- coordinator.hostname (defaults to ${hostname}) -->
<!-- coordinator.port (defaults to ${port}) -->
- <!-- xts.home The installation directory for XTS -->
<!-- server deployment directory (set via env var JBOSS_HOME) -->
<!-- ================================================================== -->
<!-- devs: run 'ant jta; cd XTS; ant install' after svn checkout -->
+ <!-- Set module name -->
+ <property name="modulename" value="recovery"/>
+
<!-- the directory in which XTS resides -->
<property name="xts.home" value="../xts-install"/>
@@ -47,17 +49,68 @@
jboss web service HTTP listener port employed when jboss is started -->
<property name="coordinator.port" value="jboss.web.bind.port"/>
- <!-- the directory in which your installed app server resides -->
- <property environment="env"/>
+ <!-- location of JBossTS parent tree -->
+ <property name="jbossts.dir" location="../.."/>
- <condition property="jbossas.home" value="${env.JBOSS_HOME}">
- <isset property="env.JBOSS_HOME"/>
+ <!-- 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"/>
+
+ <!-- JBossTS products are in parent install/lib -->
+ <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
+ <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
+
+ <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
+ <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
+ <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
+
+ <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
+
+ <property name="xts.ext.dir" location="../ext"/>
+
+ <!-- required JBossTS product jars -->
+ <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
+
+ <!-- external jars also used by JBossTS -->
+ <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
+
+ <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
+ <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
+
+ <!-- external jars used by XTS for CXF enabled builds -->
+ <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+ geronimo-ws-metadata_2.0_spec.jar">
+ <isset property="cxf.build"/>
</condition>
- <fail unless="jbossas.home">
-The JBoss installation directory must be specified with the JBOSS_HOME environment variable or the jboss.home property.
- </fail>
+ <!-- external jars used by XTS for all builds -->
+ <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
+ jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
+ jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
+ <!-- paths internal to build -->
+
+ <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}"/>
+ </path>
+
+ <path id="doclet.classpath">
+ <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
+ </path>
+
+ <property name="build.classpath" refid="build.classpath"/>
+
+ <property name="doclet.classpath" refid="doclet.classpath"/>
+
+ <!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
+ <property environment="env"/>
+ <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+ <property name="jboss.server" value="default"/>
+ <property name="deploy.dir" value="${jboss.home}/derver/${jboss.server}/deploy}"/>
+
+ <!-- we assume the core XTS modules have already been installedi.e. WSAS, WS-C, WS-T, WSCF, WSTX, recovery -->
<property name="lib.dir" location="${xts.home}/lib"/>
<property name="webapps.dir" location="${xts.home}/webapps"/>
<property name="conf.dir" location="${xts.home}/conf"/>
@@ -71,15 +124,6 @@
<property name="build.metainf.dir" value="${build.dir}/META-INF"/>
<property name="build.conf.dir" location="${build.dir}/conf"/>
- <condition property="cxf.client.lib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
- <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
-
- <property name="jboss.client.lib.dir" value="${jbossas.home}/client"/>
<!-- enable debugging of XTS service code -->
<property name="javac.debug" value="on"/>
@@ -87,17 +131,7 @@
<!-- name of the resource bundle -->
<property name="xts.resourcebundle"
value="xts_msg_en_US.properties"/>
- <!-- Define buildsystem classpath -->
- <property name="com.arjuna.buildsystem.lib.jars" value="buildsystem.jar"/>
- <property name="com.arjuna.buildsystem.dir" location="../../antbuildsystem"/>
- <property name="com.arjuna.buildsystem.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
-
- <path id="com.arjuna.buildsystem.classpath">
- <fileset dir="${com.arjuna.buildsystem.lib}" includes="${com.arjuna.buildsystem.lib.jars}"/>
- </path>
- <property name="com.arjuna.buildsystem.classpath" refid="com.arjuna.buildsystem.classpath"/>
-
<property name="bridge.api.class.files" value="org/jboss/jbossts/xts/bridge/at/BridgeWrapper.class"/>
<target name="init">
@@ -115,25 +149,22 @@
<!-- by default build XTS service archive supporting 1.1 WS-C/T protocols -->
<target name="sar" depends="sar-11"/>
+ <!-- compile the generic classes in the sar source -->
<target name="compile" depends="init">
<javac srcdir="src" destdir="${build.classes.dir}" debug="${javac.debug}" excludes="org/jboss/jbossts/xts/bridge/**/*" >
<classpath>
- <fileset dir="${jboss.client.lib.dir}" includes="${jboss.client.lib.jars}"/>
- <pathelement location="${jbossas.home}/lib/jboss-system-jmx.jar"/>
+ <path refid="build.classpath"/>
<fileset dir="${lib.dir}" includes="*.jar"/>
- <fileset dir="${lib.dir}/ext" includes="jbossjta.jar jbossjts.jar jbossts-common.jar"/>
</classpath>
</javac>
</target>
<!-- compile the 1.1 specific classes in the sar source which support WS-AT 1.1. bridging -->
- <target name="compile11" depends="compile">
+ <target name="compile.bridge" depends="compile">
<javac srcdir="src" destdir="${build.classes.dir}" debug="${javac.debug}" includes="org/jboss/jbossts/xts/bridge/**/*" >
<classpath>
- <fileset dir="${jboss.client.lib.dir}" includes="${jboss.client.lib.jars}"/>
- <pathelement location="${jbossas.home}/lib/jboss-system-jmx.jar"/>
+ <path refid="build.classpath"/>
<fileset dir="${lib.dir}" includes="*.jar"/>
- <fileset dir="${lib.dir}/ext" includes="jbossjta.jar jbossjts.jar jbossts-common.jar"/>
</classpath>
</javac>
</target>
@@ -153,15 +184,14 @@
</packageset>
<doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
- <path>
- <pathelement path="${com.arjuna.buildsystem.classpath}"/>
- </path>
+ <path refid="doclet.classpath"/>
<param name="-basedir" value="${basedir}/${build.classes.dir}"/>
<param name="-resourcebundle" value="${xts.resourcebundle}"/>
</doclet>
</javadoc>
</target>
+ <!-- build the full api jar -->
<target name="api-both-jar">
<mkdir dir="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-c-api.jar" dest="${build.dir}/tmp/api"/>
@@ -181,6 +211,7 @@
<delete dir="${build.dir}/tmp/api"/>
</target>
+ <!-- build the 1.1 api jar -->
<target name="api11-jar">
<mkdir dir="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-c-api.jar" dest="${build.dir}/tmp/api"/>
@@ -197,6 +228,7 @@
<delete dir="${build.dir}/tmp/api"/>
</target>
+ <!-- build the 1.0 api jar -->
<target name="api10-jar">
<mkdir dir="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-c-api.jar" dest="${build.dir}/tmp/api"/>
@@ -211,7 +243,7 @@
</target>
<!-- build XTS service archive supporting both 1.0 and 1.1 WS-C/T protocols -->
- <target name="sar-both" depends="init, compile11, compile, dev-resourcebundle, api-both-jar">
+ <target name="sar-both" depends="init, compile.bridge, compile, dev-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}"/>
@@ -256,7 +288,7 @@
</target>
<!-- build XTS service archive supporting 1.1 WS-C/T protocols -->
- <target name="sar-11" depends="init, compile11, compile, dev-resourcebundle, api11-jar">
+ <target name="sar-11" depends="init, compile.bridge, compile, dev-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}"/>
@@ -346,15 +378,15 @@
<!-- convenience targets to build and deploy the service archive -->
<target name="deploy-11" depends="undeploy, sar-11">
- <copy file="${build.dir}/jbossxts.sar" todir="${jbossas.home}/server/default/deploy"/>
+ <copy file="${build.dir}/jbossxts.sar" todir="${jboss.home}/server/default/deploy"/>
</target>
<target name="deploy-10" depends="undeploy, sar-10">
- <copy file="${build.dir}/jbossxts.sar" todir="${jbossas.home}/server/default/deploy"/>
+ <copy file="${build.dir}/jbossxts.sar" todir="${jboss.home}/server/default/deploy"/>
</target>
<target name="deploy-both" depends="undeploy, sar-both">
- <copy file="${build.dir}/jbossxts.sar" todir="${jbossas.home}/server/default/deploy"/>
+ <copy file="${build.dir}/jbossxts.sar" todir="${deploy.dir}"/>
</target>
<!-- by default deploy sar implementing 1.1 and 1.0 WS-C/T protocols -->
@@ -362,7 +394,7 @@
</target>
<target name="undeploy">
- <delete file="${jbossas.home}/server/default/deploy/jbossxts.sar"/>
+ <delete file="${deploy.dir}/jbossxts.sar"/>
</target>
</project>
More information about the jboss-svn-commits
mailing list