[jboss-svn-commits] JBL Code SVN: r35923 - in labs/jbosstm/trunk: txbridge and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 9 07:12:49 EST 2010
Author: jhalliday
Date: 2010-11-09 07:12:49 -0500 (Tue, 09 Nov 2010)
New Revision: 35923
Modified:
labs/jbosstm/trunk/build.xml
labs/jbosstm/trunk/txbridge/README.txt
labs/jbosstm/trunk/txbridge/build.xml
labs/jbosstm/trunk/txbridge/tests/build.xml
Log:
Change txbridge build system to also build demo+tests by default and hook into top level default build. JBTM-44
Modified: labs/jbosstm/trunk/build.xml
===================================================================
--- labs/jbosstm/trunk/build.xml 2010-11-09 10:58:28 UTC (rev 35922)
+++ labs/jbosstm/trunk/build.xml 2010-11-09 12:12:49 UTC (rev 35923)
@@ -93,6 +93,8 @@
<ant dir="XTS" target="clean"/>
<ant dir="XTS" target="install"/>
<ant dir="rhq-plugin" target="dist"/>
+ <ant dir="txbridge" target="clean"/>
+ <ant dir="txbridge" target="dist"/>
</target>
<target name="antbuildsystem" depends="clean">
@@ -128,6 +130,13 @@
</then>
</if>
+ <if>
+ <available file="txbridge"/>
+ <then>
+ <ant dir="txbridge" target="clean"/>
+ </then>
+ </if>
+
<ant dir="atsintegration" target="clean"/>
<delete dir="build"/>
Modified: labs/jbosstm/trunk/txbridge/README.txt
===================================================================
--- labs/jbosstm/trunk/txbridge/README.txt 2010-11-09 10:58:28 UTC (rev 35922)
+++ labs/jbosstm/trunk/txbridge/README.txt 2010-11-09 12:12:49 UTC (rev 35923)
@@ -1,33 +1,24 @@
-This is the prototype transaction bridge module.
+This is the WS-AT to JTA (XA) transaction bridge module.
Usage:
------
see docs/TransactionBridgingGuide
-A word on quality:
-------------------
-
-It's still a work in progress and should be regarded as beta code at best,
-regardless of the designation of the JBossTS release in whose scope it is released.
-API stability between releases is not guaranteed. Don't use it in production.
-
A word on version compatibility:
--------------------------------
This version, like the JBossTS it is bundled with, targets JBossAS 6 It probably will not work on earlier releases.
Ideally the txbridge should be used in conjunction with the JBossTS release it is included in, although it may
-work with JBossTS 4.6.1 or later. This version won't work on any earlier release of JBossTS. Try the original
-prototype from http://anonsvn.jboss.org/repos/labs/labs/jbosstm/workspace/jhalliday/ if you need it to work
-on earlier versions.
+work with JBossTS 4.13.1 or later. This version won't work on any earlier release of JBossTS.
Building:
---------
-set jbossas.home and jbossas.server in build.xml
+ant
ensure XTS is deployed into the chosen server (see JBossAS docs/examples/transactions)
-ant dist
+set jbossas.home and jbossas.server in build.xml
ant deploy
for the demo app, assuming the above steps are complete first:
Modified: labs/jbosstm/trunk/txbridge/build.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/build.xml 2010-11-09 10:58:28 UTC (rev 35922)
+++ labs/jbosstm/trunk/txbridge/build.xml 2010-11-09 12:12:49 UTC (rev 35923)
@@ -42,8 +42,8 @@
</path>
<taskdef resource="emma_ant.properties" classpathref="emma.lib" />
- <property name="src.dir" location="src"/>
- <property name="build.dir" location="build"/>
+ <property name="src" location="src"/>
+ <property name="build" location="build"/>
<path id="build-prereqs">
<fileset dir="${jbossts.home}/install/lib">
@@ -63,29 +63,31 @@
</path>
<target name="clean" description="clean up">
- <delete dir="${build.dir}"/>
+ <delete dir="${build}"/>
+ <ant dir="demo" target="clean" inheritall="false" inheritrefs="false"/>
+ <ant dir="tests" target="clean" inheritall="false" inheritrefs="false"/>
</target>
<target name="init">
<tstamp/>
- <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build}"/>
</target>
<target name="compile" depends="init"
description="compile the source ">
- <mkdir dir="${build.dir}/classes"/>
- <javac srcdir="${src.dir}" destdir="${build.dir}/classes" debug="true" includeantruntime="false">
+ <mkdir dir="${build}/classes"/>
+ <javac srcdir="${src}" destdir="${build}/classes" debug="true" includeantruntime="false">
<classpath refid="build-prereqs"/>
</javac>
<emma enabled="${emma.enabled}">
<instr mode="overwrite"
- metadatafile="${build.dir}/metadata.emma"
+ metadatafile="${build}/metadata.emma"
merge="true"
filter="">
<instrpath>
- <pathelement location="${build.dir}/classes"/>
+ <pathelement location="${build}/classes"/>
</instrpath>
</instr>
</emma>
@@ -94,29 +96,32 @@
<target name="dist" depends="compile"
description="generate the distribution">
- <jar jarfile="${build.dir}/txbridge.jar">
- <fileset dir="${build.dir}/classes">
+ <jar jarfile="${build}/txbridge.jar">
+ <fileset dir="${build}/classes">
<include name="org/jboss/**"/>
</fileset>
<fileset dir=".">
<include name="META-INF/*"/>
</fileset>
</jar>
+
+ <ant dir="demo" target="dist" inheritall="false" inheritrefs="false"/>
+ <ant dir="tests" target="dist" inheritall="false" inheritrefs="false"/>
+
</target>
<!-- ##################################################################################### -->
- <!-- the following targets are utility functions for the JBossTS dev team.
- You probably don't need to worry about them. -->
-
-
<property name="jbossas.home" location="/home/jhalli/IdeaProjects/jboss/jbossas_trunk/build/target/jboss-6.0.0-SNAPSHOT"/>
<property name="jbossas.server" value="default"/>
<target name="deploy" depends="dist" description="deploy to JBossAS">
- <copy file="${build.dir}/txbridge.jar" todir="${jbossas.home}/server/${jbossas.server}/deploy/"/>
+ <copy file="${build}/txbridge.jar" todir="${jbossas.home}/server/${jbossas.server}/deploy/"/>
</target>
+ <!-- the following targets are utility functions for the JBossTS dev team.
+ You probably don't need to worry about them. -->
+
<target name="install-jts">
<copy todir="${jbossas.home}/common/lib">
<fileset dir="${jbossts.home}/install/lib" includes="*.jar"/>
@@ -144,16 +149,16 @@
<target name="emma-report">
<emma enabled="true">
<report>
- <fileset dir="${build.dir}" includes="metadata.emma"/>
+ <fileset dir="${build}" includes="metadata.emma"/>
<fileset dir="${jbossas.home}" includes="coverage.ec"/>
<fileset dir="${jbossas.home}/bin" includes="coverage.ec"/>
<sourcepath>
- <dirset dir="${src.dir}"/>
+ <dirset dir="${src}"/>
</sourcepath>
- <txt outfile="${build.dir}/emma/coverage.txt" />
- <html outfile="${build.dir}/emma/coverage.html" />
+ <txt outfile="${build}/emma/coverage.txt" />
+ <html outfile="${build}/emma/coverage.html" />
<sourcepath>
- <dirset dir="${src.dir}"/>
+ <dirset dir="${src}"/>
</sourcepath>
</report>
</emma>
Modified: labs/jbosstm/trunk/txbridge/tests/build.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/tests/build.xml 2010-11-09 10:58:28 UTC (rev 35922)
+++ labs/jbosstm/trunk/txbridge/tests/build.xml 2010-11-09 12:12:49 UTC (rev 35923)
@@ -44,7 +44,8 @@
<include name="jboss-server-manager.jar"/>
<include name="jboss-logging.jar"/>
<include name="jnp-client.jar"/>
- <!--<include name="byteman.jar"/>-->
+ <include name="byteman.jar"/>
+ <include name="byteman-dtest.jar"/>
</fileset>
<fileset dir="${jbossts.home}/install/lib">
@@ -59,9 +60,7 @@
<pathelement location="../build/txbridge.jar"/>
- <pathelement location="/home/jhalli/IdeaProjects/jboss/byteman_trunk/install/lib/byteman.jar"/>
- <pathelement location="/home/jhalli/IdeaProjects/jboss/byteman_trunk/contrib/dtest/build/lib/byteman-dtest.jar"/>
- <pathelement location="/home/jhalli/IdeaProjects/jboss/jbossas_trunk/build/target/jboss-6.0.0-SNAPSHOT/client/jboss-system-client.jar"/>
+ <!--<pathelement location="/home/jhalli/IdeaProjects/jboss/jbossas_trunk/build/target/jboss-6.0.0-SNAPSHOT/client/jboss-system-client.jar"/>-->
</path>
@@ -126,7 +125,6 @@
<include name="org/jboss/jbossts/txbridge/tests/inbound/junit/*.class"/>
</fileset>
</jar>
-
</target>
<!-- Note: running tests requires JBossAS to be started and the relevant artifacts
More information about the jboss-svn-commits
mailing list