[jboss-cvs] JBossAS SVN: r105478 - in branches/JBPAPP_5_1/testsuite: src/main/org/jboss/test/jbossts/jms and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 1 09:38:42 EDT 2010
Author: istudens at redhat.com
Date: 2010-06-01 09:38:41 -0400 (Tue, 01 Jun 2010)
New Revision: 105478
Modified:
branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/TestASRecoveryWithJMS.java
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml
Log:
added option for netty connector in crash recovery tests with hornetq, JBQA-3370
Modified: branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml 2010-06-01 13:37:18 UTC (rev 105477)
+++ branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml 2010-06-01 13:38:41 UTC (rev 105478)
@@ -65,6 +65,10 @@
| ./build.sh tests-ts-crash-recovery-jms -Djbossts.tstype=jts -Djbossts.tsdemarc=cmt -Djbossts.testcase=commit_halt.rev -Djbossts.target=crash-tests-jms-single
|
| Use '-Djbossts.hornetq=true" to test the HornetQ.
+ |
+ | The default JBossTS recovery configuration for HornetQ takes an InVMConnectorFactory.
+ | The InVMConnectorFactory is recommended for XA Recovery by HornetQ documentation.
+ | Use '-Djbossts.hornetq.netty=true' to change it to an optional NettyConnectorFactory.
|
| Note: If you want to force the wiping out any txs in doubt from DB before the test you can use the property -DwipeOutTxsInDoubtBeforeTest=true.
-->
@@ -102,6 +106,10 @@
</target>
+ <target name="tests-ts-sweep-crashrec-profiles">
+ <delete dir="${jboss.dist}/server/crashrecovery-jta" />
+ <delete dir="${jboss.dist}/server/crashrecovery-jts" />
+ </target>
<!--
| Macros and others
@@ -140,6 +148,8 @@
<sysproperty key="jbossts.tsdemarc" value="${jbossts.tsdemarc}" />
<sysproperty key="jbossts.testcase" value="${jbossts.testcase}" />
<sysproperty key="jbossts.credentials" value="${jbossts.credentials}" />
+ <sysproperty key="jbossts.hornetq" value="${jbossts.hornetq}" />
+ <sysproperty key="jbossts.hornetq.netty" value="${jbossts.hornetq.netty}" />
<sysproperty key="testTime" value="${jbossts.max.time}" />
<env key="JBOSS_HOME" value="${jbosstest.dist}" />
<arg value="-f"/>
@@ -295,22 +305,40 @@
</replace>
<echo message="Setting up HornetQ recovery for profile ${conf}.."/>
- <!-- enable crash recovery -->
+
+ <antcall target="setup-jbossts-hornetq-invm" />
+ <antcall target="setup-jbossts-hornetq-netty" />
+
+ <!-- more verbose logging -->
<replace file="${jboss.dist}/server/${conf}/conf/jbossts-properties.xml">
+ <replacetoken><![CDATA[type="System" value="0x00000000"]]></replacetoken>
+ <replacevalue><![CDATA[type="System" value="0xffffffff"]]></replacevalue>
+ </replace>
+ </target>
+
+ <target name="setup-jbossts-hornetq-netty" if="jbossts.hornetq.netty">
+ <!-- enable recovery with NettyConnectorFactory -->
+ <replace file="${jboss.dist}/server/${conf}/conf/jbossts-properties.xml">
<replacetoken><![CDATA[</transaction-service>]]></replacetoken>
<replacevalue><![CDATA[
<properties depends="arjuna" name="jta">
<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
- value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/>
- <!-- xaRecoveryNode should match value in nodeIdentifier or be * -->
- <property name="com.arjuna.ats.jta.xaRecoveryNode" value="1"/>
+ value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"/>
</properties>
</transaction-service>]]></replacevalue>
</replace>
- <!-- more verbose logging -->
+ </target>
+
+ <target name="setup-jbossts-hornetq-invm" unless="jbossts.hornetq.netty">
+ <!-- enable recovery with InVMConnectorFactory -->
<replace file="${jboss.dist}/server/${conf}/conf/jbossts-properties.xml">
- <replacetoken><![CDATA[type="System" value="0x00000000"]]></replacetoken>
- <replacevalue><![CDATA[type="System" value="0xffffffff"]]></replacevalue>
+ <replacetoken><![CDATA[</transaction-service>]]></replacetoken>
+ <replacevalue><![CDATA[
+ <properties depends="arjuna" name="jta">
+ <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
+ value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/>
+ </properties>
+</transaction-service>]]></replacevalue>
</replace>
</target>
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/TestASRecoveryWithJMS.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/TestASRecoveryWithJMS.java 2010-06-01 13:37:18 UTC (rev 105477)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/TestASRecoveryWithJMS.java 2010-06-01 13:38:41 UTC (rev 105478)
@@ -23,7 +23,6 @@
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
import javax.jms.JMSException;
import javax.jms.MessageProducer;
import javax.jms.Queue;
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml 2010-06-01 13:37:18 UTC (rev 105477)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml 2010-06-01 13:38:41 UTC (rev 105478)
@@ -497,13 +497,24 @@
</target>
<target name="crash-recovery-test-jms" if="want.jms">
+ <condition property="test.name.prefix" value="hornetq-netty">
+ <and>
+ <istrue value="${jbossts.hornetq}"/>
+ <istrue value="${jbossts.hornetq.netty}"/>
+ </and>
+ </condition>
+ <condition property="test.name.prefix" value="hornetq-invm">
+ <istrue value="${jbossts.hornetq}"/>
+ </condition>
+ <property name="test.name.prefix" value="messaging"/>
+
<condition property="test.name.cmt" value="cmt" else="bmt">
- <istrue value="${cmt}"/>
+ <istrue value="${cmt}"/>
</condition>
<condition property="test.name.reverseOrder" value="-reverse" else="">
<istrue value="${reverseOrder}"/>
</condition>
- <property name="testname" value="${tstype}-${specs}-${test.name.cmt}${test.name.reverseOrder}"/>
+ <property name="testname" value="${test.name.prefix}-${tstype}-${specs}-${test.name.cmt}${test.name.reverseOrder}"/>
<condition property="astest.app.jar.name" value="${astest.alternative.jar.name}">
<isset property="astest.alternative.jar.name"/>
More information about the jboss-cvs-commits
mailing list