[jboss-svn-commits] JBL Code SVN: r37321 - in labs/jbosstm/trunk: XTS/WSCF/classes/com/arjuna/mw/wscf/model/sagas/exceptions and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 1 06:45:37 EDT 2011
Author: jhalliday
Date: 2011-08-01 06:45:36 -0400 (Mon, 01 Aug 2011)
New Revision: 37321
Removed:
labs/jbosstm/trunk/txbridge/META-INF/
Modified:
labs/jbosstm/trunk/
labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mw/wscf/model/sagas/exceptions/CancelFailedException.java
labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/basic/SubtransactionCommit.java
labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/basic/SubtransactionCommitFailInPrepare.java
labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/basic/SubtransactionCommitRollbackInPrepare.java
labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/basic/SubtransactionRollback.java
labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst11/tests/junit/basic/SubtransactionCommit.java
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/service/JaxRPCSubordinateHeaderContextProcessor.java
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/xts/nightout/services/recovery/DemoRPCBARecoveryListener.java
labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/xts/nightout/services/recovery/DemoRPCBARecoveryModule.java
labs/jbosstm/trunk/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitInteropRunner.java
labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverySubordinateATCoordinator.java
labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/SubordinateATCoordinatorRecoveryModule.java
labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoverySubordinateBACoordinator.java
labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/SubordinateBACoordinatorRecoveryModule.java
labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATCrashDuringCommit.txt
labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATCrashDuringOnePhaseCommit.txt
labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringCommit.txt
labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/BACrashDuringOnePhaseCommit.txt
labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/BASubordinateCrashDuringCommit.txt
labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/at/subordinate/MultiParticipantPrepareAndCommitTest.java
labs/jbosstm/trunk/build-release-pkgs.xml
labs/jbosstm/trunk/qa/run-tests.xml
labs/jbosstm/trunk/txbridge/build.xml
Log:
Update txbridge build for AS7 integration. JBTM-864
Property changes on: labs/jbosstm/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /labs/jbosstm/branches/JBOSSTS_4_15_0_Final:37308
Property changes on: labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mw/wscf/model/sagas/exceptions/CancelFailedException.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/basic/SubtransactionCommit.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/basic/SubtransactionCommitFailInPrepare.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/basic/SubtransactionCommitRollbackInPrepare.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/basic/SubtransactionRollback.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst11/tests/junit/basic/SubtransactionCommit.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/mw/wst/service/JaxRPCSubordinateHeaderContextProcessor.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/xts/nightout/services/recovery/DemoRPCBARecoveryListener.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/demo/srcrpc/com/arjuna/xts/nightout/services/recovery/DemoRPCBARecoveryModule.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitInteropRunner.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverySubordinateATCoordinator.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/SubordinateATCoordinatorRecoveryModule.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoverySubordinateBACoordinator.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/SubordinateBACoordinatorRecoveryModule.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATCrashDuringCommit.txt
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATCrashDuringOnePhaseCommit.txt
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringCommit.txt
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/BACrashDuringOnePhaseCommit.txt
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/BASubordinateCrashDuringCommit.txt
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/test/at/subordinate/MultiParticipantPrepareAndCommitTest.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: labs/jbosstm/trunk/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/trunk/build-release-pkgs.xml 2011-07-29 19:59:34 UTC (rev 37320)
+++ labs/jbosstm/trunk/build-release-pkgs.xml 2011-08-01 10:45:36 UTC (rev 37321)
@@ -107,7 +107,7 @@
<target name="dist" depends="init" description="build the end-user release bundles (src and binary)">
- <!-- pull the source code from svn -->
+ <!-- pull the source code from svn -->
<exec executable="svn" dir="${workdir}">
<arg value="export"/>
<arg value="${svnbase}/${tag}"/>
@@ -139,7 +139,7 @@
<delete file="${workdir}/jbossts-jta-${filename}.zip"/>
<zip basedir="${workdir}/build/${tag}" destfile="${workdir}/jbossts-jta-${filename}.zip"
includes="${tag}/**"/>
-
+
<!-- build the full release (assumes XTS builds against JTS) -->
<delete dir="${workdir}/build"/>
<mkdir dir="${workdir}/build"/>
@@ -152,6 +152,8 @@
<!-- build the 1.1 jbossxts jars and test apps) -->
</ant>
+ <ant dir="${workdir}/build/${tag}/txbridge" antfile="build.xml" target="dist"/>
+
<ant dir="${workdir}/build/${tag}/rhq-plugin" antfile="build.xml" target="dist">
<property name="version" value="${filename}"/>
</ant>
@@ -235,10 +237,13 @@
dir="${workdir}/build/${tag}/xts/interop-tests"/>
+ <!-- txbridge -->
+ <mvn-artifact.macro artifact="jbosstxbridge" packaging="jar"
+ dir="${workdir}/build/${tag}/txbridge"/>
-
+
</target>
<!-- macro to process a pom template into an actual pom and use it with mvn deploy-file to upload to the repo -->
@@ -254,6 +259,18 @@
<property name="groupid" value="org.jboss.jbossts"/>
+ <if>
+ <not>
+ <available file="@{dir}/@{artifact}-sources.jar"/>
+ </not>
+ <then>
+ <touch file="@{dir}/@{artifact}-sources.txt"/>
+ <jar destfile="@{dir}/@{artifact}-sources.jar">
+ <include name="@{dir}/@{artifact}-sources.txt"/>
+ </jar>
+ </then>
+ </if>
+
<!-- where a -sources.jar exists, upload it first as we need the latter binary .jar to overwrite the
generated pom due to the requirement for working around http://jira.codehaus.org/browse/MDEPLOY-48
which is also the same reason we need to mess around with uniqueVersion=false /sigh. -->
@@ -298,7 +315,7 @@
</exec>
</sequential>
-
+
</macrodef>
<!-- magnolia (the cms that sits behind jboss.org/jbosstm pages) is a pain. This target generates
Property changes on: labs/jbosstm/trunk/qa/run-tests.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: labs/jbosstm/trunk/txbridge/build.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/build.xml 2011-07-29 19:59:34 UTC (rev 37320)
+++ labs/jbosstm/trunk/txbridge/build.xml 2011-08-01 10:45:36 UTC (rev 37321)
@@ -102,11 +102,18 @@
<fileset dir="${build}/classes">
<include name="org/jboss/**"/>
</fileset>
- <fileset dir=".">
- <include name="META-INF/*"/>
- </fileset>
</jar>
+ <jar jarfile="${build}/txbridge-src.jar">
+ <fileset dir="${src}">
+ <include name="org/jboss/**/*.java"/>
+ </fileset>
+ </jar>
+
+ <mkdir dir="${jbossts.home}/install/txbridge"/>
+ <copy file="${build}/txbridge.jar" tofile="${jbossts.home}/install/txbridge/jbosstxbridge.jar"/>
+ <copy file="${build}/txbridge-src.jar" tofile="${jbossts.home}/install/txbridge/jbosstxbridge-sources.jar"/>
+
<ant dir="demo" target="dist" inheritall="false" inheritrefs="false"/>
<ant dir="tests" target="dist" inheritall="false" inheritrefs="false"/>
More information about the jboss-svn-commits
mailing list