[jboss-svn-commits] JBL Code SVN: r29431 - in labs/jbosstm/trunk/txbridge: demo and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: jhalliday
Date: 2009-09-22 06:21:14 -0400 (Tue, 22 Sep 2009)
New Revision: 29431

Modified:
   labs/jbosstm/trunk/txbridge/README.txt
   labs/jbosstm/trunk/txbridge/build.xml
   labs/jbosstm/trunk/txbridge/demo/build.xml
   labs/jbosstm/trunk/txbridge/docs/TransactionBridgingGuide.odt
   labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/BridgeDurableParticipant.java
Log:
Minor updates to txbridge build to reflect new environment.  JBTM-44


Modified: labs/jbosstm/trunk/txbridge/README.txt
===================================================================
--- labs/jbosstm/trunk/txbridge/README.txt	2009-09-22 10:19:36 UTC (rev 29430)
+++ labs/jbosstm/trunk/txbridge/README.txt	2009-09-22 10:21:14 UTC (rev 29431)
@@ -16,7 +16,7 @@
 A word on version compatibility:
 --------------------------------
 
-This version, like the JBossTS it is bundled with, targets JBossAS 5.1  It will not work on earlier releases.
+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

Modified: labs/jbosstm/trunk/txbridge/build.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/build.xml	2009-09-22 10:19:36 UTC (rev 29430)
+++ labs/jbosstm/trunk/txbridge/build.xml	2009-09-22 10:21:14 UTC (rev 29431)
@@ -26,7 +26,7 @@
 		JBossTS Transaction Bridge
 	</description>
 
-    <property name="jbossas.home" location="/home/jhalli/IdeaProjects/jboss/jbossas_510ga/build/output/jboss-5.1.0.GA"/>
+    <property name="jbossas.home" location="/home/jhalli/IdeaProjects/jboss/jbossas_trunk/build/output/jboss-6.0.0-SNAPSHOT"/>
     <property name="jbossas.server" value="default"/>
 
     <property name="jbossts.home" location=".."/>
@@ -38,7 +38,6 @@
         <fileset dir="${jbossts.home}/install/lib">
             <include name="jbossjta.jar"/>
             <include name="jbossjts.jar"/>
-            <include name="ext/jbossts-common.jar"/>
             <include name="ext/log4j-1.2.14.jar"/>
             <include name="ext/jta-1_1-classes.zip"/>
             <include name="ext/connector-api.jar"/>

Modified: labs/jbosstm/trunk/txbridge/demo/build.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/demo/build.xml	2009-09-22 10:19:36 UTC (rev 29430)
+++ labs/jbosstm/trunk/txbridge/demo/build.xml	2009-09-22 10:21:14 UTC (rev 29431)
@@ -26,7 +26,7 @@
 		JBossTS Transaction Bridge Demo App
 	</description>
 
-    <property name="jbossas.home" location="/home/jhalli/IdeaProjects/jboss/jbossas_510ga/build/output/jboss-5.1.0.GA"/>
+    <property name="jbossas.home" location="/home/jhalli/IdeaProjects/jboss/jbossas_trunk/build/output/jboss-6.0.0-SNAPSHOT"/>
     <property name="jbossas.server" value="default"/>
 
 	<property name="src" location="src"/>
@@ -43,8 +43,6 @@
 			<include name="log4j.jar"/>
 
             <include name="jbossjts.jar"/>
-            <include name="jbossts-common.jar"/>
-
 		</fileset>
 
         <fileset dir="${jbossas.home}/server/${jbossas.server}/deploy/jbossxts.sar">

Modified: labs/jbosstm/trunk/txbridge/docs/TransactionBridgingGuide.odt
===================================================================
(Binary files differ)

Modified: labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/BridgeDurableParticipant.java
===================================================================
--- labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/BridgeDurableParticipant.java	2009-09-22 10:19:36 UTC (rev 29430)
+++ labs/jbosstm/trunk/txbridge/src/org/jboss/jbossts/txbridge/BridgeDurableParticipant.java	2009-09-22 10:21:14 UTC (rev 29431)
@@ -53,7 +53,7 @@
      * Uniq String used to prefix ids at participant registration,
      * so that the recovery module can identify relevant instances.
      */
-    public static String TYPE_IDENTIFIER = "BridgeParticipantAT_";
+    public static String TYPE_IDENTIFIER = "BridgeDurableParticipant_";
 
 	private transient XATerminator xaTerminator;