geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r377123 - in /geronimo/branches/1.0: 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/or...
Date Sun, 12 Feb 2006 04:02:36 GMT
Author: gdamour
Date: Sat Feb 11 20:02:34 2006
New Revision: 377123

URL: http://svn.apache.org/viewcvs?rev=377123&view=rev
Log:
GERONIMO-1599 - merge from trunk.

Modified:
    geronimo/branches/1.0/configs/client/src/plan/plan.xml
    geronimo/branches/1.0/configs/j2ee-server/src/plan/plan.xml
    geronimo/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
    geronimo/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java
    geronimo/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java
    geronimo/branches/1.0/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java
    geronimo/branches/1.0/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java
    geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
    geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
    geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java
    geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java
    geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java
    geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java
    geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java
    geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java
    geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java
    geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java
    geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java

Modified: geronimo/branches/1.0/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/client/src/plan/plan.xml?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/client/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/client/src/plan/plan.xml Sat Feb 11 20:02:34 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/branches/1.0/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/j2ee-server/src/plan/plan.xml?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/j2ee-server/src/plan/plan.xml Sat Feb 11 20:02:34 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/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
(original)
+++ geronimo/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
Sat Feb 11 20:02:34 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/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java
(original)
+++ geronimo/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java
Sat Feb 11 20:02:34 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/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java
(original)
+++ geronimo/branches/1.0/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java
Sat Feb 11 20:02:34 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/branches/1.0/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java
(original)
+++ geronimo/branches/1.0/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java
Sat Feb 11 20:02:34 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/branches/1.0/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java
(original)
+++ geronimo/branches/1.0/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java
Sat Feb 11 20:02:34 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/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
(original)
+++ geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
Sat Feb 11 20:02:34 2006
@@ -309,6 +309,11 @@
     }
 
     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();
     }
 

Modified: geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
(original)
+++ geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
Sat Feb 11 20:02:34 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/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java
(original)
+++ geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java
Sat Feb 11 20:02:34 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/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java
(original)
+++ geronimo/branches/1.0/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java
Sat Feb 11 20:02:34 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/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java
(original)
+++ geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java
Sat Feb 11 20:02:34 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/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java
(original)
+++ geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java
Sat Feb 11 20:02:34 2006
@@ -62,7 +62,8 @@
                 2, //                "maxLogFiles",
                 2, //                "minBuffers",
                 10,//                "threadsWaitingForceThreshold"});
-                xidFactory, new BasicServerInfo(new File(basedir, "target").getAbsolutePath())
+                xidFactory,
+                new BasicServerInfo(new File(basedir, "target").getAbsolutePath())
         );
         howlLog.doStart();
         return howlLog;

Modified: geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java
(original)
+++ geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java
Sat Feb 11 20:02:34 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/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java
(original)
+++ geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java
Sat Feb 11 20:02:34 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/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java
(original)
+++ geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TransactionManagerImplTest.java
Sat Feb 11 20:02:34 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/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java
(original)
+++ geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java
Sat Feb 11 20:02:34 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/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java?rev=377123&r1=377122&r2=377123&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java
(original)
+++ geronimo/branches/1.0/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java
Sat Feb 11 20:02:34 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 {



Mime
View raw message