[openejb-scm] openejb/modules/core/src/test/org/openejb DeploymentHelper.java

[djencks]

djencks     2004/10/05 03:04:04

  Modified:    modules/core/src/test/org/openejb DeploymentHelper.java
  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.2       +4 -2      openejb/modules/core/src/test/org/openejb/DeploymentHelper.java
  
  Index: DeploymentHelper.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/DeploymentHelper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DeploymentHelper.java     18 Jul 2004 22:32:26 -0000      1.1
  +++ DeploymentHelper.java     5 Oct 2004 07:04:04 -0000       1.2
  @@ -100,6 +100,8 @@
           start(kernel, TRANSACTIONMANAGER_NAME, tmGBean);
           GBeanMBean tcmGBean = new GBeanMBean(TransactionContextManager.GBEAN_INFO);
           tcmGBean.setReferencePattern("TransactionManager", TRANSACTIONMANAGER_NAME);
  +        tcmGBean.setReferencePattern("XidImporter", TRANSACTIONMANAGER_NAME);
  +        tcmGBean.setReferencePattern("Recovery", TRANSACTIONMANAGER_NAME);
           start(kernel, TRANSACTIONCONTEXTMANAGER_NAME, tcmGBean);
           GBeanMBean trackedConnectionAssociator = new 
GBeanMBean(ConnectionTrackingCoordinator.GBEAN_INFO);
           DeploymentHelper.start(kernel, TRACKEDCONNECTIONASSOCIATOR_NAME, 
trackedConnectionAssociator);
  @@ -127,7 +129,7 @@
           geronimoWorkManagerGBean.setAttribute("syncMaximumPoolSize", new 
Integer(5));
           geronimoWorkManagerGBean.setAttribute("startMaximumPoolSize", new 
Integer(5));
           geronimoWorkManagerGBean.setAttribute("scheduledMaximumPoolSize", new 
Integer(5));
  -        geronimoWorkManagerGBean.setReferencePattern("XAServices", 
TRANSACTIONMANAGER_NAME);
  +        geronimoWorkManagerGBean.setReferencePattern("TransactionContextManager", 
TRANSACTIONCONTEXTMANAGER_NAME);
           start(kernel, WORKMANAGER_NAME, geronimoWorkManagerGBean);
   
           GBeanMBean resourceAdapterGBean = new 
GBeanMBean(ResourceAdapterWrapper.getGBeanInfo());