[jboss-cvs] JBossAS SVN: r107523 - branches/JBPAPP_5_1/testsuite/imports/config.

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

Author: istudens at redhat.com
Date: 2010-08-10 10:42:32 -0400 (Tue, 10 Aug 2010)
New Revision: 107523

Modified:
   branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml
Log:
added a new param '-Djbossts.jtaonly' to the JBossTS crash recovery tests for EWP testing, JBPAPP-4862

Modified: branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml	2010-08-10 14:22:25 UTC (rev 107522)
+++ branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml	2010-08-10 14:42:32 UTC (rev 107523)
@@ -49,7 +49,8 @@
     |         <recover-security-domain>CrashRecoveryDomain</recover-security-domain>
     |
     | Note 1: The 'jbossts.credentials' prop is useless in connection with -Djbossts.db=[oracle_rac|oracle_rac_r2].
-    | Note 2: If you want to force the wiping out any txs in doubt from DB before the test you can use the property -DwipeOutTxsInDoubtBeforeTest=true. 
+    | Note 2: If you want to force the wiping out any txs in doubt from DB before the test you can use the property -DwipeOutTxsInDoubtBeforeTest=true.
+    | Note 3: For EWP use '-Djbossts.jtaonly=true' to prepare only jta profile in the AS server. Otherwise both JTA/JTS profiles are always created/checked. 
     -->
    <target name="tests-ts-crash-recovery" depends="tests-ts-crash-recovery-jpa"
    	     description="Runs JBossTS crash recovery tests" />
@@ -91,17 +92,20 @@
    
    <target name="tests-ts-crash-recovery-common">
 
+      <!--  prepare jta profile  -->
       <available file="${jboss.dist}/server/crashrecovery-jta" property="have.crashrecovery.jta.profile" value="true"/>
-      <available file="${jboss.dist}/server/crashrecovery-jts" property="have.crashrecovery.jts.profile" value="true"/>
-      <condition property="have.crash.recovery.profiles">
-        <and>
-          <istrue value="${have.crashrecovery.jta.profile}"/>
-          <istrue value="${have.crashrecovery.jts.profile}"/>
-        </and>
+      <antcall target="prepare-crashrec-profile-jta" />
+
+      <!--  prepare jts profile  -->
+      <condition property="have.crash.recovery.jts.profile">
+         <or>
+            <available file="${jboss.dist}/server/crashrecovery-jts"/>
+            <isset property="jbossts.jtaonly"/>
+         </or>
       </condition>
-      
-      <antcall target="prepare-crashrec-profiles" />
+      <antcall target="prepare-crashrec-profile-jts" />
    	
+   	  <!--  run the tests  -->
       <property name="jbossts.max.time" value="420000" />
       <run-as-test target="${jbossts.target}" />
 
@@ -163,7 +167,7 @@
    </macrodef>
    
    
-   <target name="prepare-crashrec-profiles" unless="have.crash.recovery.profiles">
+   <target name="prepare-crashrec-profile-jta" unless="have.crash.recovery.jta.profile">
       <delete dir="${jboss.dist}/server/crashrecovery-jta" />
       <create-config baseconf="default" newconf="crashrecovery-jta">
          <patternset>
@@ -174,6 +178,10 @@
          </patternset>
       </create-config>
 
+      <antcall target="setup-recovery"><param name="conf" value="crashrecovery-jta"/></antcall>
+   </target>
+   
+   <target name="prepare-crashrec-profile-jts" unless="have.crash.recovery.jts.profile">
       <delete dir="${jboss.dist}/server/crashrecovery-jts" />
       <create-config baseconf="all" newconf="crashrecovery-jts">
          <patternset>
@@ -189,11 +197,9 @@
          <property name="target.server.dir" location="${jboss.dist}/server/crashrecovery-jts"/>
       </ant>
 
-      <antcall target="setup-recovery"><param name="conf" value="crashrecovery-jta"/></antcall>
       <antcall target="setup-recovery"><param name="conf" value="crashrecovery-jts"/></antcall>       
    </target>
    
-   
    <target name="setup-recovery" depends="setup-recovery-jpa, setup-recovery-jms" />
 
    <target name="setup-recovery-jpa" if="want.jpa">