[openejb-scm] openejb/modules/core/src/java/org/openejb/entity EntityContextImpl.java EntityInstanceContext.java

[djencks]

djencks     2004/10/05 03:04:00

  Modified:    modules/core/src/java/org/openejb/entity
                        EntityContextImpl.java EntityInstanceContext.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.3       +4 -3      
openejb/modules/core/src/java/org/openejb/entity/EntityContextImpl.java
  
  Index: EntityContextImpl.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/EntityContextImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EntityContextImpl.java    21 Mar 2004 21:26:34 -0000      1.2
  +++ EntityContextImpl.java    5 Oct 2004 07:04:00 -0000       1.3
  @@ -62,6 +62,7 @@
   import org.openejb.EJBContextImpl;
   import org.openejb.EJBInstanceContext;
   import org.openejb.EJBOperation;
  +import org.apache.geronimo.transaction.context.TransactionContextManager;
   
   /**
    *
  @@ -69,8 +70,8 @@
    * @version $Revision$ $Date$
    */
   public class EntityContextImpl extends EJBContextImpl implements EntityContext {
  -    public EntityContextImpl(EntityInstanceContext context) {
  -        super(context, null);
  +    public EntityContextImpl(EntityInstanceContext context, 
TransactionContextManager transactionContextManager) {
  +        super(context, transactionContextManager, null);
       }
   
       public void setState(EJBOperation operation) {
  
  
  
  1.8       +4 -3      
openejb/modules/core/src/java/org/openejb/entity/EntityInstanceContext.java
  
  Index: EntityInstanceContext.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/EntityInstanceContext.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EntityInstanceContext.java        20 Jul 2004 23:40:01 -0000      1.7
  +++ EntityInstanceContext.java        5 Oct 2004 07:04:00 -0000       1.8
  @@ -54,6 +54,7 @@
   
   import org.apache.geronimo.core.service.Interceptor;
   import org.apache.geronimo.transaction.context.TransactionContext;
  +import org.apache.geronimo.transaction.context.TransactionContextManager;
   import org.openejb.AbstractInstanceContext;
   import org.openejb.EJBInvocation;
   import org.openejb.EJBOperation;
  @@ -74,10 +75,10 @@
       private final EJBInvocation storeInvocation;
       private boolean stateValid;
   
  -    public EntityInstanceContext(Object containerId, EJBProxyFactory proxyFactory, 
EnterpriseBean instance, Interceptor lifecycleInterceptorChain, SystemMethodIndices 
systemMethodIndices, Set unshareableResources, Set 
applicationManagedSecurityResources, BasicTimerService timerService) {
  +    public EntityInstanceContext(Object containerId, EJBProxyFactory proxyFactory, 
EnterpriseBean instance, Interceptor lifecycleInterceptorChain, SystemMethodIndices 
systemMethodIndices, Set unshareableResources, Set 
applicationManagedSecurityResources, TransactionContextManager 
transactionContextManager, BasicTimerService timerService) {
           super(systemMethodIndices, lifecycleInterceptorChain, unshareableResources, 
applicationManagedSecurityResources, instance, proxyFactory, timerService);
           this.containerId = containerId;
  -        entityContext = new EntityContextImpl(this);
  +        entityContext = new EntityContextImpl(this, transactionContextManager);
           loadInvocation = systemMethodIndices.getEjbLoadInvocation(this);
           storeInvocation = systemMethodIndices.getEjbStoreInvocation(this);
           setContextInvocation = systemMethodIndices.getSetContextInvocation(this, 
entityContext);