[jboss-svn-commits] JBL Code SVN: r37283 - in labs/jbosstm/trunk: XTS and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 22 06:45:44 EDT 2011
Author: adinn
Date: 2011-07-22 06:45:43 -0400 (Fri, 22 Jul 2011)
New Revision: 37283
Removed:
labs/jbosstm/trunk/XTS/sar/META-INF/module.xml
Modified:
labs/jbosstm/trunk/XTS/WS-C/build.xml
labs/jbosstm/trunk/XTS/WS-T/build.xml
labs/jbosstm/trunk/XTS/WSCF/build.xml
labs/jbosstm/trunk/XTS/WSTX/build.xml
labs/jbosstm/trunk/XTS/build.xml
labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml
labs/jbosstm/trunk/XTS/localjunit/run-tests.xml
labs/jbosstm/trunk/XTS/sar/build.xml
labs/jbosstm/trunk/XTS/sharedbuild.xml
labs/jbosstm/trunk/build-release-pkgs.xml
Log:
updated ant build scripts to remove rules for building 1.0 XTS code (but left source code in place) -- fixes for JBTM-848
Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml 2011-07-22 02:25:57 UTC (rev 37282)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml 2011-07-22 10:45:43 UTC (rev 37283)
@@ -49,13 +49,11 @@
<!-- internal paths and jars -->
<property name="src.dir" value="dev/src"/>
- <property name="src10.dir" value="dev/src10"/>
<property name="src11.dir" value="dev/src11"/>
<property name="dd.dir" value="dev/dd"/>
<property name="build.dir" value="build"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="build.classes10.dir" value="${build.dir}/classes10/classes"/>
<property name="build.classes11.dir" value="${build.dir}/classes11/classes"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
<property name="build.dd.dir" value="${build.dir}/dd"/>
@@ -74,8 +72,6 @@
<!-- classes provided for clients via api jar -->
<property name="ws-c.api.classes" value="com/arjuna/wsc/AlreadyRegisteredException.class"/>
- <!-- we had to delete the JaxRPC handlers so we export the bits needed to allow clients to create them -->
- <property name="ws-c10.api.classes" value="com/arjuna/webservices/wscoor/CoordinationConstants.class"/>
<property name="ws-c11.coordinator.endpoint.classes" value="com/arjuna/webservices11/wscoor/sei/ActivationPortTypeImpl.class
com/arjuna/webservices11/wscoor/sei/RegistrationPortTypeImpl.class"/>
@@ -109,7 +105,6 @@
<target name="init-dir">
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.classes.dir}"/>
- <mkdir dir="${build.classes10.dir}"/>
<mkdir dir="${build.classes11.dir}"/>
<mkdir dir="${build.lib.dir}"/>
<mkdir dir="${build.dd.dir}"/>
@@ -121,24 +116,8 @@
<mkdir dir="${tests.build.webapps.dir}"/>
</target>
- <target name="compile-generic">
+ <target name="compile" depends="init">
<compile.macro/>
- </target>
-
- <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>
- </additional.classpath>
- </compile.macro>
- <copy todir="${build.classes10.dir}">
- <fileset dir="${src10.dir}" excludes="**/*.java"/>
- </copy>
- </target>
-
- <target name="compile11">
<compile.macro src.dir="${src11.dir}" dest.dir="${build.classes11.dir}">
<additional.classpath>
<path>
@@ -148,9 +127,7 @@
</compile.macro>
</target>
- <target name="compile" depends="init, compile-generic, compile10, compile11"/>
-
- <target name="wsdl11" >
+ <target name="wsdl" >
<!-- 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"/>
@@ -167,117 +144,55 @@
<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"/>
</target>
- <target name="jars-generic">
+ <target name="jars" depends="compile, wsdl">
<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">
<copy file="${dd.dir}/ws-c_handlers.xml" tofile="${build.classes11.dir}/ws-c_handlers.xml"/>
<jar jarfile="${build.lib.dir}/ws-c11.jar">
<fileset dir="${build.classes11.dir}"/>
</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>
- <jar jarfile="${build.lib.dir}/ws-c10-api.jar">
- <fileset dir="${build.classes10.dir}" includes="${ws-c10.api.classes}"/>
- </jar>
- <copy file="${dd.dir}/ws-c_handlers.xml" tofile="${build.classes11.dir}/ws-c_handlers.xml"/>
- <jar jarfile="${build.lib.dir}/ws-c11.jar">
- <fileset dir="${build.classes11.dir}"/>
- </jar>
- </target>
-
- <target name="jars" depends="compile, 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" >
+ <target name="webapps" depends="jars">
<copy file="${dd.dir}/ws-c11_web-app.xml" tofile="${build.dd.dir}/web-app11.xml"/>
<war warfile="${build.webapps.dir}/ws-c11.war" webxml="${build.dd.dir}/web-app11.xml" manifest="${dd.dir}/manifest.mf">
</war>
</target>
- <target name="webapps" depends="jars, webapps11, webapps10"/>
-
<!-- this assumes the required libs have already been built -->
- <target name="tests-compile10" if="build10">
+ <target name="tests-compile">
<javac destdir="${tests.build.classes.dir}" debug="${debug}" deprecation="${deprecation}">
<classpath>
<pathelement path="${build.lib.dir}/ws-c.jar"/>
<pathelement path="${build.lib.dir}/ws-c-api.jar"/>
- <pathelement path="${build.lib.dir}/ws-c10.jar"/>
- <pathelement path="${build.lib.dir}/ws-c10-api.jar"/>
<pathelement path="${build.lib.dir}/ws-c11.jar"/>
<path refid="tests.lib.path"/>
<path refid="build.classpath"/>
</classpath>
<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}">
- <classpath>
- <pathelement path="${build.lib.dir}/ws-c.jar"/>
- <pathelement path="${build.lib.dir}/ws-c-api.jar"/>
- <pathelement path="${build.lib.dir}/ws-c11.jar"/>
- <path refid="tests.lib.path"/>
- <path refid="build.classpath"/>
- </classpath>
- <src path="${tests.src.dir}"/>
<include name="com/arjuna/qa/**"/>
<include name="com/arjuna/wsc11/**"/>
</javac>
</target>
- <target name="tests-compile" depends="tests-compile10, tests-compile11"/>
-
<target name="tests-jar" depends="tests-compile">
<jar jarfile="${tests.build.lib.dir}/ws-c-tests.jar" manifest="${tests.dd.dir}/META-INF/manifest.mf">
<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">
+ <target name="tests-webapps" depends="tests-jar">
<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" manifest="${tests.dd.dir}/META-INF/war.manifest.mf">
<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"/>
- <fileset dir="${tests.build.webapps.dir}" includes="ws-c11-tests.war"/>
- <fileset dir="${tests.build.lib.dir}" includes="ws-c-tests.jar"/>
- <fileset dir="${wsas.tests.build.dir}/lib" includes="xts-test-servlet.jar"/>
- <fileset dir="${tests.dd.dir}" includes="META-INF/**/*" excludes="META-INF/**/*manifest.mf"/>
- </ear>
- </target>
-
- <target name="tests-ear11" if="nobuild10">
+ <target name="tests-ear" depends="tests-webapps">
<mkdir dir="${tests.build.dir}/ext/lib"/>
<copy todir="${tests.build.dir}/ext/lib">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
@@ -291,8 +206,6 @@
</ear>
</target>
- <target name="tests-ear" depends="tests-webapps, tests-ear-both, tests-ear11"/>
-
<!-- production target for tests -->
<target name="tests" depends="tests-ear"/>
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2011-07-22 02:25:57 UTC (rev 37282)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2011-07-22 10:45:43 UTC (rev 37283)
@@ -51,7 +51,6 @@
<!-- internal paths and jars -->
<property name="build.dir" value="build"/>
<property name="src.dir" value="dev/src"/>
- <property name="src10.dir" value="dev/src10"/>
<property name="src11.dir" value="dev/src11"/>
<property name="dd.dir" value="dev/dd"/>
@@ -59,7 +58,6 @@
<property name="tests.dd.dir" value="tests/dd"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="build.classes10.dir" value="${build.dir}/classes10/classes"/>
<property name="build.classes11.dir" value="${build.dir}/classes11/classes"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
<property name="build.dd.dir" value="${build.dir}/dd"/>
@@ -85,7 +83,6 @@
org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManager.class
org/jboss/jbossts/xts/recovery/participant/ba/XTSBARecoveryModule.class
org/jboss/jbossts/xts/recovery/participant/ba/XTSBARecoveryManager.class"/>
- <property name="ws-t10.api.classes" value="com/arjuna/wst/BAParticipantManager.class"/>
<property name="ws-t11.api.classes" value="com/arjuna/wst11/BAParticipantManager.class
com/arjuna/wst11/ConfirmCompletedParticipant.class"/>
<property name="ws-t11.coordinator.endpoint.classes" value="com/arjuna/webservices11/wsat/sei/CompletionCoordinatorPortTypeImpl*.class
@@ -111,20 +108,14 @@
<property name="wsas.libs" value="wsas.jar"/>
<property name="wscf.libs" value="wscf.jar"/>
- <property name="wscf10.libs" value="wscf10.jar"/>
<property name="wscf11.libs" value="wscf11.jar"/>
<property name="ws-c.libs" value="ws-c.jar"/>
<property name="ws-c.api.libs" value="ws-c-api.jar"/>
- <property name="ws-c10.libs" value="ws-c10.jar"/>
- <property name="ws-c10.api.libs" value="ws-c10-api.jar"/>
<property name="ws-c11.libs" value="ws-c11.jar"/>
<path id="ws-c.path">
<fileset dir="${ws-c.build.lib.dir}" includes="${ws-c.libs} ${ws-c.api.libs}"/>
</path>
- <path id="ws-c10.path">
- <fileset dir="${ws-c.build.lib.dir}" includes="${ws-c10.libs} ${ws-c10.api.libs}"/>
- </path>
<path id="ws-c11.path">
<fileset dir="${ws-c.build.lib.dir}" includes="${ws-c11.libs}"/>
</path>
@@ -132,9 +123,6 @@
<path id="wscf.path">
<fileset dir="${wscf.build.lib.dir}" includes="${wscf.libs}"/>
</path>
- <path id="wscf10.path">
- <fileset dir="${wscf.build.lib.dir}" includes="${wscf10.libs}"/>
- </path>
<path id="wscf11.path">
<fileset dir="${wscf.build.lib.dir}" includes="${wscf11.libs}"/>
</path>
@@ -168,7 +156,6 @@
<target name="init-dir">
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.classes.dir}"/>
- <mkdir dir="${build.classes10.dir}"/>
<mkdir dir="${build.classes11.dir}"/>
<mkdir dir="${build.lib.dir}"/>
<mkdir dir="${build.dd.dir}"/>
@@ -180,7 +167,7 @@
<mkdir dir="${tests.build.webapps.dir}"/>
</target>
- <target name="compile-generic">
+ <target name="compile" depends="init">
<compile.macro>
<additional.classpath>
<path>
@@ -191,24 +178,6 @@
<path refid="wsas.path"/>
</additional.classpath>
</compile.macro>
- </target>
-
- <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="ws-c.path"/>
- <path refid="ws-c10.path"/>
- <path refid="wscf.path"/>
- <path refid="wscf10.path"/>
- <path refid="wsas.path"/>
- </additional.classpath>
- </compile.macro>
- </target>
-
- <target name="compile11">
<compile.macro src.dir="${src11.dir}" dest.dir="${build.classes11.dir}">
<additional.classpath>
<path>
@@ -223,9 +192,7 @@
</compile.macro>
</target>
- <target name="compile" depends="init, compile-generic, compile10, compile11"/>
-
- <target name="wsdl11">
+ <target name="wsdl">
<!-- 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"/>-->
@@ -281,25 +248,13 @@
<copy file="${dd.dir}/wsarjtx/wsdl/envelope.xsd" tofile="${build.classes11.dir}/com/arjuna/schemas/ws/_2005/_10/wsarjtx/wsdl/envelope.xsd"/>
</target>
- <target name="jars-generic" >
+ <target name="jars" depends="compile, wsdl">
<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">
<copy file="${dd.dir}/ws-t_handlers.xml" tofile="${build.classes11.dir}/ws-t_handlers.xml"/>
<copy file="${dd.dir}/ws-t-rpc_handlers.xml" tofile="${build.classes11.dir}/ws-t-rpc_handlers.xml"/>
<jar jarfile="${build.lib.dir}/ws-t11.jar">
@@ -310,14 +265,7 @@
</jar>
</target>
- <target name="jars" depends="compile, 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"/>
- <war warfile="${build.webapps.dir}/ws-t10.war" webxml="${build.dd.dir}/web-app.xml"/>
- </target>
-
- <target name="webapps11" depends="jars11">
+ <target name="webapps" depends="jars">
<copy file="${dd.dir}/ws-t11-coordinator_web-app.xml" tofile="${build.dd.dir}/web-app11-coordinator.xml"/>
<copy file="${dd.dir}/ws-t11-participant_web-app.xml" tofile="${build.dd.dir}/web-app11-participant.xml"/>
<copy file="${dd.dir}/ws-t11-client_web-app.xml" tofile="${build.dd.dir}/web-app11-client.xml"/>
@@ -332,37 +280,12 @@
</war>
</target>
- <target name="webapps" depends="jars, webapps10, webapps11"/>
-
<!-- this assumes all the required libs have been built -->
- <target name="tests-compile10" if="build10">
+ <target name="tests-compile">
<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"/>
- <path refid="tests.lib.path"/>
- <path refid="build.classpath"/>
- <path refid="ws-c.path"/>
- <path refid="ws-c10.path"/>
- <path refid="ws-c11.path"/>
- <path refid="wscf.path"/>
- <path refid="wscf10.path"/>
- <path refid="wscf11.path"/>
- <path refid="wsas.path"/>
- </classpath>
- <src path="${tests.src.dir}"/>
- <exclude name="com/arjuna/wst11/tests/**"/>
- </javac>
- </target>
-
- <!-- this assumes all the required libs have been built -->
- <target name="tests-compile11">
- <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-t11.jar"/>
<pathelement path="${build.lib.dir}/ws-t11-api.jar"/>
<path refid="tests.lib.path"/>
@@ -379,38 +302,18 @@
</javac>
</target>
- <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" manifest="${tests.dd.dir}/META-INF/manifest.mf">
<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-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>
- </target>
-
- <target name="tests-webapps11">
+ <target name="tests-webapps" depends="tests-jar">
<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" manifest="${tests.dd.dir}/META-INF/manifest.mf"/>
</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"/>
- <fileset dir="${tests.build.lib.dir}" includes="ws-t-tests.jar"/>
- <fileset dir="${wsas.tests.build.dir}/lib" includes="xts-test-servlet.jar"/>
- <fileset dir="${tests.dd.dir}" includes="META-INF/**/*" excludes="META-INF/**/*manifest.mf"/>
- </ear>
- </target>
-
- <target name="tests-ear11" if="nobuild10">
+ <target name="tests-ear" depends="tests-webapps">
<mkdir dir="${tests.build.dir}/ext/lib"/>
<copy todir="${tests.build.dir}/ext/lib">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
@@ -424,8 +327,6 @@
</ear>
</target>
- <target name="tests-ear" depends="tests-webapps, tests-ear-both, tests-ear11"/>
-
<!-- production target for tests -->
<target name="tests" depends="tests-ear"/>
Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml 2011-07-22 02:25:57 UTC (rev 37282)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml 2011-07-22 10:45:43 UTC (rev 37283)
@@ -20,7 +20,7 @@
@author JBoss Inc.
-->
-<project name="WSCF" default="war" basedir=".">
+<project name="WSCF" default="jar" basedir=".">
<!-- Set module name -->
<property name="modulename" value="wscf"/>
@@ -40,12 +40,10 @@
<!-- internal paths and jars -->
<property name="src.dir" value="classes"/>
- <property name="src10.dir" value="classes10"/>
<property name="src11.dir" value="classes11"/>
<property name="build.dir" value="build"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="build.classes10.dir" value="${build.dir}/classes10/classes"/>
<property name="build.classes11.dir" value="${build.dir}/classes11/classes"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
<property name="build.webapps.dir" value="${build.dir}/webapps"/>
@@ -70,8 +68,6 @@
<property name="wsas.libs" value="wsas.jar"/>
<property name="wsc.libs" value="ws-c.jar"/>
<property name="wsc.api.libs" value="ws-c-api.jar"/>
- <property name="wsc10.libs" value="ws-c10.jar"/>
- <property name="wsc10.api.libs" value="ws-c10-api.jar"/>
<property name="wsc11.libs" value="ws-c11.jar"/>
<path id="wscf.lib.classpath">
@@ -96,23 +92,19 @@
</tstamp>
<!-- Make the destination directory -->
<mkdir dir="${build.classes.dir}"/>
- <mkdir dir="${build.classes10.dir}"/>
<mkdir dir="${build.classes11.dir}"/>
<mkdir dir="${build.webapps.dir}"/>
</target>
<!-- Compilation targets -->
- <target name="compile-generic">
+ <target name="compile" depends="init">
<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"/>
+ <echo message="Compiling module 1.1 code"/>
<compile.macro src.dir="${src11.dir}" dest.dir="${build.classes11.dir}">
<additional.classpath>
<path>
@@ -124,23 +116,6 @@
</compile.macro>
</target>
- <target name="compile10" if="build10">
- <echo message="Compiling module 1.0 code"/>
- <compile.macro src.dir="${src10.dir}" dest.dir="${build.classes10.dir}"
- emmafilter="com.arjuna.mw.wscf.model.xa.* ">
- <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"/>
- </additional.classpath>
- </compile.macro>
- </target>
-
- <target name="compile" depends="init, compile-generic, compile10, compile11"/>
-
<!-- htdocs paths -->
<path id="htdocs.path">
<pathelement path="classes"/>
@@ -150,31 +125,19 @@
<property name="htdocs.list" value="*"/>
<!-- Jar targets -->
- <target name="jar-generic">
+ <target name="jar" depends="compile, htdocs">
<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" if="build10">
- <echo message="Building 10 jar files"/>
- <jar jarfile="${build.lib.dir}/${modulename}10.jar"
- basedir="${build.classes10.dir}">
- </jar>
- </target>
-
- <target name="jar11">
<echo message="Building 11 jar files"/>
<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="htdocs11" if="nobuild10">
+ <target name="htdocs">
<echo message="Building htdocs "/>
<mkdir dir="${htdocs.dest}"/>
<javadoc
@@ -190,31 +153,6 @@
</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="htdocs" depends="htdocs-both, htdocs11"/>
-
- <target name="war10" if="build10">
- <war warfile="${build.webapps.dir}/${modulename}10.war" webxml="xml/wscf_web-app.xml"/>
- </target>
-
- <target name="war" depends="jar, htdocs, war10"/>
-
<!-- test targets -->
<target name="tests.init">
<!-- delete the test destination directories -->
@@ -228,22 +166,6 @@
</target>
<!-- this assumes the required libs have already been built-->
- <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="${wsc.build.lib.dir}/${wsc10.libs}"/>
- <pathelement path="${wsc.build.lib.dir}/${wsc10.api.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">
<javac destdir="${tests.build.classes.dir}" debug="yes" optimize="no">
<classpath>
@@ -258,7 +180,7 @@
</javac>
</target>
- <target name="tests.compile" depends="tests.init, tests.compile10, tests.compile11"/>
+ <target name="tests.compile" depends="tests.init, tests.compile11"/>
<target name="tests.jar" depends="tests.compile">
<jar jarfile="${tests.build.lib.dir}/wscf-tests.jar" manifest="${tests.dd.dir}/manifest.mf">
@@ -266,29 +188,14 @@
</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" manifest="${tests.dd.dir}/war.manifest.mf"/>
</target>
- <target name="tests.webapps" depends="tests.jar, tests.webapps10, tests.webapps11"/>
+ <target name="tests.webapps" depends="tests.jar, 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"/>
- <fileset dir="${tests.build.lib.dir}" includes="wscf-tests.jar"/>
- <fileset dir="${wsas.tests.build.dir}/lib" includes="xts-test-servlet.jar"/>
- </ear>
- </target>
-
- <target name="tests.ear11" if="nobuild10">
+ <target name="tests.ear11">
<mkdir dir="${tests.build.dir}/ext/lib"/>
<copy todir="${tests.build.dir}/ext/lib">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
@@ -301,7 +208,7 @@
</ear>
</target>
- <target name="tests.ear" depends="tests.webapps, tests.ear-both, tests.ear11"/>
+ <target name="tests.ear" depends="tests.webapps, tests.ear11"/>
<target name="tests.deploy" depends="tests.ear, tests.undeploy">
<copy file="${tests.build.webapps.dir}/wscf-tests.ear" tofile="${deploy.dir}/wscf-tests.ear"/>
Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml 2011-07-22 02:25:57 UTC (rev 37282)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml 2011-07-22 10:45:43 UTC (rev 37283)
@@ -19,7 +19,7 @@
(C) 2005-2006,
@author JBoss Inc.
-->
-<project name="WSTX" default="war" basedir=".">
+<project name="WSTX" default="jar" basedir=".">
<!-- Set module name -->
<property name="modulename" value="wstx"/>
@@ -39,11 +39,9 @@
<!-- internal paths and jars -->
<property name="src.dir" value="classes"/>
- <property name="src10.dir" value="classes10"/>
<property name="src11.dir" value="classes11"/>
<property name="build.dir" value="build"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="build.classes10.dir" value="${build.dir}/classes10/classes"/>
<property name="build.classes11.dir" value="${build.dir}/classes11/classes"/>
<property name="build.webapps.dir" value="${build.dir}/webapps"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
@@ -61,18 +59,6 @@
<!-- classes provided for clients via api jars -->
<property name="wstx.api.classes" value="com/arjuna/mw/wst/TxContext.class"/>
- <property name="wstx10.api.classes" value="com/arjuna/mw/wst/UserTransaction.class
- com/arjuna/mw/wst/UserTransactionFactory.class com/arjuna/mw/wst/TransactionManager.class
- com/arjuna/mw/wst/TransactionManagerFactory.class com/arjuna/mw/wst/UserBusinessActivity.class
- com/arjuna/mw/wst/UserBusinessActivityFactory.class com/arjuna/mw/wst/BusinessActivityManager.class
- com/arjuna/mw/wst/BusinessActivityManagerFactory.class
- com/arjuna/mw/wst/client/JaxWSHeaderContextProcessor.class
- com/arjuna/mw/wst/client/JaxRPCHeaderContextProcessor.class
- com/arjuna/mw/wst/client/JaxBaseHeaderContextProcessor.class
- com/arjuna/mw/wst/service/JaxWSHeaderContextProcessor.class
- com/arjuna/mw/wst/service/JaxWSSubordinateHeaderContextProcessor.class
- com/arjuna/mw/wst/service/JaxRPCHeaderContextProcessor.class
- com/arjuna/mw/wst/service/JaxBaseHeaderContextProcessor.class"/>
<property name="wstx11.api.classes" value="com/arjuna/mw/wst11/UserTransaction.class
com/arjuna/mw/wst11/UserTransactionFactory.class com/arjuna/mw/wst11/TransactionManager.class
com/arjuna/mw/wst11/TransactionManagerFactory.class com/arjuna/mw/wst11/UserBusinessActivity.class
@@ -99,9 +85,7 @@
</path>
<property name="wstx.libs" value="${modulename}.jar"/>
- <property name="wstx10.libs" value="${modulename}10.jar"/>
<property name="wstx11.libs" value="${modulename}11.jar"/>
- <property name="wstx.all.libs" value="${wstx.libs} ${wstx10.libs} ${wstx11.libs}"/>
<!--Set external directories -->
@@ -119,24 +103,14 @@
<property name="wsas.libs" value="wsas.jar"/>
<property name="wsc.libs" value="ws-c.jar"/>
<property name="wsc-api.libs" value="ws-c-api.jar"/>
- <property name="wsc10.libs" value="ws-c10.jar"/>
- <property name="wsc10-api.libs" value="ws-c10-api.jar"/>
<property name="wsc11.libs" value="ws-c11.jar"/>
- <property name="wsc.all.libs" value="${wsc.libs} ${wsc10.libs} ${wsc11.libs}"/>
<property name="wscf.libs" value="wscf.jar"/>
- <property name="wscf10.libs" value="wscf10.jar"/>
<property name="wscf11.libs" value="wscf11.jar"/>
- <property name="wscf.all.libs" value="${wscf.libs} ${wscf10.libs} ${wscf11.libs}"/>
<property name="wst.libs" value="ws-t.jar"/>
<property name="wst-api.libs" value="ws-t-api.jar"/>
- <property name="wst10.libs" value="ws-t10.jar"/>
- <property name="wst10-api.libs" value="ws-t10-api.jar"/>
<property name="wst11.libs" value="ws-t11.jar"/>
<property name="wst11-api.libs" value="ws-t11-api.jar"/>
- <property name="wst.all.libs" value="${wst.libs} ${wst10.libs} ${wst11.libs}"/>
- <property name="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"/>-->
<fileset dir="${wsas.build.lib.dir}" includes="${wsas.libs}"/>
@@ -145,12 +119,6 @@
<fileset dir="${wst.build.lib.dir}" includes="${wst.libs} ${wst-api.libs}"/>
</path>
- <path id="lib.classpath10">
- <fileset dir="${wsc.build.lib.dir}" includes="${wsc10.libs} ${wsc10-api.libs}"/>
- <fileset dir="${wscf.build.lib.dir}" includes="${wscf10.libs}"/>
- <fileset dir="${wst.build.lib.dir}" includes="${wst10.libs} ${wst10-api.libs}"/>
- </path>
-
<path id="lib.classpath11">
<fileset dir="${wsc.build.lib.dir}" includes="${wsc11.libs}"/>
<fileset dir="${wscf.build.lib.dir}" includes="${wscf11.libs}"/>
@@ -165,7 +133,6 @@
</tstamp>
<!-- Make the destination directory -->
<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}"/>
@@ -174,29 +141,13 @@
<!-- Compilation targets -->
- <target name="compile-generic">
+ <target name="compile" depends="init">
<echo message="Compiling module generic code"/>
<compile.macro>
<additional.classpath>
<path refid="lib.classpath"/>
</additional.classpath>
</compile.macro>
- </target>
-
- <target name="compile10" if="build10">
- <echo message="Compiling module 1.0 code"/>
- <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"/>
- </additional.classpath>
- </compile.macro>
- </target>
-
- <target name="compile11">
<echo message="Compiling module 1.1 code"/>
<compile.macro src.dir="${src11.dir}" dest.dir="${build.classes11.dir}">
<additional.classpath>
@@ -209,8 +160,6 @@
</compile.macro>
</target>
- <target name="compile" depends="init, compile-generic, compile11, compile10"/>
-
<!-- htdocs paths -->
<path id="htdocs.path">
<pathelement path="classes"/>
@@ -219,7 +168,7 @@
<!-- Build htdocs for just mw, or mw and mwlabs -->
<property name="htdocs.list" value="com.arjuna.mw.*"/>
- <target name="htdocs-both" if="build10">
+ <target name="htdocs">
<echo message="Building htdocs "/>
<javadoc
sourcepathref="htdocs.path"
@@ -234,43 +183,14 @@
</javadoc>
</target>
- <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>
-
- <target name="htdocs" depends="htdocs-both, htdocs11"/>
-
<!-- Jar targets -->
- <target name="jar-generic">
+ <target name="jar" depends="compile, htdocs">
<jar jarfile="${build.lib.dir}/${modulename}.jar">
<fileset dir="${build.classes.dir}" excludes="${wstx.api.classes}"/>
</jar>
<jar jarfile="${build.lib.dir}/${modulename}-api.jar">
<fileset dir="${build.classes.dir}" includes="${wstx.api.classes}"/>
</jar>
- </target>
-
- <target name="jar10" if="build10">
- <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">
<jar jarfile="${build.lib.dir}/${modulename}11.jar">
<fileset dir="${build.classes11.dir}" excludes="${wstx11.api.classes}"/>
</jar>
@@ -279,14 +199,6 @@
</jar>
</target>
- <target name="jar" depends="compile, htdocs, jar-generic, jar10, jar11"/>
-
- <target name="war10" if="build10">
- <war warfile="${build.webapps.dir}/${modulename}10.war" webxml="xml/wstx_web-app.xml"/>
- </target>
-
- <target name="war" depends="jar, war10"/>
-
<target name="tests.init">
<!-- delete the test destination directories -->
<delete dir="${tests.build.dir}"/>
@@ -299,35 +211,14 @@
</target>
<!-- this assumes all the rwuired libs have been built -->
- <target name="tests.compile10" if="build10">
+ <target name="tests.compile" depends="tests.init">
<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"/>
- <path refid="com.arjuna.mwlabs.wstx.tests.lib.path"/>
- <path refid="lib.classpath10"/>
- <path refid="lib.classpath11"/>
- <path refid="lib.classpath"/>
- <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">
- <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}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"/>
<path refid="build.classpath"/>
@@ -339,37 +230,18 @@
</javac>
</target>
- <target name="tests.compile" depends="tests.init, tests.compile10, tests.compile11"/>
-
<target name="tests.jar" depends="tests.compile">
<jar jarfile="${tests.build.lib.dir}/wstx-tests.jar" manifest="${tests.dd.dir}/META-INF/manifest.mf">
<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">
+ <target name="tests.webapps" depends="tests.jar">
<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" manifest="${tests.dd.dir}/META-INF/war.manifest.mf"/>
</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}/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"/>
- <fileset dir="${tests.build.lib.dir}" includes="wstx-tests.jar"/>
- <fileset dir="${wsas.test.build.dir}/lib" includes="xts-test-servlet.jar"/>
- <fileset dir="${tests.dd.dir}" includes="META-INF/**/*" excludes="META-INF/**/*manifest.mf"/>
- </ear>
- </target>
-
- <target name="tests.ear11" if="nobuild10">
+ <target name="tests.ear" depends="tests.webapps">
<mkdir dir="${tests.build.dir}/ext/lib"/>
<copy todir="${tests.build.dir}/ext/lib">
<fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
@@ -383,8 +255,6 @@
</ear>
</target>
- <target name="tests.ear" depends="tests.webapps, tests.ear-both, tests.ear11"/>
-
<!-- production target for tests -->
<target name="tests" depends="tests.ear"/>
Modified: labs/jbosstm/trunk/XTS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/build.xml 2011-07-22 02:25:57 UTC (rev 37282)
+++ labs/jbosstm/trunk/XTS/build.xml 2011-07-22 10:45:43 UTC (rev 37283)
@@ -190,11 +190,7 @@
</target>
<target name="install-sar" depends="build-sar">
- <echo message="Installing service archive"/>
- <mkdir dir="${xts.installationdirectory}/sar"/>
- <copy todir="${xts.installationdirectory}/sar">
- <fileset dir="${sar.dir}/build" includes="jbossxts.sar"/>
- </copy>
+ <echo message="Installed service jars"/>
</target>
<target name="install-tests" depends="build-tests">
@@ -268,79 +264,66 @@
<!-- Module targets -->
<target name="wsas.build">
<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">
- <property name="sartype" value="${sartype}"/>
<property name="emma.enabled" value="${emma.enabled}"/>
</ant>
</target>
<target name="wscf.build">
<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">
- <property name="sartype" value="${sartype}"/>
<property name="emma.enabled" value="${emma.enabled}"/>
</ant>
</target>
<target name="wstx.build">
<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">
- <property name="sartype" value="${sartype}"/>
<property name="emma.enabled" value="${emma.enabled}"/>
</ant>
</target>
<target name="bridge.build">
<ant dir="${bridge.dir}">
- <property name="sartype" value="${sartype}"/>
<property name="emma.enabled" value="${emma.enabled}"/>
</ant>
</target>
<target name="sar.build">
<ant dir="${sar.dir}">
- <property name="sartype" value="${sartype}"/>
<property name="emma.enabled" value="${emma.enabled}"/>
</ant>
</target>
<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">
Modified: labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml 2011-07-22 02:25:57 UTC (rev 37282)
+++ labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml 2011-07-22 10:45:43 UTC (rev 37283)
@@ -37,8 +37,6 @@
<property name="reports.dir" value="reports"/>
<property name="localjunit.lib.dir" value="." />
- <property name="testtype" value="tests-both" />
-
<path id="tests.classpath">
<pathelement location="${localjunit.lib.dir}/localjunit.jar"/>
<pathelement location="${jbossts.build.extlib.dir}/commons-httpclient.jar"/>
Modified: labs/jbosstm/trunk/XTS/localjunit/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/run-tests.xml 2011-07-22 02:25:57 UTC (rev 37282)
+++ labs/jbosstm/trunk/XTS/localjunit/run-tests.xml 2011-07-22 10:45:43 UTC (rev 37283)
@@ -61,14 +61,6 @@
<run-localjunit-test serverUrl="${base.url}/wstx11-tests/index.xml" tag="wstx11" />
</target>
- <!-- target for both 1.0 and 1.1 tests -->
- <target name="tests-both" depends="tests-11">
- <run-localjunit-test serverUrl="${base.url}/wscf-tests/index.xml" tag="wscf" />
- <run-localjunit-test serverUrl="${base.url}/wstx-tests/index.xml" tag="wstx" />
- <run-localjunit-test serverUrl="${base.url}/ws-c-tests/index.xml" tag="ws-c" />
- <run-localjunit-test serverUrl="${base.url}/ws-t-tests/index.xml" tag="ws-t" />
- </target>
-
<macrodef name="run-localjunit-test">
<attribute name="serverUrl" />
<attribute name="tag" />
Deleted: labs/jbosstm/trunk/XTS/sar/META-INF/module.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/META-INF/module.xml 2011-07-22 02:25:57 UTC (rev 37282)
+++ labs/jbosstm/trunk/XTS/sar/META-INF/module.xml 2011-07-22 10:45:43 UTC (rev 37283)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY 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 along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<!--
- module declaration for XTS enabling the code to be made available in AS7
- this file and the jars need to be copied to the AS7 modules directory
- in subdirectory org/jboss/xts/main. The XTS service class and the 4 XTS
- web archives for ws-c11 and ws-t11 are depoyed as AS7 client applications
- and they depend on the module to gain access to the XTS classes. Client
- code also needs to depend on this module.
--->
-
-<module xmlns="urn:jboss:module:1.0" name="org.jboss.xts">
-
- <resources>
- <!-- Insert resources here -->
- <resource-root path="ws-c.jar"/>
- <resource-root path="ws-c11.jar"/>
- <resource-root path="ws-t.jar"/>
- <resource-root path="ws-t11.jar"/>
- <resource-root path="wsas.jar"/>
- <resource-root path="wscf.jar"/>
- <resource-root path="wscf11.jar"/>
- <resource-root path="wstx.jar"/>
- <resource-root path="wstx11.jar"/>
- <resource-root path="recovery.jar"/>
- <resource-root path="service.jar"/>
- <resource-root path="config.jar"/>
- <resource-root path="bridge-api.jar"/>
- <resource-root path="jbossxts-api.jar"/>
- </resources>
-
- <dependencies>
- <!--
- <module name="javax.transaction"/>
- -->
- <module name="org.jboss.jts"/>
- <module name="org.jboss.ws.api" services="export"/>
- <module name="org.jboss.ws.jaxws-client" services="export"/>
- <module name="org.jboss.ws.cxf.jbossws-cxf-client" services="export"/>
- <module name="org.jboss.logging"/>
- <module name="javax.xml.soap.api"/>
- <module name="javax.xml.ws.api"/>
- <module name="javax.xml.stream.api"/>
- <!-- this is needed to get javax.xml.namespace.QName but it woudl be better if it were exposed on its own -->
- <module name="javax.api"/>
- <!-- this is needed because our endpoints are not in a normal deployment and we need to be able
- to resolve the javax.jws.WebService annotation attached to them. presumably an endpoint
- found in a deployment gets this package auto-added to its module loader
- -->
- <module name="javax.jws.api"/>
- <!-- this is needed to ensure @Resource annotations are visible -->
- <module name="javax.annotation.api"/>
- <!-- need this so we can access HTTPServletRequest etc -->
- <module name="javax.servlet.api"/>
- </dependencies>
-</module>
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2011-07-22 02:25:57 UTC (rev 37282)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2011-07-22 10:45:43 UTC (rev 37283)
@@ -20,7 +20,7 @@
@author JBoss Inc.
-->
-<project name="sar" default="sar" basedir=".">
+<project name="sar" default="install" basedir=".">
<!-- ================================================================== -->
<!-- build and install the XTS component as a service archive -->
@@ -79,21 +79,6 @@
<property name="javac.debug" value="on"/>
- <!-- 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}"/>
@@ -104,22 +89,8 @@
<mkdir dir="${build.conf.dir}"/>
</target>
- <!-- compile the sar source -->
- <target name="compile" depends="init, compile-both, compile-11"/>
-
-
- <!-- compile 1.1 and 1.0 classes in the sar source -->
- <target name="compile-both" if="build10">
- <compile.macro>
- <additional.classpath>
- <fileset dir="${lib.dir}" includes="*.jar"/>
- </additional.classpath>
- </compile.macro>
- </target>
-
-
<!-- compile just 1.1 classes in the sar source -->
- <target name="compile-11" if="nobuild10">
+ <target name="compile" depends="init">
<compile.macro excluded.classes="**/org/jboss/jbossts/xts/initialisation/XTS10Initialisation.java">
<additional.classpath>
<fileset dir="${lib.dir}" includes="*.jar"/>
@@ -128,25 +99,8 @@
</target>
- <!-- build the full api 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"/>
- <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}/ws-t11-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"/>
- <unjar src="${lib.dir}/wstx11-api.jar" dest="${build.dir}/tmp/api"/>
- <unjar src="${lib.dir}/bridge-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>
-
<!-- build the 1.1 api jar -->
- <target name="api11-jar" if="nobuild10">
+ <target name="api-jar" depends="compile">
<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"/>
@@ -159,21 +113,8 @@
<delete dir="${build.dir}/tmp/api"/>
</target>
- <target name="api-jar" depends="compile, api-both-jar, api11-jar"/>
-
<!-- build the config jar -->
- <target name="config-both-jar" depends="compile" 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}"/>
- <copy tofile="${build.conf.dir}/xts-properties.xml" file="${conf.dir}/xts-properties.xml"/>
- <jar jarfile="${build.dir}/config.jar">
- <fileset dir="${build.conf.dir}"/>
- </jar>
- <copy file="${build.dir}/config.jar" tofile="${lib.dir}/config.jar"/>
- </target>
-
- <target name="config11-jar" depends="compile" if="nobuild10">
+ <target name="config-jar" depends="compile">
<!-- create config jar containing conf files for 1.1 -->
<copy tofile="${build.conf.dir}/xts-properties.xml" file="${conf.dir}/xts-properties11.xml"/>
<jar jarfile="${build.dir}/config.jar">
@@ -182,8 +123,6 @@
<copy file="${build.dir}/config.jar" tofile="${lib.dir}/config.jar"/>
</target>
- <target name="config-jar" depends="compile, config-both-jar, config11-jar"/>
-
<!-- build the service jar -->
<target name="service-jar" depends="compile">
<jar jarfile="${build.dir}/service.jar">
@@ -193,32 +132,8 @@
<copy file="${build.dir}/service.jar" tofile="${lib.dir}/service.jar"/>
</target>
- <!-- build the full implementation jar -->
- <target name="impl-both-jar" if="build10">
- <mkdir dir="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/wsas.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/wscf.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/wscf10.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/wscf11.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/ws-c.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/ws-c10.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/ws-c11.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/ws-t.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/ws-t10.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/ws-t11.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/wstx.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/wstx10.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/wstx11.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/recovery.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/service.jar" dest="${build.dir}/tmp/impl"/>
- <unjar src="${lib.dir}/config.jar" dest="${build.dir}/tmp/impl"/>
- <jar file="${build.dir}/jbossxts.jar" basedir="${build.dir}/tmp/impl"/>
- <copy file="${build.dir}/jbossxts.jar" tofile="${lib.dir}/jbossxts.jar"/>
- <delete dir="${build.dir}/tmp/impl"/>
- </target>
-
<!-- build the 1.1 implementation jar -->
- <target name="impl11-jar" if="nobuild10">
+ <target name="impl-jar" depends="compile">
<mkdir dir="${build.dir}/tmp/impl"/>
<unjar src="${lib.dir}/wsas.jar" dest="${build.dir}/tmp/impl"/>
<unjar src="${lib.dir}/wscf.jar" dest="${build.dir}/tmp/impl"/>
@@ -237,125 +152,12 @@
<delete dir="${build.dir}/tmp/impl"/>
</target>
- <target name="impl-jar" depends="compile, impl-both-jar, impl11-jar"/>
-
- <!-- build XTS service archive supporting both 1.0 and 1.1 WS-C/T protocols -->
- <target name="sar-both" if="build10">
- <!-- copy 11 and 1.0 application.xml to build dir -->
- <copy toFile="${build.metainf.dir}/application.xml" file="${metainf.dir}/application.xml"/>
-
- <!-- pack everything in the service archive -->
- <jar jarfile="${build.dir}/jbossxts.sar">
- <!-- include generic 1.0 and 1.1 jars -->
- <!--
- <fileset dir="${lib.dir}" includes="*.jar"/>
--->
- <fileset dir="${lib.dir}" includes="*.jar" excludes="*-api.jar"/>
-
- <fileset dir="${build.dir}" includes="jbossxts-api.jar"/>
-
- <!-- include 1.0 and 1.1 web apps -->
- <fileset dir="${webapps.dir}" includes="*.war"/>
-
- <!-- include config jar -->
- <!-- don't need this because we configure from beans.xml
- <fileset dir="${build.dir}" includes="config.jar"/>
- -->
-
- <!-- include service def (e.g. dependencies) -->
- <fileset dir="." includes="META-INF/xts-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 service implementation jar -->
- <fileset dir="${build.dir}" includes="service.jar"/>
- </jar>
- </target>
-
<!-- build XTS service archive supporting 1.1 WS-C/T protocols -->
- <target name="sar-11" if="nobuild10">
- <!-- copy 11 application.xml to build dir -->
- <copy toFile="${build.metainf.dir}/application.xml" file="${metainf.dir}/application11.xml"/>
+ <target name="install" depends="api-jar, service-jar, config-jar, impl-jar"/>
- <!-- copy jboss-service file to build dir -->
- <copy toFile="${build.metainf.dir}/jboss-service.xml" file="${metainf.dir}/jboss-service.xml"/>
- <!-- copy modules file to lib dir -->
- <copy toFile="${lib.dir}/module.xml" file="${metainf.dir}/module.xml"/>
- <!-- pack everything in the service archive -->
- <jar jarfile="${build.dir}/jbossxts.sar" manifest="${metainf.dir}/manifest.mf">
-
- <!-- just include service def -->
- <fileset dir="${build.dir}" includes="META-INF/jboss-service.xml"/>
- </jar>
- </target>
-
- <target name="sar" depends="api-jar, service-jar, config-jar, impl-jar, sar-both, sar-11"/>
-
<target name="clean">
<delete dir="${build.dir}"/>
<delete file="${lib.dir}/jbossxts-api.jar"/>
<delete file="${lib.dir}/service.jar"/>
</target>
-
- <target name="deploy-module">
- <mkdir dir="${module.dir}/main"/>
- <copy todir="${module.dir}/main" file="${metainf.dir}/module.xml"/>
- <copy todir="${module.dir}/main">
- <fileset dir="${lib.dir}" includes="*.jar" excludes="*api.jar"/>
- <fileset dir="${lib.dir}" includes="bridge-api.jar"/>
- <fileset dir="${lib.dir}" includes="jbossxts-api.jar"/>
- <fileset dir="${build.dir}" includes="config.jar"/>
- </copy>
- </target>
-
- <target name="undeploy-module">
- <delete dir="${module.dir}"/>
- </target>
-
- <target name="deploy">
- <copy file="${build.dir}/jbossxts.sar" todir="${deploy.dir}"/>
- <!--
- -->
- <copy file="${webapps.dir}/ws-c11.war" todir="${deploy.dir}"/>
- <copy file="${webapps.dir}/ws-t11-client.war" todir="${deploy.dir}"/>
- <copy file="${webapps.dir}/ws-t11-participant.war" todir="${deploy.dir}"/>
- <copy file="${webapps.dir}/ws-t11-coordinator.war" todir="${deploy.dir}"/>
- </target>
-
- <target name="undeploy">
- <delete file="${deploy.dir}/jbossxts.sar.deployed" failonerror="false"/>
- <!--
- -->
- <delete file="${deploy.dir}/ws-c11.war.deployed" failonerror="false"/>
- <delete file="${deploy.dir}/ws-t11-client.war.deployed" failonerror="false"/>
- <delete file="${deploy.dir}/ws-t11-participant.war.deployed" failonerror="false"/>
- <delete file="${deploy.dir}/ws-t11-coordinator.war.deployed" failonerror="false"/>
- <sleep seconds="5"/>
- <delete file="${deploy.dir}/jbossxts.sar.undeployed" failonerror="false"/>
- <!--
- -->
- <delete file="${deploy.dir}/ws-c11.war.undeployed" failonerror="false"/>
- <delete file="${deploy.dir}/ws-t11-client.war.undeployed" failonerror="false"/>
- <delete file="${deploy.dir}/ws-t11-participant.war.undeployed" failonerror="false"/>
- <delete file="${deploy.dir}/ws-t11-coordinator.war.undeployed" failonerror="false"/>
- <delete file="${deploy.dir}/jbossxts.sar.failed" failonerror="false"/>
- <!--
- -->
- <delete file="${deploy.dir}/ws-c11.war.failed" failonerror="false"/>
- <delete file="${deploy.dir}/ws-t11-client.war.failed" failonerror="false"/>
- <delete file="${deploy.dir}/ws-t11-participant.war.failed" failonerror="false"/>
- <delete file="${deploy.dir}/ws-t11-coordinator.war.failed" failonerror="false"/>
- <delete file="${deploy.dir}/jbossxts.sar" failonerror="false"/>
- <!--
- -->
- <delete file="${deploy.dir}/ws-c11.war" failonerror="false"/>
- <delete file="${deploy.dir}/ws-t11-client.war" failonerror="false"/>
- <delete file="${deploy.dir}/ws-t11-participant.war" failonerror="false"/>
- <delete file="${deploy.dir}/ws-t11-coordinator.war" failonerror="false"/>
- </target>
-
</project>
Modified: labs/jbosstm/trunk/XTS/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sharedbuild.xml 2011-07-22 02:25:57 UTC (rev 37282)
+++ labs/jbosstm/trunk/XTS/sharedbuild.xml 2011-07-22 10:45:43 UTC (rev 37283)
@@ -69,21 +69,6 @@
<property name="publican" value="true"/>
<property name="publican.build.dir" value="docs/Transactions_XTS_Administration_And_Development_Guide/target/publican"/>
- <!-- 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="jbossws-api.jar jboss-logging.jar jboss-logging-generator.jar jboss-logging-processor.jar
jboss-transaction-api_1.1_spec.jar jboss-servlet-api_3.0_spec.jar dom4j.jar"/>
Modified: labs/jbosstm/trunk/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/trunk/build-release-pkgs.xml 2011-07-22 02:25:57 UTC (rev 37282)
+++ labs/jbosstm/trunk/build-release-pkgs.xml 2011-07-22 10:45:43 UTC (rev 37283)
@@ -149,9 +149,7 @@
</ant>
<ant dir="${workdir}/build/${tag}/XTS" antfile="build.xml" target="install">
- <!-- build the jbossxts.sar with 1.1 only, not 1.0 (which is unsupported) -->
- <property name="sartype" value="sar-11"/>
- <property name="testtype" value="tests-11"/>
+ <!-- build the 1.1 jbossxts jars and test apps) -->
</ant>
<ant dir="${workdir}/build/${tag}/rhq-plugin" antfile="build.xml" target="dist">
More information about the jboss-svn-commits
mailing list