[jboss-svn-commits] JBL Code SVN: r31858 - in labs/jbosstm/trunk: ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Feb 27 05:45:52 EST 2010
Author: mark.little at jboss.com
Date: 2010-02-27 05:45:51 -0500 (Sat, 27 Feb 2010)
New Revision: 31858
Added:
labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/XARecoveryModuleUnitTest.java
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/JTAEnvironmentBean.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/recovery/XAResourceRecovery.java
Log:
https://jira.jboss.org/jira/browse/JBTM-712
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java 2010-02-27 09:18:19 UTC (rev 31857)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/TxControl.java 2010-02-27 10:45:51 UTC (rev 31858)
@@ -65,7 +65,7 @@
public class TxControl
{
- public static final int NODE_NAME_SIZE = 10;
+ public static final int NODE_NAME_SIZE = 64;
public static final String DEFAULT_NODE_NAME = "Arjuna:";
public static class Shutdown extends Thread
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java 2010-02-27 09:18:19 UTC (rev 31857)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java 2010-02-27 10:45:51 UTC (rev 31858)
@@ -296,7 +296,6 @@
_recoveryManagerClass = null;
}
-
List<String> instances = jtaPropertyManager.getJTAEnvironmentBean().getXaResourceRecoveryInstances();
for(String theClassAndParameter : instances)
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/JTAEnvironmentBean.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/JTAEnvironmentBean.java 2010-02-27 09:18:19 UTC (rev 31857)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/JTAEnvironmentBean.java 2010-02-27 10:45:51 UTC (rev 31858)
@@ -206,7 +206,7 @@
* each optionally including trailing configuration data.
* The provided list will be copied, not retained.
*
- * @param xaResourceRecoveryInstances the XAResourceRecovery implementaion classnames and configuration.
+ * @param xaResourceRecoveryInstances the XAResourceRecovery implementation classnames and configuration.
*/
public void setXaResourceRecoveryInstances(List<String> xaResourceRecoveryInstances)
{
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/recovery/XAResourceRecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/recovery/XAResourceRecovery.java 2010-02-27 09:18:19 UTC (rev 31857)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/recovery/XAResourceRecovery.java 2010-02-27 10:45:51 UTC (rev 31858)
@@ -32,8 +32,6 @@
package com.arjuna.ats.jta.recovery;
import java.sql.*;
-import javax.sql.*;
-import javax.transaction.*;
import javax.transaction.xa.*;
/**
Added: labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/XARecoveryModuleUnitTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/XARecoveryModuleUnitTest.java (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/XARecoveryModuleUnitTest.java 2010-02-27 10:45:51 UTC (rev 31858)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 2004,
+ *
+ * Arjuna Technologies Ltd,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: xidcheck.java 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.hp.mwtests.ts.jta.recovery;
+
+import java.util.ArrayList;
+
+import org.junit.Test;
+
+import com.arjuna.ats.arjuna.coordinator.TwoPhaseOutcome;
+import com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule;
+import com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.TransactionImple;
+import com.arjuna.ats.jta.common.jtaPropertyManager;
+import com.hp.mwtests.ts.jta.common.RecoveryXAResource;
+
+import static org.junit.Assert.*;
+
+public class XARecoveryModuleUnitTest
+{
+ @Test
+ public void testNull ()
+ {
+ XARecoveryModule xarm = new XARecoveryModule();
+
+ xarm.periodicWorkFirstPass();
+ xarm.periodicWorkSecondPass();
+ }
+
+ @Test
+ public void testRecover () throws Exception
+ {
+ ArrayList<String> r = new ArrayList<String>();
+ TransactionImple tx = new TransactionImple(0);
+
+ assertTrue(tx.enlistResource(new RecoveryXAResource()));
+
+ assertEquals(tx.doPrepare(), TwoPhaseOutcome.PREPARE_OK);
+
+ r.add("com.hp.mwtests.ts.jta.recovery.DummyXARecoveryResource");
+
+ jtaPropertyManager.getJTAEnvironmentBean().setXaResourceRecoveryInstances(r);
+
+ XARecoveryModule xarm = new XARecoveryModule();
+
+ for (int i = 0; i < 11; i++)
+ {
+ xarm.periodicWorkFirstPass();
+ xarm.periodicWorkSecondPass();
+ }
+ }
+}
More information about the jboss-svn-commits
mailing list