[jboss-svn-commits] JBL Code SVN: r22850 - in labs/jbosstm/trunk/ArjunaJTS/jts: classes/com/arjuna/ats/jts/common and 1 other directories.

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

Author: jhalliday
Date: 2008-09-17 11:12:08 -0400 (Wed, 17 Sep 2008)
New Revision: 22850

Modified:
   labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java
   labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Environment.java
   labs/jbosstm/trunk/ArjunaJTS/jts/etc/default-jts-properties.xml
Log:
Changed internal property handling for recovery orb port to more clearly differentiate it from the recovery port. JBTM-394


Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java	2008-09-17 15:07:40 UTC (rev 22849)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java	2008-09-17 15:12:08 UTC (rev 22850)
@@ -117,7 +117,7 @@
 	    {
 		_orb = com.arjuna.orbportability.internal.InternalORB.getInstance("RecoveryServer");
 		String[] params = null;
-		String recoveryManagerPort = jtsPropertyManager.propertyManager.getProperty(com.arjuna.ats.jts.common.Environment.RECOVERY_MANAGER_PORT, "4712");
+		String recoveryManagerPort = jtsPropertyManager.propertyManager.getProperty(com.arjuna.ats.jts.common.Environment.RECOVERY_MANAGER_ORB_PORT, "4711");
         String recoveryManagerAddr = jtsPropertyManager.propertyManager.getProperty(com.arjuna.ats.jts.common.Environment.RECOVERY_MANAGER_ADDRESS);
 
         if (recoveryManagerAddr == null)

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Environment.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Environment.java	2008-09-17 15:07:40 UTC (rev 22849)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Environment.java	2008-09-17 15:12:08 UTC (rev 22850)
@@ -55,7 +55,7 @@
     public static final String DEFAULT_TIMEOUT = "com.arjuna.ats.jts.defaultTimeout";
     public static final String PROPAGATE_TERMINATOR = "com.arjuna.ats.jts.propagateTerminator";
     public static final String CONTEXT_PROP_MODE = "com.arjuna.ats.jts.contextPropMode";
-    public static final String RECOVERY_MANAGER_PORT = "com.arjuna.ats.jts.recoveryManagerPort";
+    public static final String RECOVERY_MANAGER_ORB_PORT = "com.arjuna.ats.jts.recoveryManagerPort";
     public static final String RECOVERY_MANAGER_ADDRESS = "com.arjuna.ats.jts.recoveryManagerAddress";
     public static final String OTS_1_0_TIMEOUT_PROPAGATION = "com.arjuna.ats.jts.ots_1_0.timeoutPropagation";
 }

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/etc/default-jts-properties.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/etc/default-jts-properties.xml	2008-09-17 15:07:40 UTC (rev 22849)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/etc/default-jts-properties.xml	2008-09-17 15:12:08 UTC (rev 22850)
@@ -137,7 +137,7 @@
 	-->
                 <property
                   name="com.arjuna.ats.jts.recoveryManagerPort"
-                  value="4712"/>
+                  value="4711"/>
 
 	<!--
 	  This property controls the address on which the Recovery ORB binds - defaults to the loopback connection