djencks 2004/10/05 03:04:00
Modified: modules/assembly/src/plan j2ee-server-plan.xml
Log:
Use TransactionContextManager rather than TransactionContext static methods. Mostly
fix GERONIMO-355. Progress on GERONIMO-347. This demonstrates the problems in
GERONIMO-359 and GERONIMO-360 (there are now itest failures)
Revision Changes Path
1.25 +4 -1 openejb/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-server-plan.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- j2ee-server-plan.xml 14 Sep 2004 21:29:28 -0000 1.24
+++ j2ee-server-plan.xml 5 Oct 2004 07:03:59 -0000 1.25
@@ -140,7 +140,7 @@
<attribute name="syncMaximumPoolSize" type="int">10</attribute>
<attribute name="startMaximumPoolSize" type="int">10</attribute>
<attribute name="scheduledMaximumPoolSize" type="int">10</attribute>
- <reference
name="XAServices">geronimo.server:type=TransactionManager</reference>
+ <reference
name="TransactionContextManager">geronimo.server:type=TransactionContextManager</reference>
</gbean>
<gbean name="geronimo.server:type=HOWLTransactionLog"
class="org.apache.geronimo.transaction.log.HOWLLog">
@@ -167,8 +167,11 @@
</references>
</gbean>
+
<gbean name="geronimo.server:type=TransactionContextManager"
class="org.apache.geronimo.transaction.context.TransactionContextManager">
<reference
name="TransactionManager">geronimo.server:type=TransactionManager</reference>
+ <reference
name="XidImporter">geronimo.server:type=TransactionManager</reference>
+ <reference
name="Recovery">geronimo.server:type=TransactionManager</reference>
</gbean>
<gbean name="openejb:type=ContainerIndex" class="org.openejb.ContainerIndex">