[jboss-svn-commits] JBL Code SVN: r25690 - in labs/jbosstm/trunk: atsintegration/classes/com/arjuna/ats/jbossatx/jta and 1 other directories.

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

Author: jhalliday
Date: 2009-03-17 10:19:28 -0400 (Tue, 17 Mar 2009)
New Revision: 25690

Modified:
   labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java
   labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java
   labs/jbosstm/trunk/build-release-pkgs.xml
Log:
Added release tag info handling. JBTM-515


Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java	2009-03-17 12:50:16 UTC (rev 25689)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java	2009-03-17 14:19:28 UTC (rev 25690)
@@ -51,6 +51,7 @@
 import com.arjuna.ats.arjuna.recovery.RecoveryModule;
 import com.arjuna.ats.arjuna.utils.Utility;
 import com.arjuna.ats.arjuna.common.arjPropertyManager;
+import com.arjuna.ats.arjuna.common.Configuration;
 
 import com.arjuna.ats.internal.tsmx.mbeans.PropertyServiceJMXPlugin;
 import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
@@ -164,8 +165,12 @@
 
             configured = true ;
         }
+        
+        // Note that we use the arjunacore version of Configuration, as the jta one does not have
+        // build properties set when we are running from the jts version of the build.
+        String tag = Configuration.getBuildTimeProperty("SOURCEID");
 
-        log.info("JBossTS Transaction Service (JTA version) - JBoss Inc.");
+        log.info("JBossTS Transaction Service (JTA version - tag:"+tag+") - JBoss Inc.");
 
         log.info("Setting up property manager MBean and JMX layer");
 

Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java	2009-03-17 12:50:16 UTC (rev 25689)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java	2009-03-17 14:19:28 UTC (rev 25690)
@@ -50,6 +50,7 @@
 import com.arjuna.ats.jta.common.Environment;
 import com.arjuna.ats.jta.common.jtaPropertyManager;
 import com.arjuna.ats.jts.common.jtsPropertyManager;
+import com.arjuna.ats.jts.common.Configuration;
 import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
 import com.arjuna.ats.arjuna.coordinator.TxStats;
 import com.arjuna.ats.arjuna.recovery.RecoveryManager;
@@ -176,10 +177,10 @@
             configured = true ;
         }
 
+        String tag = Configuration.getBuildTimeProperty("SOURCEID");
 
+        log.info("JBossTS Transaction Service (JTS version - tag:"+tag+") - JBoss Inc.");
 
-        log.info("JBossTS Transaction Service (JTS version) - JBoss Inc.");
-
         log.info("Setting up property manager MBean and JMX layer");
 
         /** Set the tsmx agent implementation to the local JBOSS agent impl **/

Modified: labs/jbosstm/trunk/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/trunk/build-release-pkgs.xml	2009-03-17 12:50:16 UTC (rev 25689)
+++ labs/jbosstm/trunk/build-release-pkgs.xml	2009-03-17 14:19:28 UTC (rev 25690)
@@ -114,7 +114,7 @@
         <mkdir dir="${workdir}/build"/>
         <unzip src="${workdir}/jbossts-jta-${filename}-src.zip" dest="${workdir}/build"/>
         <ant dir="${workdir}/build/${tag}" antfile="build.xml" target="jbossjta">
-            <property name="com.hp.mw.source" value="${tag}"/>
+            <property name="com.hp.mw.sourceid" value="${tag}"/>
         </ant>
 
         <!-- package the JTA only binary release -->
@@ -130,7 +130,7 @@
         <mkdir dir="${workdir}/build"/>
         <unzip src="${workdir}/jbossts-full-${filename}-src.zip" dest="${workdir}/build"/>
         <ant dir="${workdir}/build/${tag}" antfile="build.xml" target="jbossjts">
-            <property name="com.hp.mw.source" value="${tag}"/>
+            <property name="com.hp.mw.sourceid" value="${tag}"/>
         </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) -->