[jboss-svn-commits] JBL Code SVN: r28748 - in labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx: jts and 1 other directory.

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

Author: jhalliday
Date: 2009-08-03 06:44:01 -0400 (Mon, 03 Aug 2009)
New Revision: 28748

Modified:
   labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java
   labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java
Log:
Explicitly install recovery manager properties early in the service lifecycle. JBTM-598


Modified: labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java	2009-08-03 10:35:49 UTC (rev 28747)
+++ labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jta/TransactionManagerService.java	2009-08-03 10:44:01 UTC (rev 28748)
@@ -48,6 +48,8 @@
 import com.arjuna.ats.arjuna.coordinator.TxControl;
 import com.arjuna.ats.arjuna.coordinator.TxStats;
 import com.arjuna.ats.arjuna.recovery.RecoveryManager;
+import com.arjuna.ats.arjuna.common.arjPropertyManager;
+import com.arjuna.ats.arjuna.utils.Utility;
 
 import com.arjuna.ats.internal.tsmx.mbeans.PropertyServiceJMXPlugin;
 import com.arjuna.common.util.propertyservice.PropertyManagerFactory;
@@ -128,6 +130,10 @@
 
         this.getLog().info("Setting up property manager MBean and JMX layer");
 
+        // recovery manager properties must be installed before the tx system is initialized. JBTM-598
+        arjPropertyManager.propertyManager = PropertyManagerFactory.getPropertyManager("com.arjuna.ats.propertymanager", "recoverymanager");
+        Utility.getpid(); // socketProcessId needs to own the port, not the tsm. yuck.
+
         /** Set the tsmx agent implementation to the local JBOSS agent impl **/
         LocalJBossAgentImpl.setLocalAgent(this.getServer());
         System.setProperty(com.arjuna.ats.tsmx.TransactionServiceMX.AGENT_IMPLEMENTATION_PROPERTY,

Modified: labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java	2009-08-03 10:35:49 UTC (rev 28747)
+++ labs/jbosstm/branches/JBOSSTS_4_2_3_GA_CP/atsintegration/classes/com/arjuna/ats/jbossatx/jts/TransactionManagerService.java	2009-08-03 10:44:01 UTC (rev 28748)
@@ -48,6 +48,8 @@
 import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
 import com.arjuna.ats.arjuna.coordinator.TxStats;
 import com.arjuna.ats.arjuna.recovery.RecoveryManager;
+import com.arjuna.ats.arjuna.common.arjPropertyManager;
+import com.arjuna.ats.arjuna.utils.Utility;
 import com.arjuna.orbportability.ORB;
 import com.arjuna.orbportability.OA;
 
@@ -130,6 +132,10 @@
 
         this.getLog().info("Setting up property manager MBean and JMX layer");
 
+        // recovery manager properties must be installed before the tx system is initialized. JBTM-598
+        arjPropertyManager.propertyManager = PropertyManagerFactory.getPropertyManager("com.arjuna.ats.propertymanager", "recoverymanager");
+        Utility.getpid(); // socketProcessId needs to own the port, not the tsm. yuck.
+        
         /** Set the tsmx agent implementation to the local JBOSS agent impl **/
         LocalJBossAgentImpl.setLocalAgent(this.getServer());
         System.setProperty(com.arjuna.ats.tsmx.TransactionServiceMX.AGENT_IMPLEMENTATION_PROPERTY,