You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gd...@apache.org on 2006/02/09 14:21:05 UTC
svn commit: r376284 - in /geronimo/trunk: configs/client/src/plan/
configs/j2ee-server/src/plan/
modules/connector/src/test/org/apache/geronimo/connector/outbound/
modules/timer/src/test/org/apache/geronimo/timer/
modules/transaction/src/java/org/apach...
Author: gdamour
Date: Thu Feb 9 05:21:02 2006
New Revision: 376284
URL: http://svn.apache.org/viewcvs?rev=376284&view=rev
Log:
GERONIMO-1599 HOWLLog throws NPE because XidFactory is missing
Extract XidFactory from TransactionManagerImpl.
Define an XidFactory GBean shared by HOWLTransactionLog and TransactionManager
~
Modified:
geronimo/trunk/configs/client/src/plan/plan.xml
geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java
geronimo/trunk/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java
geronimo/trunk/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java
geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java
geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java
geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java
geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java
geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java
geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java
geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java
geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java
geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java
geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java
Modified: geronimo/trunk/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client/src/plan/plan.xml?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/configs/client/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client/src/plan/plan.xml Thu Feb 9 05:21:02 2006
@@ -56,9 +56,14 @@
</reference>
</gbean>
+ <gbean name="XidFactory" class="org.apache.geronimo.transaction.manager.XidFactoryImplGBean">
+ <attribute name="tmId">71,84,77,73,68</attribute>
+ </gbean>
+
<gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
<!--no transaction log on the client-->
<attribute name="defaultTransactionTimeoutSeconds">600</attribute>
+ <reference name="XidFactory"><name>XidFactory</name></reference>
<references name="ResourceManagers">
<pattern>
<gbean-name>*:j2eeType=JCAManagedConnectionFactory,*</gbean-name>
Modified: geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/src/plan/plan.xml?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-server/src/plan/plan.xml Thu Feb 9 05:21:02 2006
@@ -60,11 +60,17 @@
<attribute name="maxLogFiles">2</attribute>
<attribute name="minBuffers">4</attribute>
<attribute name="threadsWaitingForceThreshold">-1</attribute>
+ <reference name="XidFactory"><name>XidFactory</name></reference>
<reference name="ServerInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
</gbean>
+
+ <gbean name="XidFactory" class="org.apache.geronimo.transaction.manager.XidFactoryImplGBean">
+ <attribute name="tmId">71,84,77,73,68</attribute>
+ </gbean>
<gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
<attribute name="defaultTransactionTimeoutSeconds">600</attribute>
+ <reference name="XidFactory"><name>XidFactory</name></reference>
<reference name="TransactionLog"><name>HOWLTransactionLog</name></reference>
<references name="ResourceManagers">
<pattern><gbean-name>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</gbean-name></pattern>
Modified: geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java (original)
+++ geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java Thu Feb 9 05:21:02 2006
@@ -39,6 +39,7 @@
import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.transaction.context.UserTransactionImpl;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
/**
*
@@ -90,7 +91,8 @@
protected void setUp() throws Exception {
connectionTrackingCoordinator = new ConnectionTrackingCoordinator();
- TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000, null, null);
+ TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000,
+ new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
mockManagedConnectionFactory = new MockManagedConnectionFactory();
subject = new Subject();
Modified: geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java (original)
+++ geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java Thu Feb 9 05:21:02 2006
@@ -22,6 +22,7 @@
import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.transaction.context.TransactionContext;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
/**
*
@@ -37,7 +38,8 @@
protected void setUp() throws Exception {
super.setUp();
- transactionManager = new TransactionManagerImpl(10 * 1000, null, null);
+ transactionManager = new TransactionManagerImpl(10 * 1000,
+ new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
transactionCachingInterceptor = new TransactionCachingInterceptor(this, transactionContextManager);
}
Modified: geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java (original)
+++ geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java Thu Feb 9 05:21:02 2006
@@ -26,6 +26,7 @@
import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.transaction.manager.NamedXAResource;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
/**
*
@@ -45,7 +46,8 @@
protected void setUp() throws Exception {
super.setUp();
- TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000, null, null);
+ TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000,
+ new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
transactionEnlistingInterceptor = new TransactionEnlistingInterceptor(this, transactionContextManager);
}
Modified: geronimo/trunk/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java (original)
+++ geronimo/trunk/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java Thu Feb 9 05:21:02 2006
@@ -19,6 +19,7 @@
import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
/**
*
@@ -29,7 +30,8 @@
public class NontransactionalThreadPooledTimerTest extends AbstractThreadPooledTimerTest {
protected void setUp() throws Exception {
- TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000, null, null);
+ TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000,
+ new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
executableWorkFactory = new NontransactionalExecutorTaskFactory(transactionContextManager);
super.setUp();
Modified: geronimo/trunk/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java (original)
+++ geronimo/trunk/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java Thu Feb 9 05:21:02 2006
@@ -19,6 +19,7 @@
import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import org.apache.geronimo.transaction.manager.XidFactoryImpl;
/**
*
@@ -29,7 +30,8 @@
public class TransactionalThreadPooledTimerTest extends AbstractThreadPooledTimerTest {
protected void setUp() throws Exception {
- TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000, null, null);
+ TransactionManagerImpl transactionManager = new TransactionManagerImpl(10 * 1000,
+ new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
transactionContextManager = new TransactionContextManager(transactionManager, transactionManager);
executableWorkFactory = new TransactionalExecutorTaskFactory(transactionContextManager, 1);
super.setUp();
Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java Thu Feb 9 05:21:02 2006
@@ -66,12 +66,12 @@
private final ServerInfo serverInfo;
private String logFileDir;
-// private final XidFactory xidFactory;
+ private final XidFactory xidFactory;
private final XALogger logger;
private final Configuration configuration = new Configuration();
private boolean started = false;
-// private HashMap recovered;
+ private HashMap recovered;
public HOWLLog(String bufferClassName,
int bufferSize,
@@ -85,7 +85,7 @@
int maxLogFiles,
int minBuffers,
int threadsWaitingForceThreshold,
-// XidFactory xidFactory,
+ XidFactory xidFactory,
ServerInfo serverInfo) throws IOException, LogConfigurationException {
this.serverInfo = serverInfo;
setBufferClassName(bufferClassName);
@@ -101,7 +101,7 @@
setMaxLogFiles(maxLogFiles);
setMinBuffers(minBuffers);
setThreadsWaitingForceThreshold(threadsWaitingForceThreshold);
-// this.xidFactory = xidFactory;
+ this.xidFactory = xidFactory;
this.logger = new XALogger(configuration);
}
@@ -211,21 +211,21 @@
public void doStart() throws Exception {
started = true;
setLogFileDir(logFileDir);
-// log.debug("Initiating transaction manager recovery");
-// recovered = new HashMap();
+ log.debug("Initiating transaction manager recovery");
+ recovered = new HashMap();
logger.open(null);
-// ReplayListener replayListener = new GeronimoReplayListener(xidFactory, recovered);
-// logger.replayActiveTx(replayListener);
+ ReplayListener replayListener = new GeronimoReplayListener(xidFactory, recovered);
+ logger.replayActiveTx(replayListener);
-// log.debug("In doubt transactions recovered from log");
+ log.debug("In doubt transactions recovered from log");
}
public void doStop() throws Exception {
started = false;
logger.close();
-// recovered = null;
+ recovered = null;
}
public void doFail() {
@@ -309,11 +309,6 @@
}
public Collection recover(XidFactory xidFactory) throws LogException {
- log.debug("Initiating transaction manager recovery");
- Map recovered = new HashMap();
- ReplayListener replayListener = new GeronimoReplayListener(xidFactory, recovered);
- logger.replayActiveTx(replayListener);
- log.debug("In doubt transactions recovered from log");
return recovered.values();
}
@@ -413,7 +408,7 @@
infoFactory.addAttribute("minBuffers", Integer.TYPE, true);
infoFactory.addAttribute("threadsWaitingForceThreshold", Integer.TYPE, true);
-// infoFactory.addReference("XidFactory", XidFactory.class, NameFactory.XID_FACTORY);
+ infoFactory.addReference("XidFactory", XidFactory.class, NameFactory.XID_FACTORY);
infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
infoFactory.addInterface(TransactionLog.class);
@@ -431,7 +426,7 @@
"maxLogFiles",
"minBuffers",
"threadsWaitingForceThreshold",
-// "XidFactory",
+ "XidFactory",
"ServerInfo"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java Thu Feb 9 05:21:02 2006
@@ -46,14 +46,14 @@
/**
* TODO NOTE!!! this should be called in an unspecified transaction context, but we cannot enforce this restriction!
*/
- public TransactionManagerImpl(int defaultTransactionTimeoutSeconds, TransactionLog transactionLog, Collection resourceManagers) throws XAException {
+ public TransactionManagerImpl(int defaultTransactionTimeoutSeconds, XidFactory xidFactory, TransactionLog transactionLog, Collection resourceManagers) throws XAException {
if (defaultTransactionTimeoutSeconds <= 0) {
throw new IllegalArgumentException("defaultTransactionTimeoutSeconds must be positive: attempted value: " + defaultTransactionTimeoutSeconds);
}
this.defaultTransactionTimeoutMilliseconds = defaultTransactionTimeoutSeconds * 1000;
this.transactionLog = transactionLog == null ? new UnrecoverableLog() : transactionLog;
- this.xidFactory = new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes());
+ this.xidFactory = xidFactory;
this.resourceManagers = resourceManagers;
recovery = new RecoveryImpl(this.transactionLog, this.xidFactory);
Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java Thu Feb 9 05:21:02 2006
@@ -36,10 +36,11 @@
/**
* TODO NOTE!!! this should be called in an unspecified transaction context, but we cannot enforce this restriction!
*/
- public TransactionManagerImplGBean(int defaultTransactionTimeoutSeconds, TransactionLog transactionLog, Collection resourceManagers) throws XAException {
- super(defaultTransactionTimeoutSeconds, transactionLog, resourceManagers);
+ public TransactionManagerImplGBean(int defaultTransactionTimeoutSeconds, XidFactory xidFactory, TransactionLog transactionLog, Collection resourceManagers) throws XAException {
+ super(defaultTransactionTimeoutSeconds, xidFactory, transactionLog, resourceManagers);
}
+
/**
* We can track as resources are added into the geronimo kernel.
*
@@ -74,13 +75,18 @@
GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(TransactionManagerImplGBean.class, NameFactory.TRANSACTION_MANAGER);
infoBuilder.addAttribute("defaultTransactionTimeoutSeconds", int.class, true);
+ infoBuilder.addReference("XidFactory", XidFactory.class, NameFactory.XID_FACTORY);
infoBuilder.addReference("TransactionLog", TransactionLog.class, NameFactory.TRANSACTION_LOG);
infoBuilder.addReference("ResourceManagers", ResourceManager.class);//two kinds of things, so specify the type in each pattern.
infoBuilder.addInterface(ExtendedTransactionManager.class);
infoBuilder.addInterface(XidImporter.class);
- infoBuilder.setConstructor(new String[]{"defaultTransactionTimeoutSeconds", "TransactionLog", "ResourceManagers"});
+ infoBuilder.setConstructor(new String[]{
+ "defaultTransactionTimeoutSeconds",
+ "XidFactory",
+ "TransactionLog",
+ "ResourceManagers"});
GBEAN_INFO = infoBuilder.getBeanInfo();
}
Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java Thu Feb 9 05:21:02 2006
@@ -29,8 +29,13 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(XidFactoryImplGBean.class, NameFactory.XID_FACTORY);
+ GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(XidFactoryImpl.class, NameFactory.XID_FACTORY);
+
+ infoFactory.addAttribute("tmId", byte[].class, true);
infoFactory.addInterface(XidFactory.class);
+
+ infoFactory.setConstructor(new String[]{"tmId"});
+
GBEAN_INFO = infoFactory.getBeanInfo();
}
Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java Thu Feb 9 05:21:02 2006
@@ -38,7 +38,8 @@
private XidFactory xidFactory = new XidFactoryImpl("geronimo.test.tm".getBytes());
protected void setUp() throws Exception {
- TransactionManagerImpl tm = new TransactionManagerImpl(1000, null, null);
+ TransactionManagerImpl tm = new TransactionManagerImpl(1000,
+ new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
transactionContextManager = new TransactionContextManager(tm, tm);
}
Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java Thu Feb 9 05:21:02 2006
@@ -62,7 +62,7 @@
2, // "maxLogFiles",
2, // "minBuffers",
10,// "threadsWaitingForceThreshold"});
-// xidFactory,
+ xidFactory,
new BasicServerInfo(new File(basedir, "target").getAbsolutePath())
);
howlLog.doStart();
Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java Thu Feb 9 05:21:02 2006
@@ -71,7 +71,7 @@
2, // "maxLogFiles",
2, // "minBuffers",
10,// "threadsWaitingForceThreshold"});
-// xidFactory,
+ xidFactory,
new BasicServerInfo(targetDir)
);
howlLog.doStart();
Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java Thu Feb 9 05:21:02 2006
@@ -31,7 +31,8 @@
private MockResource mr11, mr12, mr21, mr22;
protected void setUp() throws Exception {
- tm = new TransactionManagerImpl(1000, null, null);
+ tm = new TransactionManagerImpl(1000,
+ new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
mrm1 = new MockResourceManager(true);
mrm2 = new MockResourceManager(true);
mr11 = new MockResource(mrm1, "mr11");
Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java Thu Feb 9 05:21:02 2006
@@ -112,7 +112,8 @@
}
protected void setUp() throws Exception {
- tm = new TransactionManagerImpl(10 * 1000, null, null);
+ tm = new TransactionManagerImpl(10 * 1000,
+ new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
rm1 = new MockResourceManager(true);
rm2 = new MockResourceManager(true);
rm3 = new MockResourceManager(false);
Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java Thu Feb 9 05:21:02 2006
@@ -49,7 +49,8 @@
TransactionManagerImpl tm;
protected void setUp() throws Exception {
- tm = new TransactionManagerImplGBean(10, transactionLog, resourceManagers);
+ tm = new TransactionManagerImplGBean(10,
+ new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), transactionLog, resourceManagers);
}
protected void tearDown() throws Exception {
Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java Thu Feb 9 05:21:02 2006
@@ -47,7 +47,9 @@
ds = getDataSource(args);
XAConnection xaConn = ds.getXAConnection("test", "test");
XAResource xaRes = xaConn.getXAResource();
- manager = new TransactionManagerImpl(10, new DummyLog(), null);
+ manager = new TransactionManagerImpl(10,
+ new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()),
+ new DummyLog(), null);
Connection c = xaConn.getConnection();
Statement s = c.createStatement();
Modified: geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java?rev=376284&r1=376283&r2=376284&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java (original)
+++ geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java Thu Feb 9 05:21:02 2006
@@ -44,7 +44,8 @@
XidFactory xidFactory = new XidFactoryImpl();
protected void setUp() throws Exception {
- tm = new TransactionManagerImpl(10 * 1000, null, null);
+ tm = new TransactionManagerImpl(10 * 1000,
+ new XidFactoryImpl("WHAT DO WE CALL IT?".getBytes()), null, null);
}
public void testImportXid() throws Exception {