[jboss-svn-commits] JBL Code SVN: r32736 - in labs/jbosstm/trunk/XTS: WS-C and 26 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 5 05:48:31 EDT 2010
Author: adinn
Date: 2010-05-05 05:48:29 -0400 (Wed, 05 May 2010)
New Revision: 32736
Added:
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/wsc/common/
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/wsc/common/Environment.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/common/Environment.java
Removed:
labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/common/Environment.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/common/Environment.java
labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/common/Environment.java
labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/common/Environment.java
Modified:
labs/jbosstm/trunk/XTS/WS-C/build.xml
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/ActivationCoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/RegistrationCoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_application.xml
labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestUtil11.java
labs/jbosstm/trunk/XTS/WS-T/build.xml
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationParticipantInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionCoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionInitiatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/ParticipantInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionCoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionParticipantInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionCoordinatorInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionParticipantInitialisation.java
labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_application.xml
labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java
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/WSTX/classes11/com/arjuna/mw/wst11/deploy/WSTXInitialisation.java
labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/at/remote/UserTransactionImple.java
labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/ba/remote/UserBusinessActivityImple.java
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/sar/build.xml
labs/jbosstm/trunk/XTS/sar/src/org/jboss/jbossts/XTSService.java
labs/jbosstm/trunk/XTS/sharedbuild.xml
Log:
reorganized build scripts to use common macros from sharedbuild.xml and to ensure clean separation of 10 and 11 builds. included reorganizing config properties set by XTSService
Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-05-05 09:48:29 UTC (rev 32736)
@@ -87,6 +87,8 @@
<property name="wsc.resourcebundle"
value="wsc_msg_en_US.properties"/>
+ <!-- module targets -->
+
<target name="clean">
<delete dir="${build.dir}"/>
<delete dir="${tests.build.dir}"/>
@@ -120,74 +122,69 @@
<mkdir dir="${tests.build.webapps.dir}"/>
</target>
- <target name="compile-generic" depends="init">
- <javac destdir="${build.classes.dir}" debug="${debug}" deprecation="${deprecation}">
- <classpath>
- <path refid="build.classpath"/>
- </classpath>
- <src path="${src.dir}"/>
- </javac>
+ <target name="compile-generic">
+ <compile.macro/>
</target>
- <target name="compile10" depends="compile-generic">
- <javac destdir="${build.classes10.dir}" debug="${debug}" deprecation="${deprecation}">
- <classpath>
+ <target name="compile10" if="build10">
+ <compile.macro src.dir="${src10.dir}" dest.dir="${build.classes10.dir}">
+ <additional.classpath>
<path>
<pathelement path="${build.classes.dir}"/>
</path>
- <path refid="build.classpath"/>
- </classpath>
- <src path="${src10.dir}"/>
- </javac>
+ </additional.classpath>
+ </compile.macro>
<copy todir="${build.classes10.dir}">
<fileset dir="${src10.dir}" excludes="**/*.java"/>
</copy>
</target>
- <target name="compile11" depends="compile-generic">
- <javac destdir="${build.classes11.dir}" debug="${debug}" deprecation="${deprecation}">
- <classpath>
+ <target name="compile11">
+ <compile.macro src.dir="${src11.dir}" dest.dir="${build.classes11.dir}">
+ <additional.classpath>
<path>
<pathelement path="${build.classes.dir}"/>
</path>
- <path refid="build.classpath"/>
- </classpath>
- <src path="${src11.dir}"/>
- </javac>
+ </additional.classpath>
+ </compile.macro>
</target>
- <target name="compile" depends="compile11, compile10"/>
+ <target name="compile" depends="init, compile-generic, compile10, compile11"/>
- <target name="resourcebundle">
+ <target name="resourcebundle-both" if="build10">
<echo message="Generating WS-C Bundle"/>
+ <resourcebundle.macro resourcebundle="${wsc.resourcebundle}">
+ <packagesets>
+ <packageset dir="${src.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ </packageset>
+ <packageset dir="${src10.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ </packageset>
+ <packageset dir="${src11.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ </packageset>
+ </packagesets>
+ </resourcebundle.macro>
+ </target>
- <javadoc packagenames="com.arjuna.*"
- failonerror="yes"
- private="yes"
- defaultexcludes="yes"
- classpathref="build.classpath">
+ <target name="resourcebundle11" if="nobuild10">
+ <echo message="Generating WS-C Bundle"/>
+ <resourcebundle.macro resourcebundle="${wsc.resourcebundle}">
+ <packagesets>
+ <packageset dir="${src.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ </packageset>
+ <packageset dir="${src11.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ </packageset>
+ </packagesets>
+ </resourcebundle.macro>
+ </target>
- <packageset dir="${src.dir}" defaultexcludes="yes">
- <include name="com/arjuna/**"/>
- </packageset>
+ <target name="resourcebundle" depends="resourcebundle-both, resourcebundle11"/>
- <packageset dir="${src10.dir}" defaultexcludes="yes">
- <include name="com/arjuna/**"/>
- </packageset>
-
- <packageset dir="${src11.dir}" defaultexcludes="yes">
- <include name="com/arjuna/**"/>
- </packageset>
-
- <doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
- <path refid="doclet.classpath"/>
- <param name="-basedir" value="${basedir}/${build.classes.dir}"/>
- <param name="-resourcebundle" value="${wsc.resourcebundle}"/>
- </doclet>
- </javadoc>
- </target>
-
- <target name="jars" depends="compile, resourcebundle" >
+ <target name="wsdl11" >
<!-- wsdl files for services - loaded as /WEB-INF/wsdl/... -->
<copy file="${dd.dir}/wscoor1.1/wsdl/wscoor.wsdl" tofile="${build.dd.dir}/wsdl/wscoor.wsdl"/>
<copy file="${dd.dir}/wscoor1.1/wsdl/wscoor.xsd" tofile="${build.dd.dir}/wsdl/wscoor.xsd"/>
@@ -202,14 +199,28 @@
<copy file="${dd.dir}/wscoor1.1/wsdl/ws-addr.xsd" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/ws-addr.xsd"/>
<copy file="${dd.dir}/wscoor1.1/wsdl/wscoor-activation-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor-activation-binding.wsdl"/>
<copy file="${dd.dir}/wscoor1.1/wsdl/wscoor-registration-binding.wsdl" tofile="${build.classes11.dir}/org/oasis_open/docs/ws_tx/wscoor/_2006/_06/wsdl/wscoor-registration-binding.wsdl"/>
+ <copy file="${dd.dir}/soapfault/wsdl/soapfault.wsdl" tofile="${build.classes11.dir}/org/jboss/jbossts/xts/soapfault/wsdl/soapfault.wsdl"/>
+ </target>
- <copy file="${dd.dir}/soapfault/wsdl/soapfault.wsdl" tofile="${build.classes11.dir}/org/jboss/jbossts/xts/soapfault/wsdl/soapfault.wsdl"/>
+ <target name="jars-generic">
<jar jarfile="${build.lib.dir}/ws-c.jar">
<fileset dir="${build.classes.dir}" excludes="${ws-c.api.classes}"/>
</jar>
<jar jarfile="${build.lib.dir}/ws-c-api.jar">
<fileset dir="${build.classes.dir}" includes="${ws-c.api.classes}"/>
</jar>
+ </target>
+
+ <target name="jars11">
+ <jar jarfile="${build.lib.dir}/ws-c11.jar">
+ <fileset dir="${build.classes11.dir}">
+ <exclude name="com/arjuna/webservices11/wscoor/sei/**"/>
+ <exclude name="handlers.xml"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="jars10" if="build10">
<jar jarfile="${build.lib.dir}/ws-c10.jar">
<fileset dir="${build.classes10.dir}" excludes="${ws-c10.api.classes}"/>
</jar>
@@ -224,21 +235,26 @@
</jar>
</target>
- <target name="webapps" depends="jars" >
- <copy file="${dd.dir}/ws-c_web-app.xml" tofile="${build.dd.dir}/web-app.xml">
- </copy>
- <copy file="${dd.dir}/ws-c11_web-app.xml" tofile="${build.dd.dir}/web-app11.xml">
- </copy>
+ <target name="jars" depends="compile, resourcebundle, wsdl11, jars11, jars10, jars-generic"/>
+
+ <target name="webapps10" if="build10">
+ <copy file="${dd.dir}/ws-c_web-app.xml" tofile="${build.dd.dir}/web-app.xml"/>
+ <war warfile="${build.webapps.dir}/ws-c10.war" webxml="${build.dd.dir}/web-app.xml"/>
+ </target>
+
+ <target name="webapps11" depends="jars11" >
+ <copy file="${dd.dir}/ws-c11_web-app.xml" tofile="${build.dd.dir}/web-app11.xml"/>
<copy file="${dd.dir}/ws-c_handlers.xml" tofile="${build.classes11.dir}/handlers.xml"/>
- <war warfile="${build.webapps.dir}/ws-c10.war" webxml="${build.dd.dir}/web-app.xml"/>
<war warfile="${build.webapps.dir}/ws-c11.war" webxml="${build.dd.dir}/web-app11.xml">
<webinf dir="${build.dir}/classes11" includes="classes/com/arjuna/webservices11/wscoor/sei/* classes/handlers.xml"/>
<webinf dir="${build.dd.dir}" includes="wsdl/**"/>
</war>
</target>
+ <target name="webapps" depends="jars, webapps11, webapps10"/>
+
<!-- this assumes the required libs have already been built -->
- <target name="tests-compile">
+ <target name="tests-compile10" if="build10">
<javac destdir="${tests.build.classes.dir}" debug="${debug}" deprecation="${deprecation}">
<classpath>
<pathelement path="${build.lib.dir}/ws-c.jar"/>
@@ -252,6 +268,7 @@
<src path="${tests.src.dir}"/>
</javac>
</target>
+
<!-- this assumes the required libs have already been built -->
<target name="tests-compile11">
<javac destdir="${tests.build.classes.dir}" debug="${debug}" deprecation="${deprecation}">
@@ -268,21 +285,33 @@
</javac>
</target>
- <target name="tests-webapps" depends="tests-compile" >
- <copy file="${tests.dd.dir}/ws-c-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app.xml">
- </copy>
- <copy file="${tests.dd.dir}/ws-c11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml">
- </copy>
+ <target name="tests-compile" depends="tests-compile10, tests-compile11"/>
+
+ <target name="tests-jar" depends="tests-compile">
<jar jarfile="${tests.build.lib.dir}/xts-test-servlet.jar">
<fileset dir="${tests.build.classes.dir}" includes="com/arjuna/qa/junit/*.class"/>
</jar>
<jar jarfile="${tests.build.lib.dir}/ws-c-tests.jar">
- <fileset dir="${tests.build.classes.dir}" />
+ <fileset dir="${tests.build.classes.dir}" excludes="com/arjuna/qa/junit/*.class"/>
</jar>
+ </target>
+
+ <target name="tests-webapps10" if="build10">
+ <copy file="${tests.dd.dir}/ws-c-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app.xml"/>
<war warfile="${tests.build.webapps.dir}/ws-c-tests.war" webxml="${tests.build.dd.dir}/web-app.xml">
</war>
+ </target>
+
+ <target name="tests-webapps11">
+ <copy file="${tests.dd.dir}/ws-c11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml"/>
<war warfile="${tests.build.webapps.dir}/ws-c11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml">
+ <classes dir="${tests.build.classes.dir}" excludes="com/arjuna/qa/junit/**/*.class"/>
</war>
+ </target>
+
+ <target name="tests-webapps" depends="tests-jar, tests-webapps10, tests-webapps11"/>
+
+ <target name="tests-ear-both" if="build10">
<ear earfile="${tests.build.webapps.dir}/ws-c-tests.ear" appxml="${tests.dd.dir}/ws-c-tests_application.xml">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${tests.build.webapps.dir}" includes="ws-c-tests.war"/>
@@ -292,39 +321,24 @@
</ear>
</target>
- <target name="tests-webapps11" depends="tests-compile11" >
- <copy file="${tests.dd.dir}/ws-c11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml">
- </copy>
- <jar jarfile="${tests.build.lib.dir}/xts-test-servlet.jar">
- <fileset dir="${tests.build.classes.dir}" includes="com/arjuna/qa/junit/*.class"/>
- </jar>
- <jar jarfile="${tests.build.lib.dir}/ws-c11-tests.jar">
- <fileset dir="${tests.build.classes.dir}" />
- </jar>
- <war warfile="${tests.build.webapps.dir}/ws-c11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml">
- <classes dir="${tests.build.classes.dir}" excludes="com/arjuna/qa/junit/**/*.class"/>
- </war>
+ <target name="tests-ear11" if="nobuild10">
<ear earfile="${tests.build.webapps.dir}/ws-c-tests.ear" appxml="${tests.dd.dir}/ws-c11-tests_application.xml">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${tests.build.webapps.dir}" includes="ws-c11-tests.war"/>
- <fileset dir="${tests.build.lib.dir}" includes="ws-c11-tests.jar"/>
+ <fileset dir="${tests.build.lib.dir}" includes="ws-c-tests.jar"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
</target>
- <!-- production target for 1.1 tests -->
- <target name="tests-11" depends="tests-webapps11"/>
+ <target name="tests-ear" depends="tests-webapps, tests-ear-both, tests-ear11"/>
- <target name="tests-both" depends="tests-webapps"/>
+ <!-- production target for tests -->
+ <target name="tests" depends="tests-ear"/>
- <target name="tests-deploy" depends="tests-webapps, tests-undeploy">
+ <target name="tests-deploy" depends="tests-ear, tests-undeploy">
<copy file="${tests.build.webapps.dir}/ws-c-tests.ear" tofile="${deploy.dir}/ws-c-tests.ear"/>
</target>
- <target name="tests-deploy11" depends="tests-webapps11, tests-undeploy">
- <copy file="${tests.build.webapps.dir}/ws-c-tests.ear" tofile="${deploy.dir}/ws-c-tests.ear"/>
- </target>
-
<target name="tests-undeploy">
<delete file="${deploy.dir}/ws-c-tests.ear"/>
</target>
Copied: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/wsc/common/Environment.java (from rev 32563, labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/common/Environment.java)
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/wsc/common/Environment.java (rev 0)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/wsc/common/Environment.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 2003,
+ *
+ * Arjuna Technologies Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Environment.java,v 1.6 2004/09/09 08:48:48 kconner Exp $
+ */
+
+package com.arjuna.wsc.common;
+
+/**
+ */
+
+public interface Environment
+{
+ public static final String XTS_BIND_ADDRESS = "org.jboss.jbossts.xts.bind.address";
+ public static final String XTS_BIND_PORT = "org.jboss.jbossts.xts.bind.port";
+ public static final String XTS_SECURE_BIND_PORT = "org.jboss.jbossts.xts.bind.port.secure";
+ public static final String XTS_COMMAND_LINE_COORDINATOR_URL = "org.jboss.jbossts.xts.command.line.coordinatorURL";
+ public static final String XTS11_BIND_ADDRESS = "org.jboss.jbossts.xts11.bind.address";
+ public static final String XTS11_BIND_PORT = "org.jboss.jbossts.xts11.bind.port";
+ public static final String XTS11_SECURE_BIND_PORT = "org.jboss.jbossts.xts11.bind.port.secure";
+ public static final String XTS11_COMMAND_LINE_COORDINATOR_URL = "org.jboss.jbossts.xts11.command.line.coordinatorURL";
+}
\ No newline at end of file
Deleted: labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/common/Environment.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/common/Environment.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src10/com/arjuna/wsc/common/Environment.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2003,
- *
- * Arjuna Technologies Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Environment.java,v 1.6 2004/09/09 08:48:48 kconner Exp $
- */
-
-package com.arjuna.wsc.common;
-
-/**
- */
-
-public interface Environment
-{
-
- public static final String XTS_BIND_ADDRESS = "org.jboss.jbossts.xts.bind.address";
- public static final String XTS_BIND_PORT = "org.jboss.jbossts.xts.bind.port";
- public static final String XTS_SECURE_BIND_PORT = "org.jboss.jbossts.xts.bind.port.secure";
- public static final String XTS_COMMAND_LINE_COORDINATOR_URL = "org.jboss.jbossts.xts.command.line.coordinatorURL";
-}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/ActivationCoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/ActivationCoordinatorInitialisation.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/ActivationCoordinatorInitialisation.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -23,7 +23,7 @@
import com.arjuna.services.framework.startup.Sequencer;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.wsc11.common.Environment;
+import com.arjuna.wsc.common.Environment;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
@@ -44,9 +44,9 @@
Sequencer.Callback callback = new Sequencer.Callback(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WSC11) {
public void run() {
final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
- String bindAddress = System.getProperty(Environment.XTS_BIND_ADDRESS);
- String bindPort = System.getProperty(Environment.XTS_BIND_PORT);
- String secureBindPort = System.getProperty(Environment.XTS_SECURE_BIND_PORT);
+ String bindAddress = System.getProperty(Environment.XTS11_BIND_ADDRESS);
+ String bindPort = System.getProperty(Environment.XTS11_BIND_PORT);
+ String secureBindPort = System.getProperty(Environment.XTS11_SECURE_BIND_PORT);
if (bindAddress == null) {
bindAddress = "127.0.0.1";
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/RegistrationCoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/RegistrationCoordinatorInitialisation.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/webservices11/wscoor/server/RegistrationCoordinatorInitialisation.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -23,7 +23,7 @@
import com.arjuna.services.framework.startup.Sequencer;
import com.arjuna.webservices11.wscoor.CoordinationConstants;
import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.wsc11.common.Environment;
+import com.arjuna.wsc.common.Environment;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
@@ -45,9 +45,9 @@
public void run() {
// TODO work out how to configure the endpoint name here
final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
- String bindAddress = System.getProperty(Environment.XTS_BIND_ADDRESS);
- String bindPort = System.getProperty(Environment.XTS_BIND_PORT);
- String secureBindPort = System.getProperty(Environment.XTS_SECURE_BIND_PORT);
+ String bindAddress = System.getProperty(Environment.XTS11_BIND_ADDRESS);
+ String bindPort = System.getProperty(Environment.XTS11_BIND_PORT);
+ String secureBindPort = System.getProperty(Environment.XTS11_SECURE_BIND_PORT);
if (bindAddress == null) {
bindAddress = "127.0.0.1";
Deleted: labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/common/Environment.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/common/Environment.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src11/com/arjuna/wsc11/common/Environment.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2003,
- *
- * Arjuna Technologies Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Environment.java,v 1.6 2004/09/09 08:48:48 kconner Exp $
- */
-
-package com.arjuna.wsc11.common;
-
-/**
- */
-
-public interface Environment
-{
-
- public static final String XTS_BIND_ADDRESS = "org.jboss.jbossts.xts11.bind.address";
- public static final String XTS_BIND_PORT = "org.jboss.jbossts.xts11.bind.port";
- public static final String XTS_SECURE_BIND_PORT = "org.jboss.jbossts.xts11.bind.port.secure";
- public static final String XTS_COMMAND_LINE_COORDINATOR_URL = "org.jboss.jbossts.xts11.command.line.coordinatorURL";
-
-}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_application.xml 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_application.xml 2010-05-05 09:48:29 UTC (rev 32736)
@@ -35,7 +35,7 @@
</module>
<module>
- <java>ws-c11-tests.jar</java>
+ <java>ws-c-tests.jar</java>
</module>
<module>
Modified: labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestUtil11.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestUtil11.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/src/com/arjuna/wsc11/tests/TestUtil11.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -43,7 +43,7 @@
final private static String PROTOCOL_COORDINATOR_ENDPOINT_NAME ="ProtocolCoordinatorEndpoint";
final private static String PROTOCOL_COORDINATOR_SERVICE_NAME ="ProtocolCoordinatorService";
- final private static String bindHost = System.getProperty(com.arjuna.wsc11.common.Environment.XTS_BIND_ADDRESS);
+ final private static String bindHost = System.getProperty(com.arjuna.wsc.common.Environment.XTS11_BIND_ADDRESS);
final public static String activationCoordinatorService = "http://" + bindHost + ":8080/ws-c11/ActivationService";
final public static String registrationCoordinatorService = "http://" + bindHost + ":8080/ws-c11/RegistrationService";
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-05-05 09:48:29 UTC (rev 32736)
@@ -171,87 +171,90 @@
<mkdir dir="${tests.build.webapps.dir}"/>
</target>
- <target name="compile" depends="compile10, compile11"/>
+ <target name="compile-generic">
+ <compile.macro>
+ <additional.classpath>
+ <path>
+ <pathelement path="${build.classes.dir}"/>
+ </path>
+ <path refid="ws-c.path"/>
+ <path refid="wscf.path"/>
+ <path refid="wsas.path"/>
+ </additional.classpath>
+ </compile.macro>
+ </target>
- <target name="compile10" depends="compile-generic">
- <javac destdir="${build.classes10.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
- <classpath>
+ <target name="compile10" if="build10">
+ <compile.macro src.dir="${src10.dir}" dest.dir="${build.classes10.dir}">
+ <additional.classpath>
<path>
<pathelement path="${build.classes.dir}"/>
</path>
- <path refid="build.classpath"/>
<path refid="ws-c.path"/>
<path refid="ws-c10.path"/>
<path refid="wscf.path"/>
<path refid="wscf10.path"/>
<path refid="wsas.path"/>
- </classpath>
- <src path="${src10.dir}"/>
- </javac>
+ </additional.classpath>
+ </compile.macro>
</target>
- <target name="compile11" depends="compile-generic">
- <javac destdir="${build.classes11.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
- <classpath>
+ <target name="compile11">
+ <compile.macro src.dir="${src11.dir}" dest.dir="${build.classes11.dir}">
+ <additional.classpath>
<path>
<pathelement path="${build.classes.dir}"/>
</path>
- <path refid="build.classpath"/>
<path refid="ws-c.path"/>
<path refid="ws-c11.path"/>
<path refid="wscf.path"/>
<path refid="wscf11.path"/>
<path refid="wsas.path"/>
- </classpath>
- <src path="${src11.dir}"/>
- </javac>
+ </additional.classpath>
+ </compile.macro>
</target>
- <target name="compile-generic" depends="init">
- <javac destdir="${build.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
- <classpath>
- <path refid="build.classpath"/>
- <path refid="ws-c.path"/>
- <path refid="wscf.path"/>
- <path refid="wsas.path"/>
- </classpath>
- <src path="${src.dir}"/>
- </javac>
+ <target name="compile" depends="init, compile-generic, compile10, compile11"/>
+
+ <target name="resourcebundle-both" if="build">
+ <echo message="Generating WS-T Bundle"/>
+ <resourcebundle.macro resourcebundle="${wst.resourcebundle}">
+ <packagesets>
+ <packageset dir="${src.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ <include name="org/jboss/jbossts/xts/**"/>
+ </packageset>
+ <packageset dir="${src10.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ <include name="org/jboss/jbossts/xts/**"/>
+ </packageset>
+ <packageset dir="${src11.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ <include name="org/jboss/jbossts/xts/**"/>
+ </packageset>
+ </packagesets>
+ </resourcebundle.macro>
</target>
- <target name="resourcebundle">
+ <target name="resourcebundle11" if="nobuild10">
<echo message="Generating WS-T Bundle"/>
+ <resourcebundle.macro resourcebundle="${wst.resourcebundle}">
+ <packagesets>
+ <packageset dir="${src.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ <include name="org/jboss/jbossts/xts/**"/>
+ </packageset>
+ <packageset dir="${src11.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ <include name="org/jboss/jbossts/xts//**"/>
+ </packageset>
+ </packagesets>
+ </resourcebundle.macro>
+ </target>
- <javadoc packagenames="com.arjuna.*, org.jboss.jbossts.xts.*"
- failonerror="yes"
- private="yes"
- defaultexcludes="yes"
- classpathref="build.classpath">
+ <target name="resourcebundle" depends="resourcebundle-both, resourcebundle11"/>
- <packageset dir="${src.dir}" defaultexcludes="yes">
- <include name="com/arjuna/**"/>
- <include name="org/jboss/jbossts/xts/**"/>
- </packageset>
-
- <packageset dir="${src10.dir}" defaultexcludes="yes">
- <include name="com/arjuna/**"/>
- <include name="org/jboss/jbossts/xts/**"/>
- </packageset>
-
- <packageset dir="${src11.dir}" defaultexcludes="yes">
- <include name="com/arjuna/**"/>
- <include name="org/jboss/jbossts/xts//**"/>
- </packageset>
-
- <doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
- <path refid="doclet.classpath"/>
- <param name="-basedir" value="${basedir}/${build.classes.dir}"/>
- <param name="-resourcebundle" value="${wst.resourcebundle}"/>
- </doclet>
- </javadoc>
- </target>
-
- <target name="jars" depends="compile, resourcebundle" >
+ <target name="wsdl11">
<!-- wsdl files for services -->
<copy file="${dd.dir}/wscoor1.1/wsdl/wsat.wsdl" tofile="${build.dd.dir}/wsdl/wsat.wsdl"/>
<copy file="${dd.dir}/wscoor1.1/wsdl/wsat.xsd" tofile="${build.dd.dir}/wsdl/wsat.xsd"/>
@@ -300,19 +303,27 @@
<copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx.wsdl" tofile="${build.classes11.dir}/com/arjuna/schemas/ws/_2005/_10/wsarjtx/wsdl/wsarjtx.wsdl"/>
<copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx-termination-coordinator-binding.wsdl" tofile="${build.classes11.dir}/com/arjuna/schemas/ws/_2005/_10/wsarjtx/wsdl/wsarjtx-termination-coordinator-binding.wsdl"/>
<copy file="${dd.dir}/wsarjtx/wsdl/wsarjtx-termination-participant-binding.wsdl" tofile="${build.classes11.dir}/com/arjuna/schemas/ws/_2005/_10/wsarjtx/wsdl/wsarjtx-termination-participant-binding.wsdl"/>
+ </target>
+ <target name="jars-generic" >
<jar jarfile="${build.lib.dir}/ws-t.jar">
<fileset dir="${build.classes.dir}" excludes="${ws-t.api.classes}"/>
</jar>
<jar jarfile="${build.lib.dir}/ws-t-api.jar">
<fileset dir="${build.classes.dir}" includes="${ws-t.api.classes}"/>
</jar>
+ </target>
+
+ <target name="jars10" if="build10">
<jar jarfile="${build.lib.dir}/ws-t10.jar">
<fileset dir="${build.classes10.dir}" excludes="${ws-t10.api.classes}"/>
</jar>
<jar jarfile="${build.lib.dir}/ws-t10-api.jar">
<fileset dir="${build.classes10.dir}" includes="${ws-t10.api.classes}"/>
</jar>
+ </target>
+
+ <target name="jars11">
<jar jarfile="${build.lib.dir}/ws-t11.jar">
<fileset dir="${build.classes11.dir}" excludes="${ws-t11.api.classes} com/arjuna/webservices11/wsat/sei/* com/arjuna/webservices11/wsba/sei/* com/arjuna/webservices11/wsarjtx/sei/* handlers.xml"/>
</jar>
@@ -321,29 +332,33 @@
</jar>
</target>
- <target name="webapps" depends="jars">
- <copy file="${dd.dir}/ws-t_web-app.xml" tofile="${build.dd.dir}/web-app.xml">
- </copy>
- <copy file="${dd.dir}/ws-t11_web-app.xml" tofile="${build.dd.dir}/web-app11.xml">
- </copy>
+ <target name="jars" depends="compile, resourcebundle, wsdl11, jars-generic, jars10, jars11"/>
+
+ <target name="webapps10" if="build10">
+ <copy file="${dd.dir}/ws-t_web-app.xml" tofile="${build.dd.dir}/web-app.xml"/>
<copy file="${dd.dir}/ws-t_handlers.xml" tofile="${build.classes11.dir}/handlers.xml"/>
<war warfile="${build.webapps.dir}/ws-t10.war" webxml="${build.dd.dir}/web-app.xml"/>
+ </target>
+
+ <target name="webapps11" depends="jars11">
+ <copy file="${dd.dir}/ws-t11_web-app.xml" tofile="${build.dd.dir}/web-app11.xml"/>
+ <copy file="${dd.dir}/ws-t_handlers.xml" tofile="${build.classes11.dir}/handlers.xml"/>
<war warfile="${build.webapps.dir}/ws-t11.war" webxml="${build.dd.dir}/web-app11.xml">
<webinf dir="${build.dir}/classes11" includes="classes/com/arjuna/webservices11/wsat/sei/* classes/com/arjuna/webservices11/wsba/sei/* classes/com/arjuna/webservices11/wsarjtx/sei/* classes/handlers.xml"/>
<webinf dir="${build.dd.dir}" includes="wsdl/**"/>
</war>
</target>
+ <target name="webapps" depends="jars, webapps10, webapps11"/>
+
<!-- this assumes all the required libs have been built -->
- <target name="tests-compile">
+ <target name="tests-compile10" if="build10">
<javac destdir="${tests.build.classes.dir}" debug="${javac.debug}" optimize="${javac.optimize}">
<classpath>
<pathelement path="${build.lib.dir}/ws-t.jar"/>
<pathelement path="${build.lib.dir}/ws-t-api.jar"/>
<pathelement path="${build.lib.dir}/ws-t10.jar"/>
<pathelement path="${build.lib.dir}/ws-t10-api.jar"/>
- <pathelement path="${build.lib.dir}/ws-t11.jar"/>
- <pathelement path="${build.lib.dir}/ws-t11-api.jar"/>
<path refid="tests.lib.path"/>
<path refid="build.classpath"/>
<path refid="ws-c.path"/>
@@ -355,6 +370,7 @@
<path refid="wsas.path"/>
</classpath>
<src path="${tests.src.dir}"/>
+ <exclude name="com/arjuna/wst11/tests/**"/>
</javac>
</target>
@@ -375,24 +391,34 @@
<path refid="wsas.path"/>
</classpath>
<src path="${tests.src.dir}"/>
- <include name="com/arjuna/qa/**"/>
- <include name="com/arjuna/wst/tests/common/**"/>
- <include name="com/arjuna/wst11/tests/**"/>
+ <include name="com/arjuna/wst/tests/common/**"/>
+ <include name="com/arjuna/wst11/tests/**"/>
</javac>
</target>
- <target name="tests-webapps" depends="tests-compile">
+ <target name="tests-compile" depends="tests-compile10, tests-compile11"/>
+
+ <target name="tests-jar" depends="tests-compile">
<jar jarfile="${tests.build.lib.dir}/ws-t-tests.jar">
<fileset dir="${tests.build.classes.dir}" excludes="com/arjuna/qa/junit/*.class"/>
</jar>
- <copy file="${tests.dd.dir}/ws-t-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app.xml">
- </copy>
+ </target>
+
+ <target name="tests-webapps10" if="build10">
+ <copy file="${tests.dd.dir}/ws-t-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app.xml"/>
<war warfile="${tests.build.webapps.dir}/ws-t-tests.war" webxml="${tests.build.dd.dir}/web-app.xml">
</war>
- <copy file="${tests.dd.dir}/ws-t11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml">
- </copy>
+ </target>
+
+ <target name="tests-webapps11">
+ <copy file="${tests.dd.dir}/ws-t11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml"/>
<war warfile="${tests.build.webapps.dir}/ws-t11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml">
</war>
+ </target>
+
+ <target name="tests-webapps" depends="tests-jar, tests-webapps10, tests-webapps11"/>
+
+ <target name="tests-ear-both" if="build10">
<ear earfile="${tests.build.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t-tests_application.xml">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${tests.build.webapps.dir}" includes="ws-t-tests.war ws-t11-tests.war"/>
@@ -401,35 +427,24 @@
</ear>
</target>
- <target name="tests-webapps11" depends="tests-compile11">
- <jar jarfile="${tests.build.lib.dir}/ws-t11-tests.jar">
- <fileset dir="${tests.build.classes.dir}"/>
- </jar>
- <copy file="${tests.dd.dir}/ws-t11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml">
- </copy>
- <war warfile="${tests.build.webapps.dir}/ws-t11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml">
- </war>
+ <target name="tests-ear11" if="nobuild10">
<ear earfile="${tests.build.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t11-tests_application.xml">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${tests.build.webapps.dir}" includes="ws-t11-tests.war"/>
- <fileset dir="${tests.build.lib.dir}" includes="ws-t11-tests.jar"/>
+ <fileset dir="${tests.build.lib.dir}" includes="ws-t-tests.jar"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
</target>
- <!-- production target for 1.1 tests -->
- <target name="tests-11" depends="tests-webapps11"/>
+ <target name="tests-ear" depends="tests-webapps, tests-ear-both, tests-ear11"/>
- <target name="tests-both" depends="tests-webapps"/>
+ <!-- production target for tests -->
+ <target name="tests" depends="tests-ear"/>
- <target name="tests-deploy" depends="tests-webapps, tests-undeploy">
+ <target name="tests-deploy" depends="tests-ear, tests-undeploy">
<copy file="${tests.build.webapps.dir}/ws-t-tests.ear" tofile="${deploy.dir}/ws-t-tests.ear"/>
</target>
- <target name="tests-deploy11" depends="tests-webapps11, tests-undeploy">
- <copy file="${tests.build.webapps.dir}/ws-t-tests.ear" tofile="${deploy.dir}/ws-t-tests.ear"/>
- </target>
-
<target name="tests-undeploy">
<delete file="${deploy.dir}/ws-t-tests.ear"/>
</target>
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorInitialisation.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationCoordinatorInitialisation.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -23,7 +23,7 @@
import com.arjuna.services.framework.startup.Sequencer;
import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.wsc11.common.Environment;
+import com.arjuna.wsc.common.Environment;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
@@ -43,9 +43,9 @@
Sequencer.Callback callback = new Sequencer.Callback(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WST11) {
public void run() {
final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
- String bindAddress = System.getProperty(Environment.XTS_BIND_ADDRESS);
- String bindPort = System.getProperty(Environment.XTS_BIND_PORT);
- String secureBindPort = System.getProperty(Environment.XTS_SECURE_BIND_PORT);
+ String bindAddress = System.getProperty(Environment.XTS11_BIND_ADDRESS);
+ String bindPort = System.getProperty(Environment.XTS11_BIND_PORT);
+ String secureBindPort = System.getProperty(Environment.XTS11_SECURE_BIND_PORT);
if (bindAddress == null) {
bindAddress = "127.0.0.1";
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationParticipantInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationParticipantInitialisation.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsarjtx/server/TerminationParticipantInitialisation.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -26,7 +26,7 @@
import com.arjuna.webservices11.wsarjtx.ArjunaTX11Constants;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.services.framework.startup.Sequencer;
-import com.arjuna.wsc11.common.Environment;
+import com.arjuna.wsc.common.Environment;
/**
* Activate the Terminator Coordinator service
@@ -43,9 +43,9 @@
Sequencer.Callback callback = new Sequencer.Callback(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WST11) {
public void run() {
final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
- String bindAddress = System.getProperty(Environment.XTS_BIND_ADDRESS);
- String bindPort = System.getProperty(Environment.XTS_BIND_PORT);
- String secureBindPort = System.getProperty(Environment.XTS_SECURE_BIND_PORT);
+ String bindAddress = System.getProperty(Environment.XTS11_BIND_ADDRESS);
+ String bindPort = System.getProperty(Environment.XTS11_BIND_PORT);
+ String secureBindPort = System.getProperty(Environment.XTS11_SECURE_BIND_PORT);
if (bindAddress == null) {
bindAddress = "127.0.0.1";
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionCoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionCoordinatorInitialisation.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionCoordinatorInitialisation.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -23,7 +23,7 @@
import com.arjuna.services.framework.startup.Sequencer;
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.wsc11.common.Environment;
+import com.arjuna.wsc.common.Environment;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
@@ -45,9 +45,9 @@
Sequencer.Callback callback = new Sequencer.Callback(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WST11) {
public void run() {
final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
- String bindAddress = System.getProperty(Environment.XTS_BIND_ADDRESS);
- String bindPort = System.getProperty(Environment.XTS_BIND_PORT);
- String secureBindPort = System.getProperty(Environment.XTS_SECURE_BIND_PORT);
+ String bindAddress = System.getProperty(Environment.XTS11_BIND_ADDRESS);
+ String bindPort = System.getProperty(Environment.XTS11_BIND_PORT);
+ String secureBindPort = System.getProperty(Environment.XTS11_SECURE_BIND_PORT);
if (bindAddress == null) {
bindAddress = "127.0.0.1";
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionInitiatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionInitiatorInitialisation.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CompletionInitiatorInitialisation.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -27,7 +27,7 @@
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.services.framework.startup.Sequencer;
-import com.arjuna.wsc11.common.Environment;
+import com.arjuna.wsc.common.Environment;
/**
* Activate the Completion Initiator service
@@ -45,9 +45,9 @@
Sequencer.Callback callback = new Sequencer.Callback(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WST11) {
public void run() {
final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
- String bindAddress = System.getProperty(Environment.XTS_BIND_ADDRESS);
- String bindPort = System.getProperty(Environment.XTS_BIND_PORT);
- String secureBindPort = System.getProperty(Environment.XTS_SECURE_BIND_PORT);
+ String bindAddress = System.getProperty(Environment.XTS11_BIND_ADDRESS);
+ String bindPort = System.getProperty(Environment.XTS11_BIND_PORT);
+ String secureBindPort = System.getProperty(Environment.XTS11_SECURE_BIND_PORT);
if (bindAddress == null) {
bindAddress = "127.0.0.1";
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CoordinatorInitialisation.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/CoordinatorInitialisation.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -27,7 +27,7 @@
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.services.framework.startup.Sequencer;
-import com.arjuna.wsc11.common.Environment;
+import com.arjuna.wsc.common.Environment;
/**
* Activate the Coordinator service
@@ -44,9 +44,9 @@
Sequencer.Callback callback = new Sequencer.Callback(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WST11) {
public void run() {
final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
- String bindAddress = System.getProperty(Environment.XTS_BIND_ADDRESS);
- String bindPort = System.getProperty(Environment.XTS_BIND_PORT);
- String secureBindPort = System.getProperty(Environment.XTS_SECURE_BIND_PORT);
+ String bindAddress = System.getProperty(Environment.XTS11_BIND_ADDRESS);
+ String bindPort = System.getProperty(Environment.XTS11_BIND_PORT);
+ String secureBindPort = System.getProperty(Environment.XTS11_SECURE_BIND_PORT);
if (bindAddress == null) {
bindAddress = "127.0.0.1";
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/ParticipantInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/ParticipantInitialisation.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsat/server/ParticipantInitialisation.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -27,7 +27,7 @@
import com.arjuna.webservices11.wsat.AtomicTransactionConstants;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.services.framework.startup.Sequencer;
-import com.arjuna.wsc11.common.Environment;
+import com.arjuna.wsc.common.Environment;
/**
* Activate the Participant service
@@ -44,9 +44,9 @@
Sequencer.Callback callback = new Sequencer.Callback(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WST11) {
public void run() {
final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
- String bindAddress = System.getProperty(Environment.XTS_BIND_ADDRESS);
- String bindPort = System.getProperty(Environment.XTS_BIND_PORT);
- String secureBindPort = System.getProperty(Environment.XTS_SECURE_BIND_PORT);
+ String bindAddress = System.getProperty(Environment.XTS11_BIND_ADDRESS);
+ String bindPort = System.getProperty(Environment.XTS11_BIND_PORT);
+ String secureBindPort = System.getProperty(Environment.XTS11_SECURE_BIND_PORT);
if (bindAddress == null) {
bindAddress = "127.0.0.1";
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionCoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionCoordinatorInitialisation.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionCoordinatorInitialisation.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -23,7 +23,7 @@
import com.arjuna.services.framework.startup.Sequencer;
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.ServiceRegistry;
-import com.arjuna.wsc11.common.Environment;
+import com.arjuna.wsc.common.Environment;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
@@ -44,9 +44,9 @@
Sequencer.Callback callback = new Sequencer.Callback(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WST11) {
public void run() {
final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
- String bindAddress = System.getProperty(Environment.XTS_BIND_ADDRESS);
- String bindPort = System.getProperty(Environment.XTS_BIND_PORT);
- String secureBindPort = System.getProperty(Environment.XTS_SECURE_BIND_PORT);
+ String bindAddress = System.getProperty(Environment.XTS11_BIND_ADDRESS);
+ String bindPort = System.getProperty(Environment.XTS11_BIND_PORT);
+ String secureBindPort = System.getProperty(Environment.XTS11_SECURE_BIND_PORT);
if (bindAddress == null) {
bindAddress = "127.0.0.1";
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionParticipantInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionParticipantInitialisation.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/CoordinatorCompletionParticipantInitialisation.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -27,7 +27,7 @@
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.services.framework.startup.Sequencer;
-import com.arjuna.wsc11.common.Environment;
+import com.arjuna.wsc.common.Environment;
/**
* Activate the Coordinator Completion Participant service
@@ -44,9 +44,9 @@
Sequencer.Callback callback = new Sequencer.Callback(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WST11) {
public void run() {
final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
- String bindAddress = System.getProperty(Environment.XTS_BIND_ADDRESS);
- String bindPort = System.getProperty(Environment.XTS_BIND_PORT);
- String secureBindPort = System.getProperty(Environment.XTS_SECURE_BIND_PORT);
+ String bindAddress = System.getProperty(Environment.XTS11_BIND_ADDRESS);
+ String bindPort = System.getProperty(Environment.XTS11_BIND_PORT);
+ String secureBindPort = System.getProperty(Environment.XTS11_SECURE_BIND_PORT);
if (bindAddress == null) {
bindAddress = "127.0.0.1";
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionCoordinatorInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionCoordinatorInitialisation.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionCoordinatorInitialisation.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -27,7 +27,7 @@
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.services.framework.startup.Sequencer;
-import com.arjuna.wsc11.common.Environment;
+import com.arjuna.wsc.common.Environment;
/**
* Activate the Participant Completion Coordinator service
@@ -44,9 +44,9 @@
Sequencer.Callback callback = new Sequencer.Callback(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WST11) {
public void run() {
final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
- String bindAddress = System.getProperty(Environment.XTS_BIND_ADDRESS);
- String bindPort = System.getProperty(Environment.XTS_BIND_PORT);
- String secureBindPort = System.getProperty(Environment.XTS_SECURE_BIND_PORT);
+ String bindAddress = System.getProperty(Environment.XTS11_BIND_ADDRESS);
+ String bindPort = System.getProperty(Environment.XTS11_BIND_PORT);
+ String secureBindPort = System.getProperty(Environment.XTS11_SECURE_BIND_PORT);
if (bindAddress == null) {
bindAddress = "127.0.0.1";
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionParticipantInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionParticipantInitialisation.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/webservices11/wsba/server/ParticipantCompletionParticipantInitialisation.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -27,7 +27,7 @@
import com.arjuna.webservices11.wsba.BusinessActivityConstants;
import com.arjuna.webservices11.ServiceRegistry;
import com.arjuna.services.framework.startup.Sequencer;
-import com.arjuna.wsc11.common.Environment;
+import com.arjuna.wsc.common.Environment;
/**
* Activate the Participant Completion Participant service
@@ -44,9 +44,9 @@
Sequencer.Callback callback = new Sequencer.Callback(Sequencer.SEQUENCE_WSCOOR11, Sequencer.WEBAPP_WST11) {
public void run() {
final ServiceRegistry serviceRegistry = ServiceRegistry.getRegistry() ;
- String bindAddress = System.getProperty(Environment.XTS_BIND_ADDRESS);
- String bindPort = System.getProperty(Environment.XTS_BIND_PORT);
- String secureBindPort = System.getProperty(Environment.XTS_SECURE_BIND_PORT);
+ String bindAddress = System.getProperty(Environment.XTS11_BIND_ADDRESS);
+ String bindPort = System.getProperty(Environment.XTS11_BIND_PORT);
+ String secureBindPort = System.getProperty(Environment.XTS11_SECURE_BIND_PORT);
if (bindAddress == null) {
bindAddress = "127.0.0.1";
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_application.xml 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_application.xml 2010-05-05 09:48:29 UTC (rev 32736)
@@ -35,7 +35,7 @@
</module>
<module>
- <java>ws-t11-tests.jar</java>
+ <java>ws-t-tests.jar</java>
</module>
<module>
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/src/com/arjuna/wst11/tests/TestUtil.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -57,7 +57,7 @@
public static final String NONEXISTENT_PARTICIPANT_IDENTIFIER = "NONE123456PI";
- final private static String bindHost = System.getProperty(com.arjuna.wsc11.common.Environment.XTS_BIND_ADDRESS);
+ final private static String bindHost = System.getProperty(com.arjuna.wsc.common.Environment.XTS11_BIND_ADDRESS);
public static String participantServiceURI = "http://" + bindHost + ":8080/ws-t11/ParticipantService";
public static String coordinatorServiceURI = "http://" + bindHost + ":8080/ws-t11/CoordinatorService";
Modified: labs/jbosstm/trunk/XTS/WSAS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-05-05 09:48:29 UTC (rev 32736)
@@ -90,10 +90,8 @@
<!-- Compilation targets -->
<target name="compile" depends="init">
- <echo message="Compiling module"/>
- <javac srcdir="${src.dir}" destdir="${build.classes.dir}"
- debug="${debug}" deprecation="${deprecation}"
- classpathref = "build.classpath"/>
+ <echo message="Compiling module"/>
+ <compile.macro/>
</target>
<!-- htdocs paths -->
@@ -127,22 +125,14 @@
</target>
<target name="generateresourcebundle">
-
<echo message="Generating WSAS Bundle"/>
-
- <javadoc sourcepath="${src.dir}"
- packagenames="com.arjuna.*"
- failonerror="yes"
- private="yes"
- defaultexcludes="yes"
- classpathref="build.classpath">
- <doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
- <path refid="doclet.classpath"/>
- <param name="-basedir" value="${basedir}/${build.classes.dir}"/>
- <param name="-resourcebundle" value="${wsas.resourcebundle}"/>
- </doclet>
- </javadoc>
-
+ <resourcebundle.macro resourcebundle="${wsas.resourcebundle}">
+ <packagesets>
+ <packageset dir="${src.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ </packageset>
+ </packagesets>
+ </resourcebundle.macro>
</target>
<!-- test targets -->
@@ -169,27 +159,25 @@
</javac>
</target>
- <target name="tests.webapps" depends="tests.compile">
- <copy file="${tests.dd.dir}/wsas-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app.xml">
- </copy>
+ <target name="tests.webapps" depends="tests.compile">
+ <copy file="${tests.dd.dir}/wsas-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app.xml">
+ </copy>
<jar jarfile="${tests.build.lib.dir}/wsas-tests.jar" basedir="${tests.build.classes.dir}" excludes="com/arjuna/qa/junit/*.class"/>
<jar jarfile="${tests.build.lib.dir}/xts-test-servlet.jar" basedir="${tests.build.classes.dir}" includes="com/arjuna/qa/junit/*.class"/>
- <war warfile="${tests.build.webapps.dir}/wsas-tests.war" webxml="${tests.build.dd.dir}/web-app.xml">
- </war>
- <ear earfile="${tests.build.webapps.dir}/wsas-tests.ear" appxml="${tests.dd.dir}/wsas-tests_application.xml">
- <!-- we only need to deploy the ext test libs (junit) and
- the tests war in JBoss AS 5.0. the rest of the XTS
- code is deployed as a sar and the TS code is deployed
- in the server lib
- -->
- <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
+ <war warfile="${tests.build.webapps.dir}/wsas-tests.war" webxml="${tests.build.dd.dir}/web-app.xml">
+ </war>
+ </target>
+
+ <target name="tests.ear" depends="tests.webapps">
+ <ear earfile="${tests.build.webapps.dir}/wsas-tests.ear" appxml="${tests.dd.dir}/wsas-tests_application.xml">
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${tests.build.webapps.dir}" includes="wsas-tests.war"/>
<fileset dir="${tests.build.lib.dir}" includes="wsas-tests.jar"/>
<fileset dir="${tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
- </ear>
- </target>
+ </ear>
+ </target>
- <target name="tests.deploy" depends="tests.webapps, tests.undeploy">
+ <target name="tests.deploy" depends="tests.ear, tests.undeploy">
<copy file="${tests.build.webapps.dir}/wsas-tests.ear" tofile="${deploy.dir}/wsas-tests.ear"/>
</target>
@@ -208,7 +196,6 @@
<delete dir="${tests.build.dir}"/>
</target>
- <!-- 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"/>
+ <!-- production target for tests -->
+ <target name="tests" depends="tests.ear"/>
</project>
Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-05-05 09:48:29 UTC (rev 32736)
@@ -19,6 +19,7 @@
(C) 2005-2006,
@author JBoss Inc.
-->
+
<project name="WSCF" default="war" basedir=".">
<!-- Set module name -->
@@ -103,47 +104,44 @@
</target>
<!-- Compilation targets -->
- <target name="compile" depends="compile10, compile11"/>
- <target name="compile11" depends="compile-generic">
+ <target name="compile-generic">
+ <echo message="Compiling module generic code"/>
+ <compile.macro>
+ <additional.classpath>
+ <path refid="wscf.lib.classpath"/>
+ </additional.classpath>
+ </compile.macro>
+ </target>
+
+ <target name="compile11">
<echo message="Compiling module 1.1 code"/>
- <javac srcdir="${src11.dir}"
- destdir="${build.classes11.dir}"
- debug="on">
- <classpath>
+ <compile.macro src.dir="${src11.dir}" dest.dir="${build.classes11.dir}">
+ <additional.classpath>
<path>
<pathelement path="${build.classes.dir}"/>
<pathelement path="${wsc.build.lib.dir}/${wsc11.libs}"/>
</path>
- <path refid="wscf.lib.classpath"/>
- </classpath>
- </javac>
+ <path refid="wscf.lib.classpath"/>
+ </additional.classpath>
+ </compile.macro>
</target>
- <target name="compile10" depends="compile-generic">
+
+ <target name="compile10" if="build10">
<echo message="Compiling module 1.0 code"/>
- <javac srcdir="${src10.dir}"
- destdir="${build.classes10.dir}"
- debug="on">
- <classpath>
+ <compile.macro src.dir="${src10.dir}" dest.dir="${build.classes10.dir}">
+ <additional.classpath>
<path>
<pathelement path="${build.classes.dir}"/>
<pathelement path="${wsc.build.lib.dir}/${wsc10.libs}"/>
<pathelement path="${wsc.build.lib.dir}/${wsc10.api.libs}"/>
</path>
- <path refid="wscf.lib.classpath"/>
- </classpath>
- </javac>
+ <path refid="wscf.lib.classpath"/>
+ </additional.classpath>
+ </compile.macro>
</target>
- <target name="compile-generic" depends="init">
- <echo message="Compiling module generic code"/>
- <javac srcdir="${src.dir}"
- destdir="${build.classes.dir}"
- debug="on">
- <classpath>
- <path refid="wscf.lib.classpath"/>
- </classpath>
- </javac>
- </target>
+ <target name="compile" depends="init, compile-generic, compile10, compile11"/>
+
<!-- htdocs paths -->
<path id="htdocs.path">
<pathelement path="classes"/>
@@ -152,30 +150,17 @@
<!-- Build htdocs for just mw, or mw and mwlabs -->
<property name="htdocs.list" value="*"/>
- <target name="war" depends="jar">
- <war warfile="${build.webapps.dir}/${modulename}10.war" webxml="xml/wscf_web-app.xml"/>
- <war warfile="${build.webapps.dir}/${modulename}11.war" webxml="xml/wscf11_web-app.xml"/>
- </target>
-
<!-- Jar targets -->
- <target name="jar" depends="jar11, jar10"/>
-
- <target name="jar11" depends="jar-generic">
- <copy file="xml/ArjunaCoreHLS.xml"
- tofile="${build.classes11.dir}/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ArjunaCoreHLS.xml"/>
- <copy file="xml/JTAHLS.xml"
- tofile="${build.classes11.dir}/com/arjuna/mwlabs/wscf/model/as/coordinator/jta/JTAHLS.xml"/>
- <copy file="xml/TwoPhase11HLSImple.xml"
- tofile="${build.classes11.dir}/com/arjuna/mwlabs/wscf11/model/twophase/arjunacore/TwoPhaseHLSImple.xml"/>
- <copy file="xml/Sagas11HLSImple.xml"
- tofile="${build.classes11.dir}/com/arjuna/mwlabs/wscf11/model/sagas/arjunacore/SagasHLSImple.xml"/>
-
- <jar jarfile="${build.lib.dir}/${modulename}11.jar"
- basedir="${build.classes11.dir}">
+ <target name="jar-generic">
+ <echo message="Building jar files"/>
+ <mkdir dir="${build.lib.dir}"/>
+ <jar jarfile="${build.lib.dir}/${modulename}.jar"
+ basedir="${build.classes.dir}">
</jar>
</target>
- <target name="jar10" depends="jar-generic">
+ <target name="jar10" if="build10">
+ <echo message="Building 10 jar files"/>
<copy file="xml/ArjunaCoreHLS.xml"
tofile="${build.classes10.dir}/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ArjunaCoreHLS.xml"/>
<copy file="xml/JTAHLS.xml"
@@ -192,63 +177,102 @@
</jar>
</target>
- <target name="jar-generic" depends="compile, htdocs, generateresourcebundle">
- <echo message="Building jar files"/>
- <mkdir dir="${build.lib.dir}"/>
- <jar jarfile="${build.lib.dir}/${modulename}.jar"
- basedir="${build.classes.dir}">
+ <target name="jar11">
+ <echo message="Building 11 jar files"/>
+ <copy file="xml/ArjunaCoreHLS.xml"
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wscf/model/as/coordinator/arjunacore/ArjunaCoreHLS.xml"/>
+ <copy file="xml/JTAHLS.xml"
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wscf/model/as/coordinator/jta/JTAHLS.xml"/>
+ <copy file="xml/TwoPhase11HLSImple.xml"
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wscf11/model/twophase/arjunacore/TwoPhaseHLSImple.xml"/>
+ <copy file="xml/Sagas11HLSImple.xml"
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wscf11/model/sagas/arjunacore/SagasHLSImple.xml"/>
+
+ <jar jarfile="${build.lib.dir}/${modulename}11.jar"
+ basedir="${build.classes11.dir}">
</jar>
</target>
+ <target name="jar" depends ="compile, jar-generic, jar10, jar11"/>
- <target name="htdocs"
- depends="init">
- <echo message="Building htdocs "/>
- <mkdir dir="${htdocs.dest}"/>
+ <target name="htdocs11" if="nobuild10">
+ <echo message="Building htdocs "/>
+ <mkdir dir="${htdocs.dest}"/>
+ <javadoc
+ sourcepathref="htdocs.path"
+ destdir="${htdocs.dest}"
+ packagenames="${htdocs.list}"
+ >
+ <classpath>
+ <path refid="wscf.lib.classpath"/>
+ <path path="${src.dir}"/>
+ <path path="${src11.dir}"/>
+ </classpath>
+ </javadoc>
+ </target>
- <javadoc
- sourcepathref="htdocs.path"
- destdir="${htdocs.dest}"
- packagenames="${htdocs.list}"
- >
- <classpath>
- <path refid="wscf.lib.classpath"/>
- <path path="${src.dir}"/>
- </classpath>
- </javadoc>
- </target>
+ <target name="htdocs-both" if="build10">
+ <echo message="Building htdocs "/>
+ <mkdir dir="${htdocs.dest}"/>
+ <javadoc
+ sourcepathref="htdocs.path"
+ destdir="${htdocs.dest}"
+ packagenames="${htdocs.list}"
+ >
+ <classpath>
+ <path refid="wscf.lib.classpath"/>
+ <path path="${src.dir}"/>
+ <path path="${src11.dir}"/>
+ <path path="${src10.dir}"/>
+ </classpath>
+ </javadoc>
+ </target>
- <target name="generateresourcebundle">
+ <target name="htdocs" depends="htdocs-both, htdocs11"/>
+
+ <target name="resourcebundle11" if="nobuild10">
+ <echo message="Generating WSCF Bundle"/>
+ <resourcebundle.macro resourcebundle="${wscf.resourcebundle}">
+ <packagesets>
+ <packageset dir="${src.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ </packageset>
+ <packageset dir="${src11.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ </packageset>
+ </packagesets>
+ </resourcebundle.macro>
+ </target>
- <echo message="Generating WSCF Bundle"/>
-
- <javadoc packagenames="com.arjuna.*"
- failonerror="yes"
- private="yes"
- defaultexcludes="yes"
- classpathref="build.classpath">
-
+ <target name="resourcebundle-both" if="build10">
+ <echo message="Generating WSCF Bundle"/>
+ <resourcebundle.macro resourcebundle="${wscf.resourcebundle}">
+ <packagesets>
<packageset dir="${src.dir}" defaultexcludes="yes">
- <include name="com/arjuna/**"/>
+ <include name="com/arjuna/**"/>
</packageset>
-
<packageset dir="${src10.dir}" defaultexcludes="yes">
- <include name="com/arjuna/**"/>
+ <include name="com/arjuna/**"/>
</packageset>
-
<packageset dir="${src11.dir}" defaultexcludes="yes">
- <include name="com/arjuna/**"/>
+ <include name="com/arjuna/**"/>
</packageset>
+ </packagesets>
+ </resourcebundle.macro>
+ </target>
- <doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
- <path refid="doclet.classpath"/>
- <param name="-basedir" value="${basedir}/${build.classes.dir}"/>
- <param name="-resourcebundle" value="${wscf.resourcebundle}"/>
- </doclet>
- </javadoc>
+ <target name="resourcebundle" depends="resourcebundle-both, resourcebundle11"/>
- </target>
+ <target name="war10" if="build10">
+ <war warfile="${build.webapps.dir}/${modulename}10.war" webxml="xml/wscf_web-app.xml"/>
+ </target>
+ <target name="war11">
+ <war warfile="${build.webapps.dir}/${modulename}11.war" webxml="xml/wscf11_web-app.xml"/>
+ </target>
+
+ <target name="war" depends="jar, htdocs, resourcebundle, war10, war11"/>
+
<!-- test targets -->
<target name="tests.init">
<!-- delete the test destination directories -->
@@ -262,24 +286,23 @@
</target>
<!-- this assumes the required libs have already been built-->
- <target name="tests.compile" depends="tests.init">
+ <target name="tests.compile10" if="build10">
<javac destdir="${tests.build.classes.dir}" debug="yes" optimize="no">
<classpath>
<pathelement path="${build.lib.dir}/${modulename}.jar"/>
<pathelement path="${build.lib.dir}/${modulename}10.jar"/>
- <pathelement path="${build.lib.dir}/${modulename}11.jar"/>
<pathelement path="${wsc.build.lib.dir}/${wsc10.libs}"/>
<pathelement path="${wsc.build.lib.dir}/${wsc10.api.libs}"/>
- <pathelement path="${wsc.build.lib.dir}/${wsc11.libs}"/>
<path refid="tests.lib.path"/>
<path refid="wscf.lib.classpath"/>
</classpath>
<src path="${tests.src.dir}"/>
+ <include name="com/arjuna/wscf/**"/>
</javac>
</target>
<!-- this assumes the required libs have already been built-->
- <target name="tests.compile11" depends="tests.init">
+ <target name="tests.compile11">
<javac destdir="${tests.build.classes.dir}" debug="yes" optimize="no">
<classpath>
<pathelement path="${build.lib.dir}/${modulename}.jar"/>
@@ -293,52 +316,46 @@
</javac>
</target>
- <target name="tests.webapps" depends="tests.compile">
- <copy file="${tests.dd.dir}/wscf-tests_web-app.xml" tofile="${tests,build.dd.dir}/web-app.xml">
- </copy>
- <copy file="${tests.dd.dir}/wscf11-tests_web-app.xml" tofile="${tests,build.dd.dir}/web-app11.xml">
- </copy>
+ <target name="tests.compile" depends="tests.init, tests.compile10, tests.compile11"/>
+
+ <target name="tests.jar" depends="tests.compile">
<jar jarfile="${tests.build.webapps.dir}/wscf-tests.jar">
<fileset dir="${tests.build.classes.dir}"/>
</jar>
+ </target>
+
+ <target name="tests.webapps10" if="build10">
+ <copy file="${tests.dd.dir}/wscf-tests_web-app.xml" tofile="${tests,build.dd.dir}/web-app.xml"/>
+ <copy file="${tests.dd.dir}/wscf11-tests_web-app.xml" tofile="${tests,build.dd.dir}/web-app11.xml"/>
<war warfile="${tests.build.webapps.dir}/wscf-tests.war" webxml="${tests,build.dd.dir}/web-app.xml"/>
+ </target>
+
+ <target name="tests.webapps11" depends="tests.compile11">
+ <copy file="${tests.dd.dir}/wscf11-tests_web-app.xml" tofile="${tests,build.dd.dir}/web-app11.xml"/>
<war warfile="${tests.build.webapps.dir}/wscf11-tests.war" webxml="${tests,build.dd.dir}/web-app11.xml"/>
- <ear earfile="${tests.build.webapps.dir}/wscf-tests.ear" appxml="${tests.dd.dir}/wscf-tests_application.xml">
- <!-- we only need to deploy the ext test libs (junit) and
- the tests war in JBoss AS 5.0. the rest of the XTS
- code is deployed as a sar and the TS code is deployed
- in the server lib
- -->
+ </target>
+
+ <target name="tests.webapps" depends="tests.jar, tests.webapps10, tests.webapps11"/>
+
+ <target name="tests.ear-both" if="build10">
+ <ear earfile="${tests.build.webapps.dir}/wscf-tests.ear" appxml="${tests.dd.dir}/wscf-tests_application.xml">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${tests.build.webapps.dir}" includes="wscf-tests.war wscf11-tests.war wscf-tests.jar"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
</target>
-
- <target name="tests.webapps11" depends="tests.compile11">
- <copy file="${tests.dd.dir}/wscf11-tests_web-app.xml" tofile="${tests,build.dd.dir}/web-app11.xml">
- </copy>
- <jar jarfile="${tests.build.webapps.dir}/wscf-tests.jar">
- <fileset dir="${tests.build.classes.dir}"/>
- </jar>
- <war warfile="${tests.build.webapps.dir}/wscf11-tests.war" webxml="${tests,build.dd.dir}/web-app11.xml"/>
+
+ <target name="tests.ear11" if="nobuild10">
<ear earfile="${tests.build.webapps.dir}/wscf-tests.ear" appxml="${tests.dd.dir}/wscf11-tests_application.xml">
- <!-- we only need to deploy the ext test libs (junit) and
- the tests war in JBoss AS 5.0. the rest of the XTS
- code is deployed as a sar and the TS code is deployed
- in the server lib
- -->
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${tests.build.webapps.dir}" includes="wscf11-tests.war wscf-tests.jar"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
</target>
- <target name="tests.deploy" depends="tests.webapps, tests.undeploy">
- <copy file="${tests.build.webapps.dir}/wscf-tests.ear" tofile="${deploy.dir}/wscf-tests.ear"/>
- </target>
+ <target name="tests.ear" depends="tests.webapps, tests.ear-both, tests.ear11"/>
- <target name="tests.deploy11" depends="tests.webapps11, tests.undeploy">
+ <target name="tests.deploy" depends="tests.ear, tests.undeploy">
<copy file="${tests.build.webapps.dir}/wscf-tests.ear" tofile="${deploy.dir}/wscf-tests.ear"/>
</target>
@@ -357,7 +374,6 @@
<delete dir="${tests.build.dir}"/>
</target>
- <!-- production target for 1.1 tests -->
- <target name="tests-11" depends="tests.webapps11"/>
- <target name="tests-both" depends="tests.webapps"/>
+ <!-- production target for tests -->
+ <target name="tests" depends="tests.ear"/>
</project>
Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-05-05 09:48:29 UTC (rev 32736)
@@ -140,7 +140,7 @@
<property name="tests.all.libs" value="${wsas.libs} ${wsc.all.libs} ${wscf.all.libs} ${wst.all.libs} ${wstx.all.libs} ${tests.libs}"/>
<path id="lib.classpath">
- <path refid="build.classpath"/>
+ <!--<path refid="build.classpath"/>-->
<fileset dir="${wsas.build.lib.dir}" includes="${wsas.libs}"/>
<fileset dir="${wsc.build.lib.dir}" includes="${wsc.libs} ${wsc-api.libs}"/>
<fileset dir="${wscf.build.lib.dir}" includes="${wscf.libs}"/>
@@ -169,53 +169,49 @@
<mkdir dir="${build.classes.dir}"/>
<mkdir dir="${build.classes10.dir}"/>
<mkdir dir="${build.classes11.dir}"/>
+ <mkdir dir="${build.htdocs.dir}"/>
+ <mkdir dir="${build.lib.dir}"/>
<mkdir dir="${build.webapps.dir}"/>
</target>
<!-- Compilation targets -->
- <target name="compile" depends="compile11, wstx.compile10"/>
+ <target name="compile-generic">
+ <echo message="Compiling module generic code"/>
+ <compile.macro>
+ <additional.classpath>
+ <path refid="lib.classpath"/>
+ </additional.classpath>
+ </compile.macro>
+ </target>
- <target name="wstx.compile10" depends="compile-generic">
+ <target name="compile10" if="build10">
<echo message="Compiling module 1.0 code"/>
- <javac srcdir="${src10.dir}"
- destdir="${build.classes10.dir}"
- debug="on">
- <classpath>
+ <compile.macro src.dir="${src10.dir}" dest.dir="${build.classes10.dir}">
+ <additional.classpath>
<path>
<pathelement path="${build.classes.dir}"/>
</path>
<path refid="lib.classpath10"/>
<path refid="lib.classpath"/>
- </classpath>
- </javac>
+ </additional.classpath>
+ </compile.macro>
</target>
- <target name="compile11" depends="compile-generic">
+ <target name="compile11">
<echo message="Compiling module 1.1 code"/>
- <javac srcdir="${src11.dir}"
- destdir="${build.classes11.dir}"
- debug="on">
- <classpath>
+ <compile.macro src.dir="${src11.dir}" dest.dir="${build.classes11.dir}">
+ <additional.classpath>
<path>
<pathelement path="${build.classes.dir}"/>
</path>
<path refid="lib.classpath11"/>
<path refid="lib.classpath"/>
- </classpath>
- </javac>
+ </additional.classpath>
+ </compile.macro>
</target>
- <target name="compile-generic" depends="init">
- <echo message="Compiling module generic code"/>
- <javac srcdir="${src.dir}"
- destdir="${build.classes.dir}"
- debug="on">
- <classpath>
- <path refid="lib.classpath"/>
- </classpath>
- </javac>
- </target>
+ <target name="compile" depends="init, compile-generic, compile11, compile10"/>
<!-- htdocs paths -->
<path id="htdocs.path">
@@ -225,33 +221,73 @@
<!-- Build htdocs for just mw, or mw and mwlabs -->
<property name="htdocs.list" value="com.arjuna.mw.*"/>
- <target name="war" depends="jar">
- <war warfile="${build.webapps.dir}/${modulename}10.war" webxml="xml/wstx_web-app.xml"/>
- <war warfile="${build.webapps.dir}/${modulename}11.war" webxml="xml/wstx_web-app11.xml"/>
+ <target name="htdocs-both" if="build10">
+ <echo message="Building htdocs "/>
+ <javadoc
+ sourcepathref="htdocs.path"
+ destdir="${build.htdocs.dir}"
+ packagenames="${htdocs.list}"
+ >
+ <classpath>
+ <path refid="lib.classpath"/>
+ <path refid="build.classpath"/>
+ <path path="${src.dir}"/>
+ </classpath>
+ </javadoc>
</target>
- <!-- Jar targets -->
- <target name="jar" depends="compile, htdocs, generateresourcebundle">
- <echo message="Building jar file"/>
- <mkdir dir="${build.lib.dir}"/>
+ <target name="htdocs11" if="nobuild10">
+ <echo message="Building htdocs "/>
+ <javadoc
+ sourcepathref="htdocs.path"
+ destdir="${build.htdocs.dir}"
+ packagenames="${htdocs.list}"
+ >
+ <classpath>
+ <path refid="lib.classpath"/>
+ <path refid="build.classpath"/>
+ <path path="${src.dir}"/>
+ </classpath>
+ </javadoc>
+ </target>
- <copy file="xml/UserTwoPhaseTx.xml"
- tofile="${build.classes10.dir}/com/arjuna/mwlabs/wstx/model/as/twophase/UserTwoPhaseTx.xml"/>
+ <target name="htdocs" depends="htdocs-both, htdocs11"/>
+
+ <target name="resourcebundle-both" if="build10">
+ <echo message="Generating WSTX Bundle"/>
+ <resourcebundle.macro resourcebundle="${wstx.resourcebundle}">
+ <packagesets>
+ <packageset dir="${src.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ </packageset>
+ <packageset dir="${src10.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ </packageset>
+ <packageset dir="${src11.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ </packageset>
+ </packagesets>
+ </resourcebundle.macro>
+ </target>
- <copy file="xml/UserTwoPhaseTx.xml"
- tofile="${build.classes11.dir}/com/arjuna/mwlabs/wstx11/model/as/twophase/UserTwoPhaseTx.xml"/>
+ <target name="resourcebundle11" if="nobuild10">
+ <echo message="Generating WSTX Bundle"/>
+ <resourcebundle.macro resourcebundle="${wstx.resourcebundle}">
+ <packagesets>
+ <packageset dir="${src.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ </packageset>
+ <packageset dir="${src11.dir}" defaultexcludes="yes">
+ <include name="com/arjuna/**"/>
+ </packageset>
+ </packagesets>
+ </resourcebundle.macro>
+ </target>
- <copy file="xml/AtomicTransaction.xml"
- tofile="${build.classes10.dir}/com/arjuna/mwlabs/wst/at/ContextFactoryImple.xml"/>
- <copy file="xml/BusinessActivity.xml"
- tofile="${build.classes10.dir}/com/arjuna/mwlabs/wst/ba/ContextFactoryImple.xml"/>
+ <target name="resourcebundle" depends="resourcebundle-both, resourcebundle11"/>
- <copy file="xml/AtomicTransaction11.xml"
- tofile="${build.classes11.dir}/com/arjuna/mwlabs/wst11/at/ContextFactoryImple.xml"/>
- <copy file="xml/BusinessActivity11.xml"
- tofile="${build.classes11.dir}/com/arjuna/mwlabs/wst11/ba/ContextFactoryImple.xml"/>
-
-
+ <!-- Jar targets -->
+ <target name="jar-generic">
<jar jarfile="${build.lib.dir}/${modulename}.jar">
<fileset dir="${wsc.build.dd.dir}" includes="wsdl/*"/>
<fileset dir="${wst.build.dd.dir}" includes="wsdl/*"/>
@@ -260,68 +296,50 @@
<jar jarfile="${build.lib.dir}/${modulename}-api.jar">
<fileset dir="${build.classes.dir}" includes="${wstx.api.classes}"/>
</jar>
+ </target>
+
+ <target name="jar10" if="build10">
+ <copy file="xml/UserTwoPhaseTx.xml"
+ tofile="${build.classes10.dir}/com/arjuna/mwlabs/wstx/model/as/twophase/UserTwoPhaseTx.xml"/>
+ <copy file="xml/AtomicTransaction.xml"
+ tofile="${build.classes10.dir}/com/arjuna/mwlabs/wst/at/ContextFactoryImple.xml"/>
+ <copy file="xml/BusinessActivity.xml"
+ tofile="${build.classes10.dir}/com/arjuna/mwlabs/wst/ba/ContextFactoryImple.xml"/>
<jar jarfile="${build.lib.dir}/${modulename}10.jar">
<fileset dir="${build.classes10.dir}" excludes="${wstx10.api.classes}"/>
</jar>
<jar jarfile="${build.lib.dir}/${modulename}10-api.jar">
<fileset dir="${build.classes10.dir}" includes="${wstx10.api.classes}"/>
</jar>
+ </target>
+
+ <target name="jar11">
+ <copy file="xml/UserTwoPhaseTx.xml"
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wstx11/model/as/twophase/UserTwoPhaseTx.xml"/>
+ <copy file="xml/AtomicTransaction11.xml"
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wst11/at/ContextFactoryImple.xml"/>
+ <copy file="xml/BusinessActivity11.xml"
+ tofile="${build.classes11.dir}/com/arjuna/mwlabs/wst11/ba/ContextFactoryImple.xml"/>
<jar jarfile="${build.lib.dir}/${modulename}11.jar">
<fileset dir="${build.classes11.dir}" excludes="${wstx11.api.classes}"/>
</jar>
<jar jarfile="${build.lib.dir}/${modulename}11-api.jar">
<fileset dir="${build.classes11.dir}" includes="${wstx11.api.classes}"/>
</jar>
- </target>
+ </target>
- <target name="htdocs"
- depends="init">
- <echo message="Building htdocs "/>
- <mkdir dir="${build.htdocs.dir}"/>
+ <target name="jar" depends="compile, htdocs, resourcebundle, jar-generic, jar10, jar11"/>
- <javadoc
- sourcepathref="htdocs.path"
- destdir="${build.htdocs.dir}"
- packagenames="${htdocs.list}"
- >
- <classpath>
- <path refid="lib.classpath"/>
- <path path="${src.dir}"/>
- </classpath>
- </javadoc>
- </target>
+ <target name="war10" if="build10">
+ <war warfile="${build.webapps.dir}/${modulename}10.war" webxml="xml/wstx_web-app.xml"/>
+ </target>
- <target name="generateresourcebundle">
+ <target name="war11">
+ <war warfile="${build.webapps.dir}/${modulename}11.war" webxml="xml/wstx_web-app11.xml"/>
+ </target>
- <echo message="Generating WSTX Bundle"/>
+ <target name="war" depends="jar, war10, war11"/>
- <javadoc packagenames="com.arjuna.*"
- failonerror="yes"
- private="yes"
- defaultexcludes="yes"
- classpathref="build.classpath">
-
- <packageset dir="${src.dir}" defaultexcludes="yes">
- <include name="com/arjuna/**"/>
- </packageset>
-
- <packageset dir="${src10.dir}" defaultexcludes="yes">
- <include name="com/arjuna/**"/>
- </packageset>
-
- <packageset dir="${src11.dir}" defaultexcludes="yes">
- <include name="com/arjuna/**"/>
- </packageset>
-
- <doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
- <path refid="doclet.classpath"/>
- <param name="-basedir" value="${basedir}/${build.classes.dir}"/>
- <param name="-resourcebundle" value="${wstx.resourcebundle}"/>
- </doclet>
- </javadoc>
-
- </target>
-
<target name="tests.init">
<!-- delete the test destination directories -->
<delete dir="${tests.build.dir}"/>
@@ -334,26 +352,27 @@
</target>
<!-- this assumes all the rwuired libs have been built -->
- <target name="tests.compile" depends="tests.init">
- <javac destdir="${tests.build.classes.dir}" debug="yes" optimize="no">
- <classpath>
+ <target name="tests.compile10" if="build10">
+ <javac destdir="${tests.build.classes.dir}" debug="yes" optimize="no">
+ <classpath>
<pathelement path="${build.lib.dir}/${modulename}.jar"/>
<pathelement path="${build.lib.dir}/${modulename}-api.jar"/>
<pathelement path="${build.lib.dir}/${modulename}10.jar"/>
<pathelement path="${build.lib.dir}/${modulename}10-api.jar"/>
- <pathelement path="${build.lib.dir}/${modulename}11.jar"/>
- <pathelement path="${build.lib.dir}/${modulename}11-api.jar"/>
<path refid="com.arjuna.mwlabs.wstx.tests.lib.path"/>
<path refid="lib.classpath10"/>
<path refid="lib.classpath11"/>
<path refid="lib.classpath"/>
- </classpath>
- <src path="${tests.src.dir}"/>
- </javac>
- </target>
+ <path refid="build.classpath"/>
+ </classpath>
+ <src path="${tests.src.dir}"/>
+ <exclude name="com/arjuna/wst11/tests/**"/>
+ <exclude name="com/arjuna/wstx11/tests/**"/>
+ </javac>
+ </target>
<!-- this assumes all the rwuired libs have been built -->
- <target name="tests.compile11" depends="tests.init">
+ <target name="tests.compile11">
<javac destdir="${tests.build.classes.dir}" debug="yes" optimize="no">
<classpath>
<pathelement path="${build.lib.dir}/${modulename}.jar"/>
@@ -364,56 +383,60 @@
<path refid="lib.classpath10"/>
<path refid="lib.classpath11"/>
<path refid="lib.classpath"/>
+ <path refid="build.classpath"/>
</classpath>
<src path="${tests.src.dir}"/>
- <include name="com/arjuna/qa/**"/>
<include name="com/arjuna/wst/tests/common/**"/>
<include name="com/arjuna/wst11/tests/**"/>
<include name="com/arjuna/wstx11/tests/**"/>
</javac>
</target>
- <target name="tests.webapps" depends="tests.compile">
- <copy file="${tests.dd.dir}/wstx-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app.xml">
- </copy>
- <copy file="${tests.dd.dir}/wstx11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml">
- </copy>
- <jar jarfile="${tests.build.webapps.dir}/wstx-tests.jar">
- <fileset dir="${tests.build.classes.dir}"/>
- </jar>
- <war warfile="${tests.build.webapps.dir}/wstx-tests.war" webxml="${tests.build.dd.dir}/web-app.xml">
- <classes dir="${tests.build.classes.dir}"/>
- </war>
- <war warfile="${tests.build.webapps.dir}/wstx11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml"/>
- <ear earfile="${tests.build.webapps.dir}/wstx-tests.ear" appxml="${tests.dd.dir}/wstx-tests_application.xml">
- <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${tests.build.webapps.dir}" includes="wstx-tests.war wstx11-tests.war wstx-tests.jar"/>
- <fileset dir="${wsas.test.build.lib.dir}" includes="xts-test-servlet.jar"/>
- </ear>
+ <target name="tests.compile" depends="tests.init, tests.compile10, tests.compile11"/>
+
+ <target name="tests.jar" depends="tests.compile">
+ <jar jarfile="${tests.build.webapps.dir}/wstx-tests.jar">
+ <fileset dir="${tests.build.classes.dir}"/>
+ </jar>
+ </target>
+
+ <target name="tests.webapps10" if="build10">
+ <copy file="${tests.dd.dir}/wstx-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app.xml"/>
+ <war warfile="${tests.build.webapps.dir}/wstx-tests.war" webxml="${tests.build.dd.dir}/web-app.xml"/>
</target>
- <target name="tests.webapps11" depends="tests.compile11">
- <copy file="${tests.dd.dir}/wstx11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml">
- </copy>
- <jar jarfile="${tests.build.webapps.dir}/wstx-tests.jar">
- <fileset dir="${tests.build.classes.dir}"/>
- </jar>
+ <target name="tests.webapps11">
+ <copy file="${tests.dd.dir}/wstx11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml"/>
<war warfile="${tests.build.webapps.dir}/wstx11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml"/>
- <ear earfile="${tests.build.webapps.dir}/wstx-tests.ear" appxml="${tests.dd.dir}/wstx11-tests_application.xml">
- <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
- <fileset dir="${tests.build.webapps.dir}" includes="wstx11-tests.war wstx-tests.jar"/>
- <fileset dir="${wsas.test.build.lib.dir}" includes="xts-test-servlet.jar"/>
- </ear>
</target>
- <target name="tests.deploy" depends="tests.webapps, tests.undeploy">
+ <target name="tests.webapps" depends="tests.jar, tests.webapps10, tests.webapps11"/>
+
+ <target name="tests.ear-both" if="build10">
+ <ear earfile="${tests.build.webapps.dir}/wstx-tests.ear" appxml="${tests.dd.dir}/wstx-tests_application.xml">
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="wstx-tests.war wstx11-tests.war wstx-tests.jar"/>
+ <fileset dir="${wsas.test.build.lib.dir}" includes="xts-test-servlet.jar"/>
+ </ear>
+ </target>
+
+ <target name="tests.ear11" if="nobuild10">
+ <ear earfile="${tests.build.webapps.dir}/wstx-tests.ear" appxml="${tests.dd.dir}/wstx11-tests_application.xml">
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
+ <fileset dir="${tests.build.webapps.dir}" includes="wstx11-tests.war wstx-tests.jar"/>
+ <fileset dir="${wsas.test.build.lib.dir}" includes="xts-test-servlet.jar"/>
+ </ear>
+ </target>
+
+ <target name="tests.ear" depends="tests.webapps, tests.ear-both, tests.ear11"/>
+
+ <!-- production target for tests -->
+ <target name="tests" depends="tests.ear"/>
+
+ <target name="tests.deploy" depends="tests.ear, tests.undeploy">
<copy file="${tests.build.webapps.dir}/wstx-tests.ear" tofile="${deploy.dir}/wstx-tests.ear"/>
</target>
- <target name="tests.deploy11" depends="tests.webapps11, tests.undeploy">
- <copy file="${tests.build.webapps.dir}/wstx-tests.ear" tofile="${deploy.dir}/wstx-tests.ear"/>
- </target>
-
<target name="tests.undeploy">
<delete file="${deploy.dir}/wstx-tests.ear"/>
</target>
@@ -428,8 +451,4 @@
<!-- delete the test destination directories -->
<delete dir="${tests.build.dir}"/>
</target>
-
- <!-- production target for 1.1 tests -->
- <target name="tests-11" depends="tests.webapps11"/>
- <target name="tests-both" depends="tests.webapps"/>
</project>
Copied: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/common/Environment.java (from rev 32563, labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/common/Environment.java)
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/common/Environment.java (rev 0)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wst/common/Environment.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 2003,
+ *
+ * Arjuna Technologies Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Environment.java,v 1.6 2004/09/09 08:48:48 kconner Exp $
+ */
+
+package com.arjuna.mw.wst.common;
+
+/**
+ */
+
+public interface Environment
+{
+
+ public static final String COORDINATOR_URL = "org.jboss.jbossts.xts.coordinatorURL";
+ public static final String COORDINATOR_SCHEME = "org.jboss.jbossts.xts.coordinator.scheme";
+ public static final String COORDINATOR_HOST = "org.jboss.jbossts.xts.coordinator.host";
+ public static final String COORDINATOR_PORT = "org.jboss.jbossts.xts.coordinator.port";
+ public static final String COORDINATOR_PATH = "org.jboss.jbossts.xts.coordinator.path";
+
+ public static final String COORDINATOR11_URL = "org.jboss.jbossts.xts11.coordinatorURL";
+ public static final String COORDINATOR11_SCHEME = "org.jboss.jbossts.xts11.coordinator.scheme";
+ public static final String COORDINATOR11_HOST = "org.jboss.jbossts.xts11.coordinator.host";
+ public static final String COORDINATOR11_PORT = "org.jboss.jbossts.xts11.coordinator.port";
+ public static final String COORDINATOR11_PATH = "org.jboss.jbossts.xts11.coordinator.path";
+}
Deleted: labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/common/Environment.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/common/Environment.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mw/wst/common/Environment.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2003,
- *
- * Arjuna Technologies Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Environment.java,v 1.6 2004/09/09 08:48:48 kconner Exp $
- */
-
-package com.arjuna.mw.wst.common;
-
-/**
- */
-
-public interface Environment
-{
-
- public static final String COORDINATOR_URL = "org.jboss.jbossts.xts.coordinatorURL";
- public static final String COORDINATOR_SCHEME = "org.jboss.jbossts.xts.coordinator.scheme";
- public static final String COORDINATOR_HOST = "org.jboss.jbossts.xts.coordinator.host";
- public static final String COORDINATOR_PORT = "org.jboss.jbossts.xts.coordinator.port";
- public static final String COORDINATOR_PATH = "org.jboss.jbossts.xts.coordinator.path";
-
-}
Deleted: labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/common/Environment.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/common/Environment.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/common/Environment.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2003,
- *
- * Arjuna Technologies Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Environment.java,v 1.6 2004/09/09 08:48:48 kconner Exp $
- */
-
-package com.arjuna.mw.wst11.common;
-
-/**
- */
-
-public interface Environment
-{
-
- public static final String COORDINATOR_URL = "org.jboss.jbossts.xts11.coordinatorURL";
- public static final String COORDINATOR_SCHEME = "org.jboss.jbossts.xts11.coordinator.scheme";
- public static final String COORDINATOR_HOST = "org.jboss.jbossts.xts11.coordinator.host";
- public static final String COORDINATOR_PORT = "org.jboss.jbossts.xts11.coordinator.port";
- public static final String COORDINATOR_PATH = "org.jboss.jbossts.xts11.coordinator.path";
-
-}
\ No newline at end of file
Modified: labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/deploy/WSTXInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/deploy/WSTXInitialisation.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mw/wst11/deploy/WSTXInitialisation.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -25,7 +25,7 @@
import com.arjuna.mw.wst11.*;
import com.arjuna.services.framework.startup.Sequencer;
import com.arjuna.webservices.util.ClassLoaderHelper;
-import com.arjuna.wsc11.common.Environment;
+import com.arjuna.wsc.common.Environment;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -141,22 +141,22 @@
{
// ok, if we just loaded a coordinator URL and one was already defined on
// the command line then reinstate the command line version
- String commandLineCoordinatrURL = System.getProperty(com.arjuna.wsc11.common.Environment.XTS_COMMAND_LINE_COORDINATOR_URL);
+ String commandLineCoordinatrURL = System.getProperty(com.arjuna.wsc.common.Environment.XTS11_COMMAND_LINE_COORDINATOR_URL);
if (commandLineCoordinatrURL != null) {
- System.setProperty(com.arjuna.mw.wst11.common.Environment.COORDINATOR_URL, commandLineCoordinatrURL);
+ System.setProperty(com.arjuna.mw.wst.common.Environment.COORDINATOR11_URL, commandLineCoordinatrURL);
}
// if the coordinatorURL contains the symbolic names server.bind.address
// or jboss.web.bind.port then we must substitute these with the actual
// bind address and jboss web http port
- String coordinatorURL = System.getProperty(com.arjuna.mw.wst11.common.Environment.COORDINATOR_URL);
+ String coordinatorURL = System.getProperty(com.arjuna.mw.wst.common.Environment.COORDINATOR11_URL);
if (coordinatorURL != null) {
boolean updated = false;
int idx = coordinatorURL.indexOf(SERVER_BIND_ADDRESS_KEY);
if (idx >= 0) {
- String bindAddress = System.getProperty(Environment.XTS_BIND_ADDRESS);
+ String bindAddress = System.getProperty(Environment.XTS11_BIND_ADDRESS);
if (bindAddress == null) {
bindAddress = "127.0.0.1";
}
@@ -166,7 +166,7 @@
idx = coordinatorURL.indexOf(JBOSS_WEB_BIND_PORT_KEY);
if (idx >= 0) {
- String bindPort = System.getProperty(Environment.XTS_BIND_PORT);
+ String bindPort = System.getProperty(Environment.XTS11_BIND_PORT);
if (bindPort == null) {
bindPort = "8080";
}
@@ -175,7 +175,7 @@
}
if (updated) {
- System.setProperty(com.arjuna.mw.wst11.common.Environment.COORDINATOR_URL, coordinatorURL);
+ System.setProperty(com.arjuna.mw.wst.common.Environment.COORDINATOR11_URL, coordinatorURL);
}
}
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/at/remote/UserTransactionImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/at/remote/UserTransactionImple.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/at/remote/UserTransactionImple.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -2,7 +2,7 @@
import com.arjuna.mw.wst11.TransactionManager;
import com.arjuna.mw.wst11.UserTransaction;
-import com.arjuna.mw.wst11.common.Environment;
+import com.arjuna.mw.wst.common.Environment;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.mw.wsc11.context.Context;
import com.arjuna.mw.wst.TxContext;
@@ -43,7 +43,7 @@
{
try
{
- _activationCoordinatorService = System.getProperty(Environment.COORDINATOR_URL);
+ _activationCoordinatorService = System.getProperty(Environment.COORDINATOR11_URL);
/*
* If the coordinator URL hasn't been specified via the
Modified: labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/ba/remote/UserBusinessActivityImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/ba/remote/UserBusinessActivityImple.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/WSTX/classes11/com/arjuna/mwlabs/wst11/ba/remote/UserBusinessActivityImple.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -32,7 +32,7 @@
package com.arjuna.mwlabs.wst11.ba.remote;
import com.arjuna.mw.wst11.UserBusinessActivity;
-import com.arjuna.mw.wst11.common.Environment;
+import com.arjuna.mw.wst.common.Environment;
import com.arjuna.mw.wstx.logging.wstxLogger;
import com.arjuna.mw.wsc11.context.Context;
import com.arjuna.mw.wst.TxContext;
@@ -77,7 +77,7 @@
{
try
{
- _activationCoordinatorService = System.getProperty(Environment.COORDINATOR_URL);
+ _activationCoordinatorService = System.getProperty(Environment.COORDINATOR11_URL);
/*
* If the coordinator URL hasn't been specified via the
Modified: labs/jbosstm/trunk/XTS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/build.xml 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/build.xml 2010-05-05 09:48:29 UTC (rev 32736)
@@ -53,8 +53,12 @@
</target>
+ <target name="init.install.dir">
+ <mkdir dir="${xts.installationdirectory}"/>
+ </target>
+
<!-- Project targets - must add all module names to each target -->
- <target name="build-projects" depends="init, wsas.build,
+ <target name="build-projects" depends="init, init.install.dir, wsas.build,
ws-c.build, wscf.build,
ws-t.build, wstx.build,
recovery.build, htdocs">
@@ -241,56 +245,85 @@
</target>
+ <!-- by default we build 1.0 and 1.1 for ease of testing,
+ but release bundles should use -Dsartype=sar-11 so that
+ they contain only the supported version. -->
+ <property name="sartype" value="sar-both"/>
+
<!-- Module targets -->
<target name="wsas.build">
- <ant dir="${wsas.dir}" inheritall="false"/>
+ <ant dir="${wsas.dir}" inheritall="false">
+ <property name="sartype" value="${sartype}"/>
+ <property name="emma.enabled" value="${emma.enabled}"/>
+ </ant>
</target>
<target name="ws-c.build">
- <ant dir="${ws-c.dir}" inheritall="false"/>
+ <ant dir="${ws-c.dir}" inheritall="false">
+ <property name="sartype" value="${sartype}"/>
+ <property name="emma.enabled" value="${emma.enabled}"/>
+ </ant>
</target>
<target name="wscf.build">
- <ant dir="${wscf.dir}" inheritall="false"/>
+ <ant dir="${wscf.dir}" inheritall="false">
+ <property name="sartype" value="${sartype}"/>
+ <property name="emma.enabled" value="${emma.enabled}"/>
+ </ant>
</target>
<target name="ws-t.build">
- <ant dir="${ws-t.dir}" inheritall="false"/>
+ <ant dir="${ws-t.dir}" inheritall="false">
+ <property name="sartype" value="${sartype}"/>
+ <property name="emma.enabled" value="${emma.enabled}"/>
+ </ant>
</target>
<target name="wstx.build">
- <ant dir="${wstx.dir}" inheritall="false"/>
+ <ant dir="${wstx.dir}" inheritall="false">
+ <property name="sartype" value="${sartype}"/>
+ <property name="emma.enabled" value="${emma.enabled}"/>
+ </ant>
</target>
<target name="recovery.build">
- <ant dir="recovery"/>
+ <ant dir="recovery">
+ <property name="sartype" value="${sartype}"/>
+ <property name="emma.enabled" value="${emma.enabled}"/>
+ </ant>
</target>
<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
- they contain only the supported version. -->
- <property name="sartype" value="sar-both"/>
- <ant dir="${sar.dir}" target="${sartype}"/>
+ <ant dir="${sar.dir}">
+ <property name="sartype" value="${sartype}"/>
+ <property name="emma.enabled" value="${emma.enabled}"/>
+ </ant>
</target>
- <target name="test.settype">
- <condition property="testtype" value="tests-11">
- <equals arg1="${sartype}" arg2="sar-11"/>
- </condition>
+ <target name="tests.build">
+ <ant dir="${wsas.dir}" target="tests">
+ <property name="sartype" value="${sartype}"/>
+ <property name="emma.enabled" value="${emma.enabled}"/>
+ </ant>
+ <ant dir="${wscf.dir}" target="tests">
+ <property name="sartype" value="${sartype}"/>
+ <property name="emma.enabled" value="${emma.enabled}"/>
+ </ant>
+ <ant dir="${ws-c.dir}" target="tests">
+ <property name="sartype" value="${sartype}"/>
+ <property name="emma.enabled" value="${emma.enabled}"/>
+ </ant>
+ <ant dir="${ws-t.dir}" target="tests">
+ <property name="sartype" value="${sartype}"/>
+ <property name="emma.enabled" value="${emma.enabled}"/>
+ </ant>
+ <ant dir="${wstx.dir}" target="tests">
+ <property name="sartype" value="${sartype}"/>
+ <property name="emma.enabled" value="${emma.enabled}"/>
+ </ant>
+ <ant dir="${localjunit.dir}" target="all">
+ </ant>
</target>
- <target name="tests.build" depends="test.settype">
- <!-- 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. -->
- <property name="testtype" value="tests-both"/>
- <ant dir="${wsas.dir}" target="${testtype}"/>
- <ant dir="${wscf.dir}" target="${testtype}"/>
- <ant dir="${ws-c.dir}" target="${testtype}"/>
- <ant dir="${ws-t.dir}" target="${testtype}"/>
- <ant dir="${wstx.dir}" target="${testtype}"/>
- <ant dir="${localjunit.dir}" target="all"/>
- </target>
<target name="interop-tests.build">
<property name="xts.home" location="${xts.installationdirectory}"/>
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2010-05-05 09:48:29 UTC (rev 32736)
@@ -82,13 +82,12 @@
</target>
<target name="compile" depends="init">
- <javac destdir="${build.classes.dir}" srcdir="${src.dir}" debug="${compile.debug}">
- <classpath>
- <path refid="build.classpath"/>
+ <compile.macro includeemma="false">
+ <additional.classpath>
<fileset dir="${xts.lib.dir}" includes="${xts.libs}"/>
<fileset dir="${jbossts.build.extlib.dir}" includes="${xts.ext.libs}"/>
- </classpath>
- </javac>
+ </additional.classpath>
+ </compile.macro>
</target>
<target name="war" depends="compile">
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2010-05-05 09:48:29 UTC (rev 32736)
@@ -80,13 +80,12 @@
</target>
<target name="compile" depends="init">
- <javac destdir="${build.classes.dir}" srcdir="${src.dir}" debug="${compile.debug}">
- <classpath>
+ <compile.macro includeemma="false">
+ <additional.classpath>
<fileset dir="${xts.home}/lib" includes="${xts.libs}"/>
<fileset dir="${jbossts.build.extlib.dir}" includes="${xts.ext.libs}"/>
- <path refid="build.classpath"/>
- </classpath>
- </javac>
+ </additional.classpath>
+ </compile.macro>
</target>
<target name="war" depends="compile">
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2010-05-05 09:48:29 UTC (rev 32736)
@@ -20,7 +20,7 @@
@author JBoss Inc.
-->
-<project name="sar" default="sar-both" basedir=".">
+<project name="sar" default="sar" basedir=".">
<!-- ================================================================== -->
<!-- build and install the XTS component as a service archive -->
@@ -33,6 +33,8 @@
<!-- devs: run 'ant jta; cd XTS; ant install' after svn checkout -->
+ <property name="root.dir" location=".."/>
+
<import file="../sharedbuild.xml"/>
<!-- Set module name -->
@@ -58,6 +60,7 @@
<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="src.dir" location="src"/>
<property name="lib.dir" location="${xts.home}/lib"/>
<property name="webapps.dir" location="${xts.home}/webapps"/>
<property name="conf.dir" location="${xts.home}/conf"/>
@@ -81,6 +84,21 @@
<property name="bridge.api.class.files" value="org/jboss/jbossts/xts/bridge/at/BridgeWrapper.class"/>
+ <!-- by default we build 1.0 and 1.1 for ease of testing,
+ but release bundles should use -Dsartype=sar-11 so that
+ they contain only the supported version. -->
+ <property name="sartype" value="sar-both"/>
+
+ <!-- if condition for 1.0 specific targets -->
+ <condition property="build10">
+ <equals arg1="${sartype}" arg2="sar-both"/>
+ </condition>
+
+ <!-- if condition for 1.1 only targets -->
+ <condition property="nobuild10">
+ <isfalse value="${build10}"/>
+ </condition>
+
<target name="init">
<delete dir="${build.dir}"/>
<mkdir dir="${build.dir}"/>
@@ -93,53 +111,38 @@
<!-- TODO are the xts engine and its WS stack conceptually separate deployments? at what level do they integrate? spi or jax-ws?-->
- <!-- 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>
- <path refid="build.classpath"/>
+ <compile.macro excluded.classes="org/jboss/jbossts/xts/bridge/**/*">
+ <additional.classpath>
<fileset dir="${lib.dir}" includes="*.jar"/>
- </classpath>
- </javac>
+ </additional.classpath>
+ </compile.macro>
</target>
<!-- compile the 1.1 specific classes in the sar source which support WS-AT 1.1. bridging -->
<target name="compile.bridge" depends="compile">
- <javac srcdir="src" destdir="${build.classes.dir}" debug="${javac.debug}" includes="org/jboss/jbossts/xts/bridge/**/*" >
- <classpath>
- <path refid="build.classpath"/>
+ <compile.macro included.classes="org/jboss/jbossts/xts/bridge/**/*">
+ <additional.classpath>
<fileset dir="${lib.dir}" includes="*.jar"/>
- </classpath>
- </javac>
+ </additional.classpath>
+ </compile.macro>
</target>
<!-- build the messages resource bundle for use by the XTS logger -->
<target name="resourcebundle">
<echo message="Generating XTS Bundle"/>
+ <resourcebundle.macro packagenames="org.jboss.jbossts.*" resourcebundle="${xts.resourcebundle}">
+ <packagesets>
+ <packageset dir="src" defaultexcludes="yes">
+ <include name="org/jboss/jbossts/**"/>
+ </packageset>
+ </packagesets>
+ </resourcebundle.macro>
+ </target>
- <javadoc packagenames="org.jboss.jbossts.*"
- failonerror="yes"
- private="yes"
- defaultexcludes="yes"
- classpath="${build.classes.dir}">
-
- <packageset dir="src" defaultexcludes="yes">
- <include name="org/jboss/jbossts/**"/>
- </packageset>
-
- <doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
- <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">
+ <target name="api-both-jar" if="build10">
<mkdir dir="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-c-api.jar" dest="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-c10-api.jar" dest="${build.dir}/tmp/api"/>
@@ -159,7 +162,7 @@
</target>
<!-- build the 1.1 api jar -->
- <target name="api11-jar">
+ <target name="api11-jar" if="nobuild10">
<mkdir dir="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-c-api.jar" dest="${build.dir}/tmp/api"/>
<unjar src="${lib.dir}/ws-t-api.jar" dest="${build.dir}/tmp/api"/>
@@ -175,22 +178,10 @@
<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"/>
- <unjar src="${lib.dir}/ws-c10-api.jar" dest="${build.dir}/tmp/api"/>
- <unjar src="${lib.dir}/ws-t-api.jar" dest="${build.dir}/tmp/api"/>
- <unjar src="${lib.dir}/ws-t10-api.jar" dest="${build.dir}/tmp/api"/>
- <unjar src="${lib.dir}/wstx-api.jar" dest="${build.dir}/tmp/api"/>
- <unjar src="${lib.dir}/wstx10-api.jar" dest="${build.dir}/tmp/api"/>
- <jar file="${build.dir}/jbossxts-api.jar" basedir="${build.dir}/tmp/api"/>
- <copy file="${build.dir}/jbossxts-api.jar" tofile="${lib.dir}/jbossxts-api.jar"/>
- <delete dir="${build.dir}/tmp/api"/>
- </target>
+ <target name="api-jar" depends="api-both-jar, api11-jar"/>
<!-- build XTS service archive supporting both 1.0 and 1.1 WS-C/T protocols -->
- <target name="sar-both" depends="init, compile.bridge, compile, resourcebundle, api-both-jar">
+ <target name="sar-both" if="build10">
<!-- create config jar containing conf files for 1.0 and 1.1 -->
<filter token="coordinator.hostname" value="${coordinator.hostname}"/>
<filter token="coordinator.port" value="${coordinator.port}"/>
@@ -235,7 +226,7 @@
</target>
<!-- build XTS service archive supporting 1.1 WS-C/T protocols -->
- <target name="sar-11" depends="init, compile.bridge, compile, resourcebundle, api11-jar">
+ <target name="sar-11" if="nobuild10">
<!-- create config jar containing conf files for 1.1 -->
<filter token="coordinator.hostname" value="${coordinator.hostname}"/>
<filter token="coordinator.port" value="${coordinator.port}"/>
@@ -276,70 +267,17 @@
</jar>
</target>
- <!-- build XTS service archive supporting 1.0 WS-C/T protocols -->
- <target name="sar-10" depends="init, compile, resourcebundle, api10-jar">
- <!-- create config jar containing conf files for 1.0 -->
- <filter token="coordinator.hostname" value="${coordinator.hostname}"/>
- <filter token="coordinator.port" value="${coordinator.port}"/>
- <copy todir="${build.conf.dir}" filtering="true">
- <fileset dir="${conf.dir}" includes="*.xml" excludes="*11.xml"/>
- </copy>
- <jar jarfile="${build.dir}/config.jar">
- <fileset dir="${build.conf.dir}"/>
- </jar>
+ <target name="sar" depends="compile.bridge, resourcebundle, api-jar, sar-both, sar-11"/>
- <!-- copy 10 application.xml to build dir -->
- <copy toFile="${build.metainf.dir}/application.xml" file="${metainf.dir}/application10.xml"/>
-
- <!-- pack everything in the service archive -->
- <jar jarfile="${build.dir}/jbossxts.sar">
- <!-- include generic and 1.0 jars -->
- <fileset dir="${lib.dir}" includes="*.jar" excludes="*11.jar *api.jar"/>
-
- <fileset dir="${build.dir}" includes="jbossxts-api.jar"/>
-
- <!-- include 1.0 web apps -->
- <fileset dir="${webapps.dir}" includes="*10.war"/>
-
- <!-- include config jar -->
- <fileset dir="${build.dir}" includes="config.jar"/>
-
- <!-- include service def (e.g. dependencies) -->
- <fileset dir="." includes="META-INF/jboss-beans.xml"/>
-
- <!-- include classloading directives -->
- <fileset dir="." includes="META-INF/jboss-classloading.xml"/>
-
- <!-- include web service config -->
- <fileset dir="${build.dir}" includes="META-INF/application.xml"/>
-
- <!-- include sar boot and shutdown code -->
- <fileset dir="${build.classes.dir}" includes="**/*"/>
- </jar>
- </target>
-
<target name="clean">
<delete dir="${build.dir}"/>
<delete file="${lib.dir}/jbossxts-api.jar"/>
</target>
- <!-- convenience targets to build and deploy the service archive -->
- <target name="deploy-11" depends="undeploy, sar-11">
- <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="${jboss.home}/server/default/deploy"/>
- </target>
-
- <target name="deploy-both" depends="undeploy, sar-both">
+ <target name="deploy" depends="undeploy, sar">
<copy file="${build.dir}/jbossxts.sar" todir="${deploy.dir}"/>
</target>
- <!-- by default deploy sar implementing 1.1 and 1.0 WS-C/T protocols -->
- <target name="deploy" depends="deploy-both">
- </target>
-
<target name="undeploy">
<delete file="${deploy.dir}/jbossxts.sar"/>
</target>
Modified: labs/jbosstm/trunk/XTS/sar/src/org/jboss/jbossts/XTSService.java
===================================================================
--- labs/jbosstm/trunk/XTS/sar/src/org/jboss/jbossts/XTSService.java 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/sar/src/org/jboss/jbossts/XTSService.java 2010-05-05 09:48:29 UTC (rev 32736)
@@ -165,16 +165,16 @@
}
System.setProperty(com.arjuna.wsc.common.Environment.XTS_BIND_ADDRESS, bindAddress);
- System.setProperty(com.arjuna.wsc11.common.Environment.XTS_BIND_ADDRESS, bindAddress);
+ System.setProperty(com.arjuna.wsc.common.Environment.XTS11_BIND_ADDRESS, bindAddress);
if(httpPort != 0) {
System.setProperty(com.arjuna.wsc.common.Environment.XTS_BIND_PORT, ""+httpPort);
- System.setProperty(com.arjuna.wsc11.common.Environment.XTS_BIND_PORT, ""+httpPort);
+ System.setProperty(com.arjuna.wsc.common.Environment.XTS11_BIND_PORT, ""+httpPort);
}
if(httpsPort != 0) {
System.setProperty(com.arjuna.wsc.common.Environment.XTS_SECURE_BIND_PORT, ""+httpsPort);
- System.setProperty(com.arjuna.wsc11.common.Environment.XTS_SECURE_BIND_PORT, ""+httpsPort);
+ System.setProperty(com.arjuna.wsc.common.Environment.XTS11_SECURE_BIND_PORT, ""+httpsPort);
}
// see if the coordinatorURL or host/port has been specified on the command line
@@ -216,14 +216,14 @@
// ok now do the same for the 1.1 env settings
- if (System.getProperty(com.arjuna.wsc11.common.Environment.XTS_COMMAND_LINE_COORDINATOR_URL) == null) {
- String coordinatorURL = System.getProperty(com.arjuna.mw.wst11.common.Environment.COORDINATOR_URL);
- String coordinatorScheme = System.getProperty(com.arjuna.mw.wst11.common.Environment.COORDINATOR_SCHEME);
- String coordinatorHost = System.getProperty(com.arjuna.mw.wst11.common.Environment.COORDINATOR_HOST);
- String coordinatorPort = System.getProperty(com.arjuna.mw.wst11.common.Environment.COORDINATOR_PORT);
- String coordinatorPath = System.getProperty(com.arjuna.mw.wst11.common.Environment.COORDINATOR_PATH);
+ if (System.getProperty(com.arjuna.wsc.common.Environment.XTS11_COMMAND_LINE_COORDINATOR_URL) == null) {
+ String coordinatorURL = System.getProperty(com.arjuna.mw.wst.common.Environment.COORDINATOR11_URL);
+ String coordinatorScheme = System.getProperty(com.arjuna.mw.wst.common.Environment.COORDINATOR11_SCHEME);
+ String coordinatorHost = System.getProperty(com.arjuna.mw.wst.common.Environment.COORDINATOR11_HOST);
+ String coordinatorPort = System.getProperty(com.arjuna.mw.wst.common.Environment.COORDINATOR11_PORT);
+ String coordinatorPath = System.getProperty(com.arjuna.mw.wst.common.Environment.COORDINATOR11_PATH);
if (coordinatorURL != null) {
- System.setProperty(com.arjuna.wsc11.common.Environment.XTS_COMMAND_LINE_COORDINATOR_URL, coordinatorURL);
+ System.setProperty(com.arjuna.wsc.common.Environment.XTS11_COMMAND_LINE_COORDINATOR_URL, coordinatorURL);
} else if (coordinatorScheme != null || coordinatorHost != null || coordinatorPort != null || coordinatorPath != null) {
if (coordinatorScheme == null) {
coordinatorScheme = "http";
@@ -242,8 +242,8 @@
coordinatorPath = "ws-c11/ActivationService";
}
coordinatorURL = coordinatorScheme + "://" + coordinatorHost + ":" + coordinatorPort + "/" + coordinatorPath;
- System.setProperty(com.arjuna.wsc11.common.Environment.XTS_COMMAND_LINE_COORDINATOR_URL, coordinatorURL);
- System.setProperty(com.arjuna.mw.wst11.common.Environment.COORDINATOR_URL, coordinatorURL);
+ System.setProperty(com.arjuna.wsc.common.Environment.XTS11_COMMAND_LINE_COORDINATOR_URL, coordinatorURL);
+ System.setProperty(com.arjuna.mw.wst.common.Environment.COORDINATOR11_URL, coordinatorURL);
}
}
// now it is safe to let the Sequencer class run any intiialisation routines it needs
Modified: labs/jbosstm/trunk/XTS/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sharedbuild.xml 2010-05-05 09:37:21 UTC (rev 32735)
+++ labs/jbosstm/trunk/XTS/sharedbuild.xml 2010-05-05 09:48:29 UTC (rev 32736)
@@ -50,14 +50,15 @@
<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.dir" location="${jbossts.dir}/antbuildsystem"/>
+ <property name="jbossts.buildsystem.build.dir" location="${jbossts.buildsystem.dir}/build"/>
<property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
<!-- 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"/>
+ <property name="jbossts.build.extlib.jars" value="commons-logging-1.1.jar"/>
<!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
<property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
@@ -68,6 +69,21 @@
<isset property="cxf.build"/>
</condition>
+ <!-- by default we build 1.0 and 1.1 for ease of testing,
+ but release bundles should use -Dsartype=sar-11 so that
+ they contain only the supported version. -->
+ <property name="sartype" value="sar-both"/>
+
+ <!-- if condition for 1.0 specific targets -->
+ <condition property="build10">
+ <equals arg1="${sartype}" arg2="sar-both"/>
+ </condition>
+
+ <!-- if condition for 1.1 only targets -->
+ <condition property="nobuild10">
+ <isfalse value="${build10}"/>
+ </condition>
+
<!-- external jars used by XTS for all builds -->
<property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
jbossws-client.jar stax-api.jar
@@ -85,11 +101,93 @@
<fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
</path>
- <!-- macros and associate defs -->
-
- <!-- compilation -->
+ <!-- compilation flags -->
<property name="debug" value="true"/>
<property name="deprecation" value="true"/>
+ <!-- remember to turn emma off for prdn builds or it will be a runtime dep! -->
+ <property name="emma.enabled" value="false"/>
+
+ <!-- directory that contains emma.jar and emma_ant.jar: -->
+ <property name="emma.dir" value="${jbossts.build.extlib.dir}" />
+
+ <path id="emma.lib" >
+ <pathelement location="${emma.dir}/emma.jar" />
+ <pathelement location="${emma.dir}/emma_ant.jar" />
+ </path>
+
+ <!-- enable emma ant tasks -->
+ <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
+
+ <!-- enable ant contrib tasks -->
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <pathelement location="${jbossts.buildsystem.dir}/antbuildsystem/ant-contrib-1.0b3.jar"/>
+ </classpath>
+ </taskdef>
+
+ <!-- macros to help perform individual build steps -->
+ <property name="included.classes" value="**"/>
+ <property name="excluded.classes" value=""/>
+ <property name="excluded.test.classes" value=""/>
+
+ <macrodef name="compile.macro">
+
+ <attribute name="src.dir" default="${src.dir}"/>
+ <attribute name="dest.dir" default="${build.classes.dir}"/>
+ <attribute name="excluded.classes" default="${excluded.classes}"/>
+ <attribute name="included.classes" default="${included.classes}"/>
+ <attribute name="includeant" default="false"/>
+ <attribute name="includeemma" default="${emma.enabled}"/>
+ <!-- default coverage filter == empty string == include everything, see
+ http://emma.sourceforge.net/reference_single/reference.html#filtersyntax.ANT -->
+ <attribute name="emmafilter" default=""/>
+
+ <element name="additional.classpath" optional="true"/>
+ <element name="additional.src.dirs" optional="true"/>
+ <sequential>
+ <mkdir dir="@{dest.dir}"/>
+ <javac srcdir="@{src.dir}" destdir="@{dest.dir}" debug="${debug}" includeantruntime="@{includeant}"
+ deprecation="${deprecation}" includes="**/*" excludes="@{excluded.classes}" fork="true">
+ <classpath>
+ <path refid="build.classpath"/>
+ <additional.classpath/>
+ </classpath>
+ <additional.src.dirs/>
+ </javac>
+
+ <emma enabled="@{includeemma}">
+ <instr mode="overwrite"
+ metadatafile="${xts.install.dir}/metadata.emma"
+ merge="true"
+ filter="@{emmafilter}">
+ <instrpath>
+ <pathelement location="@{dest.dir}"/>
+ </instrpath>
+ </instr>
+ </emma>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="resourcebundle.macro">
+ <attribute name="resourcebundle"/>
+ <attribute name="packagenames" default="com.arjuna.*"/>
+ <attribute name="classpathref" default="build.classpath"/>
+ <element name="packagesets" optional="true"/>
+ <sequential>
+ <javadoc packagenames="@{packagenames}"
+ failonerror="yes"
+ private="yes"
+ defaultexcludes="yes"
+ classpathref="@{classpathref}">
+ <packagesets/>
+ <doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
+ <path refid="doclet.classpath"/>
+ <param name="-basedir" value="${basedir}/${build.classes.dir}"/>
+ <param name="-resourcebundle" value="@{resourcebundle}"/>
+ </doclet>
+ </javadoc>
+ </sequential>
+ </macrodef>
</project>
More information about the jboss-svn-commits
mailing list