[jboss-cvs] JBossAS SVN: r112574 - in branches/JBPAPP_5_1/testsuite: src/main/org/jboss/test/jbossts/ASCrashRecovery02 and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 13 08:35:49 EST 2012
Author: istudens at redhat.com
Date: 2012-01-13 08:35:49 -0500 (Fri, 13 Jan 2012)
New Revision: 112574
Added:
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashHelperRem.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/MessageCheckerBean.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/MessageCheckerRem.java
Modified:
branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/ASCrashRecovery02/TestWithJMS.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashBMTBean.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashCMTBean.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashHelper.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashRem.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/TestASRecoveryWithJMS.java
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/db2_97-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql50-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-lb-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-r2-lb-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-r2-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle10-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle11-r2-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle11-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres82-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres83-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres84-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres90-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15.5-xa-ds.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml
Log:
adding support for MRG and cleaning/updating datasources in crash rec tests, JBQA-5809, JBQA-2176
Modified: branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -74,16 +74,30 @@
| ./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.
+ | Use '-Djbossts.mrg=true" to test the MRG RA.
|
| 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.
|
+ | Instructions for MRG testing:
+ | The tests expect the MRG to be already installed in EAP, i.e. to copy the 3 qpid files into the all and default server profiles:
+ | qpid-ra.rar, qpid-xarecovery-jboss.jar, qpid-jca-ds.xml
+ |
| 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.
-->
- <target name="tests-ts-crash-recovery-jms" depends="tests-ts-init-jms, tests-ts-crash-recovery-common" />
+ <target name="tests-ts-crash-recovery-jms" depends="select-jms-impl, tests-ts-init-jms, tests-ts-crash-recovery-common" />
-
+ <target name="tests-ts-sweep-crashrec-profiles">
+ <delete dir="${jboss.dist}/server/crashrecovery-jta" />
+ <delete dir="${jboss.dist}/server/crashrecovery-jts" />
+ </target>
+
+
+ <!--
+ | Internal targets
+ -->
+
<target name="tests-ts-init-jpa">
<property name="jbossts.target" value="crash-tests" />
<property name="jbossts.credentials" value="cr1" />
@@ -93,10 +107,27 @@
<target name="tests-ts-init-jms">
<property name="jbossts.target" value="crash-tests-jms" />
- <property name="astest.jar.name" value="crashrecovery-jms-astest.jar" />
<property name="want.jms" value="true" />
+ <property name="astest.jar.name" value="crashrecovery-jms-astest.jar"/>
</target>
+ <target name="select-jms-impl">
+ <condition property="want.hornetq" value="true">
+ <isset property="${jbossts.hornetq}"/>
+ </condition>
+ <condition property="want.mrg" value="true">
+ <isset property="${jbossts.mrg}"/>
+ </condition>
+ <condition property="want.messaging" value="true">
+ <not>
+ <or>
+ <istrue value="${want.hornetq}"/>
+ <istrue value="${want.mrg}"/>
+ </or>
+ </not>
+ </condition>
+ </target>
+
<target name="tests-ts-crash-recovery-common">
<!-- prepare jta profile -->
@@ -118,11 +149,6 @@
</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
-->
@@ -162,6 +188,7 @@
<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="jbossts.mrg" value="${jbossts.mrg}" />
<sysproperty key="testTime" value="${jbossts.max.time}" />
<sysproperty key="jboss.test.sign.keystore" value="${basedir}/src/resources/test-configs/cc/cc.keystore" />
<syspropertyset>
@@ -229,6 +256,7 @@
<target name="setup-recovery-jms" if="want.jms">
<antcall target="setup-jms-jboss-messaging" />
<antcall target="setup-jms-hornetq" />
+ <antcall target="setup-jms-mrg" />
</target>
@@ -280,7 +308,7 @@
</target>
- <target name="setup-jms-jboss-messaging" unless="jbossts.hornetq">
+ <target name="setup-jms-jboss-messaging" if="want.messaging">
<echo message="Setting up JBoss Messaging (queues, ...) for profile ${conf}.."/>
<replace file="${jboss.dist}/server/${conf}/deploy/messaging/destinations-service.xml">
<replacetoken><![CDATA[</server>]]></replacetoken>
@@ -319,7 +347,7 @@
</replace>
</target>
- <target name="setup-jms-hornetq" if="jbossts.hornetq">
+ <target name="setup-jms-hornetq" if="want.hornetq">
<echo message="Setting up HornetQ (queues, ...) for profile ${conf}.."/>
<replace file="${jboss.dist}/server/${conf}/deploy/hornetq/hornetq-jms.xml">
<replacetoken><![CDATA[</configuration>]]></replacetoken>
@@ -330,10 +358,9 @@
</configuration>]]></replacevalue>
</replace>
- <echo message="Setting up HornetQ recovery for profile ${conf}.."/>
-
+ <!--echo message="Setting up HornetQ recovery for profile ${conf}.."/>
<antcall target="setup-jbossts-hornetq-invm" />
- <antcall target="setup-jbossts-hornetq-netty" />
+ <antcall target="setup-jbossts-hornetq-netty" /-->
<!-- more verbose logging -->
<replace file="${jboss.dist}/server/${conf}/conf/jbossts-properties.xml">
@@ -372,4 +399,42 @@
</replace>
</target>
+ <target name="setup-jms-mrg" if="want.mrg">
+ <!-- enable crash recovery and point it to a JMS provider -->
+ <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.QPID1"
+ value="org.jboss.mrg.jca.tm.QpidXAResourceRecovery;amqp://guest:guest@/test?brokerlist='tcp://mrg01.mw.lab.eng.bos.redhat.com:5672'"/>
+<!-- value="org.jboss.mrg.jca.tm.QpidXAResourceRecovery;amqp://guest:guest@/test?brokerlist='tcp://mrg01.mw.lab.eng.bos.redhat.com:5672?sasl_mechs='ANONYMOUS''"/> -->
+ <!-- xaRecoveryNode should match value in nodeIdentifier or be * -->
+ <property name="com.arjuna.ats.jta.xaRecoveryNode" value="1"/>
+ </properties>
+</transaction-service>]]></replacevalue>
+ </replace>
+
+ <!-- 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>
+
+ <replace file="${jboss.dist}/server/${conf}/deploy/qpid-jca-ds.xml">
+ <replacetoken><![CDATA[</connection-factories>]]></replacetoken>
+ <replacevalue><![CDATA[
+ <mbean code="org.jboss.resource.deployment.AdminObject"
+ name="qpid.jca:name=CrashRecoveryQueue">
+ <attribute name="JNDIName">queue/crashRecoveryQueue</attribute>
+ <depends optional-attribute-name="RARName">jboss.jca:service=RARDeployment,name='qpid-ra.rar'</depends>
+ <attribute name="Type">javax.jms.Destination</attribute>
+ <attribute name="Properties">
+ destinationAddress=queue.crashRecoveryQueue;{create:always,node:{type:queue}}
+ destinationType=queue
+ </attribute>
+ </mbean>
+</connection-factories>]]></replacevalue>
+ </replace>
+ </target>
+
</project>
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/ASCrashRecovery02/TestWithJMS.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/ASCrashRecovery02/TestWithJMS.java 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/ASCrashRecovery02/TestWithJMS.java 2012-01-13 13:35:49 UTC (rev 112574)
@@ -21,13 +21,15 @@
package org.jboss.test.jbossts.ASCrashRecovery02;
import org.jboss.test.jbossts.recovery.ASFailureSpec;
-import org.jboss.test.jbossts.recovery.CrashHelperRem;
import org.jboss.test.jbossts.recovery.RecoveredXid;
import org.jboss.test.jbossts.taskdefs.JUnitClientTest;
import org.jboss.test.jbossts.taskdefs.TransactionLog;
import org.jboss.test.jbossts.taskdefs.Utils;
import org.jboss.test.jbossts.jms.JMSCrashHelper;
+import org.jboss.test.jbossts.jms.JMSCrashHelperRem;
import org.jboss.test.jbossts.jms.JMSCrashRem;
+import org.jboss.test.jbossts.jms.MessageCheckerBean;
+import org.jboss.test.jbossts.jms.MessageCheckerRem;
import org.jboss.remoting.CannotConnectException;
import org.apache.tools.ant.BuildException;
@@ -37,14 +39,6 @@
import java.util.Set;
import javax.ejb.EJBTransactionRolledbackException;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.Context;
import javax.naming.NamingException;
import javax.transaction.HeuristicMixedException;
import javax.transaction.NotSupportedException;
@@ -61,7 +55,14 @@
{
// the longest time to wait in millis before declaring a test a failed (overridable)
private static final int MAX_TEST_TIME = 5 * 60 * 1000; // 5 minutes - allows two intervals of recovery which is 2 minutes by default
+
+ private static final String CONNECTION_FACTORY_JNDI_NAME_JMS = "java:/JmsXA";
+ private static final String CONNECTION_FACTORY_JNDI_NAME_MRG = "java:/QpidJMSXA";
+ private static final String RAW_CONNECTION_FACTORY_JNDI_NAME_JMS = "java:/XAConnectionFactory";
+ private static final String RAW_CONNECTION_FACTORY_JNDI_NAME_MRG = "java:/MRGXAConnectionFactory";
+
+
private boolean isCMT = false;
private boolean clientTx = false;
private boolean expectFailure = false;
@@ -80,6 +81,8 @@
private Set<RecoveredXid> existingXidsInDoubt;
private String serverName = "default";
+ private String connectionFactoryJNDIName = CONNECTION_FACTORY_JNDI_NAME_JMS;
+ private String rawConnectionFactoryJNDIName = RAW_CONNECTION_FACTORY_JNDI_NAME_JMS;
public void testAction()
@@ -129,6 +132,12 @@
wipeOutTxsInDoubtAfterTest = val.equalsIgnoreCase("true");
}
+ if (getName().startsWith("mrg-"))
+ {
+ connectionFactoryJNDIName = CONNECTION_FACTORY_JNDI_NAME_MRG;
+ rawConnectionFactoryJNDIName = RAW_CONNECTION_FACTORY_JNDI_NAME_MRG;
+ }
+
sb.insert(0, ":\n").insert(0, getName()).insert(0, "Executing test ");
System.out.println(sb);
@@ -165,7 +174,7 @@
if (wipeOutTxsInDoubtBeforeTest)
wipeOutTxsInDoubt();
- existingXidsInDoubt = lookupCrashHelper().checkXidsInDoubt();
+ existingXidsInDoubt = lookupCrashHelper().checkXidsInDoubt(rawConnectionFactoryJNDIName);
if (existingXidsInDoubt.size() > 0)
print(existingXidsInDoubt.size() + " txs in doubt before test run");
@@ -183,7 +192,7 @@
print("checkJMS result: " + jmsResult);
}
- Set<RecoveredXid> xidsInDoubtAfterTest = lookupCrashHelper().checkXidsInDoubt();
+ Set<RecoveredXid> xidsInDoubtAfterTest = lookupCrashHelper().checkXidsInDoubt(rawConnectionFactoryJNDIName);
if (wipeOutTxsInDoubt || wipeOutTxsInDoubtAfterTest)
wipeOutTxsInDoubt(existingXidsInDoubt, xidsInDoubtAfterTest);
@@ -200,70 +209,13 @@
}
}
- private boolean checkJMS(String sentMessage)
+ private boolean checkJMS(String sentMessage) throws Exception
{
- String receivedMessage = null;
+ String receivedMessage = lookupMessageCheckerBean().checkMessageResult(connectionFactoryJNDIName);
- try
- {
- receivedMessage = receiveMessage();
- }
- catch (Exception e)
- {
- return false;
- }
-
return (rollbackExpected) ? (receivedMessage == null) : sentMessage.equals(receivedMessage);
}
- private String receiveMessage() throws Exception
- {
- Context context = null;
- Connection connection = null;
- try
- {
- context = config.getNamingContext(serverName);
-
- ConnectionFactory cf = (ConnectionFactory) context.lookup("/ConnectionFactory");
-
- Queue queue = (Queue) context.lookup("queue/crashRecoveryQueue");
-
- connection = cf.createConnection();
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageConsumer consumer = session.createConsumer(queue);
-
- connection.start();
-
- print("waiting to receive a message from queue/crashRecoveryQueue...");
- TextMessage message = (TextMessage) consumer.receive(5 * 1000);
-
- if (isDebug)
- print("received message: " + ((message != null) ? message.getText() : message));
-
- return (message != null) ? message.getText() : null;
- }
- catch (Exception e)
- {
- print("Error in receiving a message: " + e);
- e.printStackTrace();
- throw e;
- }
- finally
- {
- if (connection != null)
- {
- try
- {
- connection.close();
- }
- catch (JMSException e)
- {
- e.printStackTrace();
- }
- }
- }
- }
-
private boolean crashTest(String message, ASFailureSpec[] sa, boolean reverseOrder) throws Exception
{
UserTransaction tx = null;
@@ -275,7 +227,7 @@
if (clientTx)
tx = startTx();
- String res = cr.testXA(message, reverseOrder, sa);
+ String res = cr.testXA(connectionFactoryJNDIName, message, reverseOrder, sa);
return "Passed".equalsIgnoreCase(res);
}
@@ -360,7 +312,7 @@
pendingUids = getPendingUids();
try
{
- xidsInDoubtAfterTest = lookupCrashHelper().checkXidsInDoubt();
+ xidsInDoubtAfterTest = lookupCrashHelper().checkXidsInDoubt(rawConnectionFactoryJNDIName);
}
catch (Exception e)
{
@@ -457,7 +409,7 @@
print("wiping out txs in doubt");
try
{
- lookupCrashHelper().wipeOutTxsInDoubt(xidsToRecover);
+ lookupCrashHelper().wipeOutTxsInDoubt(rawConnectionFactoryJNDIName, xidsToRecover);
}
catch (Exception e)
{
@@ -503,11 +455,16 @@
return (JMSCrashRem) config.getNamingContext(serverName).lookup(name);
}
- private CrashHelperRem lookupCrashHelper() throws Exception
+ private JMSCrashHelperRem lookupCrashHelper() throws Exception
{
- return (CrashHelperRem) config.getNamingContext(serverName).lookup(JMSCrashHelper.REMOTE_JNDI_NAME);
+ return (JMSCrashHelperRem) config.getNamingContext(serverName).lookup(JMSCrashHelper.REMOTE_JNDI_NAME);
}
+ private MessageCheckerRem lookupMessageCheckerBean() throws Exception
+ {
+ return (MessageCheckerRem) config.getNamingContext(serverName).lookup(MessageCheckerBean.REMOTE_JNDI_NAME);
+ }
+
private UserTransaction startTx() throws NamingException, SystemException, NotSupportedException
{
UserTransaction tx = (UserTransaction) config.getNamingContext(serverName).lookup("UserTransaction");
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashBMTBean.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashBMTBean.java 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashBMTBean.java 2012-01-13 13:35:49 UTC (rev 112574)
@@ -39,7 +39,7 @@
@Resource
private EJBContext context;
- public String testXA(String message, boolean reverseOrder, ASFailureSpec... specs)
+ public String testXA(String connectionFactoryJNDIName, String message, boolean reverseOrder, ASFailureSpec... specs)
{
log.info("BMT testXA called with " + specs.length + " specs and message=" + message + " and reverseOrder=" + reverseOrder);
@@ -51,6 +51,8 @@
xatest.setReverseOrder(reverseOrder);
xatest.setMessage(message);
+ xatest.setConnectionFactoryJNDIName(connectionFactoryJNDIName);
+
for (ASFailureSpec spec : specs)
xatest.addResource(spec);
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashCMTBean.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashCMTBean.java 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashCMTBean.java 2012-01-13 13:35:49 UTC (rev 112574)
@@ -34,7 +34,7 @@
@TransactionAttribute(TransactionAttributeType.REQUIRED)
- public String testXA(String message, boolean reverseOrder, ASFailureSpec... specs)
+ public String testXA(String connectionFactoryJNDIName, String message, boolean reverseOrder, ASFailureSpec... specs)
{
log.info("CMT testXA called with " + specs.length + " specs and message=" + message + " and reverseOrder=" + reverseOrder);
@@ -60,6 +60,7 @@
{
xatest.setReverseOrder(reverseOrder);
xatest.setMessage(message);
+ xatest.setConnectionFactoryJNDIName(connectionFactoryJNDIName);
for (ASFailureSpec spec : specs)
xatest.addResource(spec);
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashHelper.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashHelper.java 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashHelper.java 2012-01-13 13:35:49 UTC (rev 112574)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.jbossts.jms;
+import java.util.Set;
+
import javax.ejb.EJBException;
import javax.ejb.Stateless;
import javax.jms.XAConnection;
@@ -30,7 +32,7 @@
import javax.transaction.xa.XAResource;
import org.jboss.test.jbossts.recovery.CommonCrashHelper;
-import org.jboss.test.jbossts.recovery.CrashHelperRem;
+import org.jboss.test.jbossts.recovery.RecoveredXid;
/**
@@ -40,13 +42,29 @@
* @version $Revision: 1.1 $
*/
@Stateless
-public class JMSCrashHelper extends CommonCrashHelper implements CrashHelperRem
+public class JMSCrashHelper extends CommonCrashHelper implements JMSCrashHelperRem
{
public static final String REMOTE_JNDI_NAME = JMSCrashHelper.class.getSimpleName() + "/remote";
private XAConnection xaConnection = null;
+ private String connectionFactoryJNDIName = "java:/XAConnectionFactory";
@Override
+ public boolean wipeOutTxsInDoubt(String connectionFactoryJNDIName, Set<RecoveredXid> xidsToRecover)
+ {
+ this.connectionFactoryJNDIName = connectionFactoryJNDIName;
+ return super.wipeOutTxsInDoubt(xidsToRecover);
+ }
+
+ @Override
+ public Set<RecoveredXid> checkXidsInDoubt(String connectionFactoryJNDIName)
+ {
+ this.connectionFactoryJNDIName = connectionFactoryJNDIName;
+ return super.checkXidsInDoubt();
+ }
+
+
+ @Override
protected XAResource getNewXAResource() throws Exception
{
try
@@ -54,7 +72,7 @@
if (xaConnection == null)
{
InitialContext ic = new InitialContext();
- XAConnectionFactory xacf = (XAConnectionFactory) ic.lookup("java:/XAConnectionFactory");
+ XAConnectionFactory xacf = (XAConnectionFactory) ic.lookup(connectionFactoryJNDIName);
xaConnection = xacf.createXAConnection();
}
@@ -87,5 +105,5 @@
xaConnection = null;
}
}
-
+
}
Added: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashHelperRem.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashHelperRem.java (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashHelperRem.java 2012-01-13 13:35:49 UTC (rev 112574)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.jbossts.jms;
+
+import java.util.Set;
+
+import javax.ejb.Remote;
+
+import org.jboss.test.jbossts.recovery.RecoveredXid;
+
+ at Remote
+public interface JMSCrashHelperRem
+{
+ public boolean wipeOutTxsInDoubt(String connectionFactoryJNDIName, Set<RecoveredXid> xidsToRecover);
+ public Set<RecoveredXid> checkXidsInDoubt(String connectionFactoryJNDIName);
+}
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashRem.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashRem.java 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/JMSCrashRem.java 2012-01-13 13:35:49 UTC (rev 112574)
@@ -30,5 +30,5 @@
String BMT_JNDI_NAME = "JMSCrashBMTBean/remote";
String CMT_JNDI_NAME = "JMSCrashCMTBean/remote";
- String testXA(String message, boolean reverseOrder, ASFailureSpec... specs);
+ String testXA(String connectionFactoryJNDIName, String message, boolean reverseOrder, ASFailureSpec... specs);
}
Added: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/MessageCheckerBean.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/MessageCheckerBean.java (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/MessageCheckerBean.java 2012-01-13 13:35:49 UTC (rev 112574)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.jbossts.jms;
+
+import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+
+import org.jboss.logging.Logger;
+
+
+/**
+ * Helper class for checking the recovery result on JMS side.
+ * It checks whether the message has been sent or not, i.e. commit has really been done or not.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateless
+public class MessageCheckerBean implements MessageCheckerRem
+{
+ public static final String REMOTE_JNDI_NAME = MessageCheckerBean.class.getSimpleName() + "/remote";
+ public static final int RECEIVE_TIMEOUT = 5; // in seconds
+
+ private static Logger log = Logger.getLogger(MessageCheckerBean.class);
+
+
+ @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+ public String checkMessageResult(String connectionFactoryJNDIName)
+ {
+ Connection connection = null;
+ String receivedMessage = null;
+ try
+ {
+ InitialContext ic = new InitialContext();
+ ConnectionFactory connectionFactory = (ConnectionFactory) ic.lookup(connectionFactoryJNDIName);
+
+ Queue crashRecoveryQueue = (Queue) ic.lookup("queue/crashRecoveryQueue");
+
+ connection = connectionFactory.createConnection();
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageConsumer consumer = session.createConsumer(crashRecoveryQueue);
+
+ connection.start();
+
+ log.info("waiting to receive a message from queue/crashRecoveryQueue...");
+ TextMessage message = (TextMessage) consumer.receive(RECEIVE_TIMEOUT * 1000);
+
+ if (message != null)
+ {
+ receivedMessage = message.getText();
+ log.debug("received message: " + receivedMessage);
+ }
+ }
+ catch (Exception e)
+ {
+ log.warn("Error in receiving a message: ", e);
+ e.printStackTrace();
+ }
+ finally
+ {
+ if (connection != null)
+ {
+ try
+ {
+ connection.close();
+ }
+ catch (JMSException e)
+ {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ return receivedMessage;
+ }
+}
Added: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/MessageCheckerRem.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/MessageCheckerRem.java (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/MessageCheckerRem.java 2012-01-13 13:35:49 UTC (rev 112574)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.jbossts.jms;
+
+import javax.ejb.Remote;
+
+ at Remote
+public interface MessageCheckerRem
+{
+ public String checkMessageResult(String connectionFactoryJNDIName);
+}
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 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jbossts/jms/TestASRecoveryWithJMS.java 2012-01-13 13:35:49 UTC (rev 112574)
@@ -41,9 +41,10 @@
{
private static Logger log = Logger.getLogger(TestASRecoveryWithJMS.class);
+ private String connectionFactoryJNDIName = "java:/JmsXA";
private String message = null;
-
-
+
+
/**
* Enlists JMS into the active transaction.
*/
@@ -57,18 +58,18 @@
return false;
}
-
+
public boolean sendMessage(String message)
{
log.info("sending a message...");
-
+
InitialContext ic = null;
Connection conn = null;
try
{
ic = new InitialContext();
- ConnectionFactory connectionFactory = (ConnectionFactory) ic.lookup("java:/JmsXA");
+ ConnectionFactory connectionFactory = (ConnectionFactory) ic.lookup(connectionFactoryJNDIName);
Queue testQueue = (Queue) ic.lookup("queue/crashRecoveryQueue");
conn = connectionFactory.createConnection();
@@ -77,7 +78,7 @@
producer.send(session.createTextMessage(message));
log.info("message sent");
-
+
return true;
}
catch (Exception e)
@@ -111,4 +112,9 @@
this.message = message;
}
+ public void setConnectionFactoryJNDIName(String connectionFactoryJNDIName)
+ {
+ this.connectionFactoryJNDIName = connectionFactoryJNDIName;
+ }
+
}
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/db2_97-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/db2_97-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/db2_97-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -23,7 +23,6 @@
<xa-datasource-property name="DriverType">4</xa-datasource-property>
<!-- If driverType 4 is used, the following two tags are needed -->
- <track-connection-by-tx></track-connection-by-tx>
<!-- Must be set if using multiple DB2 XA resources in same transaction -->
<isSameRM-override-value>false</isSameRM-override-value>
<no-tx-separate-pools></no-tx-separate-pools>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql50-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql50-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql50-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -8,7 +8,6 @@
<datasources>
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
<xa-datasource-property name="ServerName">vmg08.mw.lab.eng.bos.redhat.com</xa-datasource-property>
<xa-datasource-property name="PortNumber">3306</xa-datasource-property>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -8,9 +8,8 @@
<datasources>
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
- <xa-datasource-property name="ServerName">vmg02.mw.lab.eng.bos.redhat.com</xa-datasource-property>
+ <xa-datasource-property name="ServerName">db01.mw.lab.eng.bos.redhat.com</xa-datasource-property>
<xa-datasource-property name="PortNumber">3306</xa-datasource-property>
<xa-datasource-property name="DatabaseName">crashrec</xa-datasource-property>
@CREDENTIALS@
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-lb-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-lb-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-lb-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -16,7 +16,6 @@
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<isSameRM-override-value>false</isSameRM-override-value>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
<xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-r2-lb-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-r2-lb-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-r2-lb-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -16,7 +16,6 @@
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<isSameRM-override-value>false</isSameRM-override-value>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
<xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg27-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg28-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-r2-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-r2-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-r2-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -16,7 +16,6 @@
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<isSameRM-override-value>false</isSameRM-override-value>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
<xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=vmg27-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
@@ -37,7 +36,6 @@
<xa-datasource>
<jndi-name>RecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<isSameRM-override-value>false</isSameRM-override-value>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
<xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=vmg28-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle-rac-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -16,7 +16,6 @@
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<isSameRM-override-value>false</isSameRM-override-value>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
<xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
@@ -37,7 +36,6 @@
<xa-datasource>
<jndi-name>RecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<isSameRM-override-value>false</isSameRM-override-value>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
<xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</xa-datasource-property>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle10-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle10-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle10-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -16,7 +16,6 @@
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<isSameRM-override-value>false</isSameRM-override-value>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
<xa-datasource-property name="URL">jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</xa-datasource-property>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle11-r2-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle11-r2-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle11-r2-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -16,10 +16,9 @@
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<isSameRM-override-value>false</isSameRM-override-value>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <xa-datasource-property name="URL">jdbc:oracle:thin:@vmg27.mw.lab.eng.bos.redhat.com:1521:qaora11</xa-datasource-property>
+ <xa-datasource-property name="URL">jdbc:oracle:thin:@db04.mw.lab.eng.bos.redhat.com:1521:qaora11</xa-datasource-property>
@CREDENTIALS@
<!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
<valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle11-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle11-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/oracle11-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -16,10 +16,9 @@
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<isSameRM-override-value>false</isSameRM-override-value>
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <xa-datasource-property name="URL">jdbc:oracle:thin:@dev04.mw.lab.eng.bos.redhat.com:1521:qaora11</xa-datasource-property>
+ <xa-datasource-property name="URL">jdbc:oracle:thin:@db03.mw.lab.eng.bos.redhat.com:1521:qaora11</xa-datasource-property>
@CREDENTIALS@
<!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
<valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres82-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres82-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres82-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -2,7 +2,6 @@
<datasources>
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
<xa-datasource-property name="ServerName">vmg01.mw.lab.eng.bos.redhat.com</xa-datasource-property>
<xa-datasource-property name="PortNumber">5432</xa-datasource-property>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres83-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres83-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres83-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -2,7 +2,6 @@
<datasources>
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
<xa-datasource-property name="ServerName">vmg03.mw.lab.eng.bos.redhat.com</xa-datasource-property>
<xa-datasource-property name="PortNumber">5432</xa-datasource-property>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres84-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres84-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres84-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -2,9 +2,8 @@
<datasources>
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
- <xa-datasource-property name="ServerName">postgresql02.mw.lab.eng.bos.redhat.com</xa-datasource-property>
+ <xa-datasource-property name="ServerName">postgresql04.mw.lab.eng.bos.redhat.com</xa-datasource-property>
<xa-datasource-property name="PortNumber">5432</xa-datasource-property>
<xa-datasource-property name="DatabaseName">crashrec</xa-datasource-property>
@CREDENTIALS@
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres90-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres90-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/postgres90-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -2,9 +2,8 @@
<datasources>
<xa-datasource>
<jndi-name>CrashRecoveryDS</jndi-name>
- <track-connection-by-tx>true</track-connection-by-tx>
<xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
- <xa-datasource-property name="ServerName">vmg03.mw.lab.eng.bos.redhat.com</xa-datasource-property>
+ <xa-datasource-property name="ServerName">db02.mw.lab.eng.bos.redhat.com</xa-datasource-property>
<xa-datasource-property name="PortNumber">5432</xa-datasource-property>
<xa-datasource-property name="DatabaseName">crashrec</xa-datasource-property>
@CREDENTIALS@
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -22,7 +22,6 @@
<!--check-valid-connection-sql>select 1 from mytable</check-valid-connection-sql-->
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter</exception-sorter-class-name>
<type-mapping>Sybase</type-mapping>
- <track-connection-by-tx/>
</xa-datasource>
</datasources>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15.5-xa-ds.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15.5-xa-ds.xml 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/resources/sybase15.5-xa-ds.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -22,7 +22,6 @@
<!--check-valid-connection-sql>select 1 from mytable</check-valid-connection-sql-->
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter</exception-sorter-class-name>
<type-mapping>Sybase</type-mapping>
- <track-connection-by-tx/>
</xa-datasource>
</datasources>
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 2012-01-11 21:00:10 UTC (rev 112573)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/as-tests.xml 2012-01-13 13:35:49 UTC (rev 112574)
@@ -203,7 +203,7 @@
<antcall target="call-tests-for-psql_8.2"/>
<antcall target="call-tests-for-psql_8.3"/>
<antcall target="call-tests-for-psql_8.4"/>
- <!--antcall target="call-tests-for-psql_9.0"/-->
+ <antcall target="call-tests-for-psql_9.0"/>
<antcall target="call-tests-for-oracle_10"/>
<antcall target="call-tests-for-oracle_11"/>
<antcall target="call-tests-for-oracle_11_r2"/>
@@ -536,6 +536,9 @@
<condition property="test.name.prefix" value="hornetq-invm">
<istrue value="${jbossts.hornetq}"/>
</condition>
+ <condition property="test.name.prefix" value="mrg">
+ <istrue value="${jbossts.mrg}"/>
+ </condition>
<property name="test.name.prefix" value="messaging"/>
<condition property="test.name.cmt" value="cmt" else="bmt">
@@ -714,7 +717,7 @@
<!-- ===== get db drivers ==== -->
<!-- set these to the location(s) of the database drivers -->
- <property name="driver.url" value="http://www.qa.jboss.com/jdbc-drivers-products/EAP/5.1.1"/>
+ <property name="driver.url" value="http://www.qa.jboss.com/jdbc-drivers-products/EAP/5.1.2"/>
<property name="driver.name.psql_8.2" value="postgresql-8.2.jar"/>
<property name="driver.name.psql_8.3" value="postgresql-8.3.jar"/>
<property name="driver.name.psql_8.4" value="postgresql-8.4.jar"/>
@@ -811,11 +814,11 @@
dest="${driver.home}/${driver.name.mssql_2008_r2}"/>
</target>
<target name="get.driver.psql_8.4" unless="have.dbdriver.psql_8.4" if="want.psql_8.4">
- <get src="${driver.url}/postgresql84/jdbc4/postgresql-8.4-702.jdbc4.jar"
+ <get src="${driver.url}/postgresql84/jdbc4/postgresql-8.4-703.jdbc4.jar"
dest="${driver.home}/${driver.name.psql_8.4}"/>
</target>
<target name="get.driver.psql_9.0" unless="have.dbdriver.psql_9.0" if="want.psql_9.0">
- <get src="${driver.url}/postgresql84/jdbc4/postgresql-8.4-702.jdbc4.jar"
+ <get src="${driver.url}/postgresql91/jdbc/postgresql-9.1-901.jdbc4.jar"
dest="${driver.home}/${driver.name.psql_9.0}"/>
</target>
<target name="get.driver.psql_8.3" unless="have.dbdriver.psql_8.3" if="want.psql_8.3">
More information about the jboss-cvs-commits
mailing list