[jboss-svn-commits] JBL Code SVN: r33951 - in labs/jbosstm/workspace/resttx: webservice and 1 other directory.

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

Author: mmusgrov
Date: 2010-07-16 11:45:21 -0400 (Fri, 16 Jul 2010)
New Revision: 33951

Modified:
   labs/jbosstm/workspace/resttx/tx/src/main/java/org/jboss/jbossts/rts/service/TMApplication.java
   labs/jbosstm/workspace/resttx/webservice/build.xml
Log:
By default don't colocate the Coordinator and Recovery Manager. By default force the Recovery Manager to use the default properties file 

Modified: labs/jbosstm/workspace/resttx/tx/src/main/java/org/jboss/jbossts/rts/service/TMApplication.java
===================================================================
--- labs/jbosstm/workspace/resttx/tx/src/main/java/org/jboss/jbossts/rts/service/TMApplication.java	2010-07-16 15:33:08 UTC (rev 33950)
+++ labs/jbosstm/workspace/resttx/tx/src/main/java/org/jboss/jbossts/rts/service/TMApplication.java	2010-07-16 15:45:21 UTC (rev 33951)
@@ -25,7 +25,8 @@
         {
             // TODO move com/arjuna/ats/jbossatx/jt[as]/TransactionManagerService.isRecoveryManagerRunning
             // to RecoveryManager and change logging
-            if ("true".equals(System.getProperty("recovery", "true")))
+            // by default do not colocate the coordinator and recovery manager
+            if ("true".equals(System.getProperty("recovery", "false")))
                 RecoveryManager.manager();
         }
         catch (Throwable e)

Modified: labs/jbosstm/workspace/resttx/webservice/build.xml
===================================================================
--- labs/jbosstm/workspace/resttx/webservice/build.xml	2010-07-16 15:33:08 UTC (rev 33950)
+++ labs/jbosstm/workspace/resttx/webservice/build.xml	2010-07-16 15:45:21 UTC (rev 33951)
@@ -35,7 +35,6 @@
     <target name="rm">
       <java classname="com.arjuna.ats.arjuna.recovery.RecoveryManager" fork="yes" dir=".">
           <classpath refid="classpath"/>
-          <sysproperty key="com.arjuna.ats.arjuna.common.propertiesFile" value="${basedir}/src/test/resources"/>
           <sysproperty key="com.arjuna.ats.arjuna.recovery.periodicRecoveryPeriod" value="30"/>
       </java>
     </target>