You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2003/09/08 06:28:27 UTC

cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/lock LockInterceptor.java

dain        2003/09/07 21:28:27

  Modified:    modules/core/src/java/org/apache/geronimo/ejb/cache
                        EnterpriseContextInstanceCache.java
                        EnterpriseContextInstancePool.java
                        EntityCreationInterceptor.java
                        EntitySynchronizationInterceptor.java
                        StatefulInstanceInterceptor.java
                        StatefulSessionSynchronizationInterceptor.java
                        StatelessInstanceFactory.java
                        StatelessInstanceInterceptor.java
               modules/core/src/java/org/apache/geronimo/ejb
                        CallbackInterceptor.java EJBInvocationUtil.java
                        EJBProxyFactoryManager.java EnterpriseContext.java
                        Entrancy.java GeronimoSessionContext.java
                        SimpleEnterpriseContext.java
                        StatelessLifeCycleInterceptor.java
                        SynchronizationRegistry.java
               modules/core/src/java/org/apache/geronimo/ejb/container
                        ContainerImpl.java EJBContainerUtil.java
                        EJBPlugins.java
               modules/core/src/java/org/apache/geronimo/ejb/context
                        CMTInterceptor.java
                        ExecutionContextInterceptor.java
                        StatefulBMTInterceptor.java
                        StatelessBMTInterceptor.java
                        TransactionInterceptor.java
               modules/core/src/java/org/apache/geronimo/lock
                        LockInterceptor.java
  Log:
  Updated to reflect movement of base services code from o.a.g.common in the core module to
  o.a.g.core.service in the common module.
  
  Revision  Changes    Path
  1.7       +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/EnterpriseContextInstanceCache.java
  
  Index: EnterpriseContextInstanceCache.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/EnterpriseContextInstanceCache.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- EnterpriseContextInstanceCache.java	23 Aug 2003 09:07:11 -0000	1.6
  +++ EnterpriseContextInstanceCache.java	8 Sep 2003 04:28:26 -0000	1.7
  @@ -62,9 +62,9 @@
   import org.apache.geronimo.cache.InstanceCache;
   import org.apache.geronimo.cache.LRUInstanceCache;
   import org.apache.geronimo.cache.LRURunner;
  -import org.apache.geronimo.common.AbstractComponent;
  -import org.apache.geronimo.common.Container;
  -import org.apache.geronimo.common.RPCContainer;
  +import org.apache.geronimo.core.service.AbstractComponent;
  +import org.apache.geronimo.core.service.Container;
  +import org.apache.geronimo.core.service.RPCContainer;
   import org.apache.geronimo.ejb.EnterpriseContext;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   
  
  
  
  1.6       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/EnterpriseContextInstancePool.java
  
  Index: EnterpriseContextInstancePool.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/EnterpriseContextInstancePool.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EnterpriseContextInstancePool.java	15 Aug 2003 14:12:19 -0000	1.5
  +++ EnterpriseContextInstancePool.java	8 Sep 2003 04:28:26 -0000	1.6
  @@ -64,8 +64,8 @@
   import org.apache.commons.logging.LogFactory;
   import org.apache.geronimo.cache.InstancePool;
   import org.apache.geronimo.cache.SimpleInstancePool;
  -import org.apache.geronimo.common.AbstractComponent;
  -import org.apache.geronimo.common.RPCContainer;
  +import org.apache.geronimo.core.service.AbstractComponent;
  +import org.apache.geronimo.core.service.RPCContainer;
   import org.apache.geronimo.ejb.EnterpriseContext;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   
  
  
  
  1.5       +5 -5      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/EntityCreationInterceptor.java
  
  Index: EntityCreationInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/EntityCreationInterceptor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EntityCreationInterceptor.java	26 Aug 2003 22:11:23 -0000	1.4
  +++ EntityCreationInterceptor.java	8 Sep 2003 04:28:26 -0000	1.5
  @@ -55,10 +55,10 @@
    */
   package org.apache.geronimo.ejb.cache;
   
  -import org.apache.geronimo.common.AbstractInterceptor;
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationResult;
  -import org.apache.geronimo.common.InvocationType;
  +import org.apache.geronimo.core.service.AbstractInterceptor;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationResult;
  +import org.apache.geronimo.core.service.InvocationType;
   import org.apache.geronimo.ejb.EJBInvocationUtil;
   import org.apache.geronimo.ejb.EnterpriseContext;
   
  
  
  
  1.5       +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/EntitySynchronizationInterceptor.java
  
  Index: EntitySynchronizationInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/EntitySynchronizationInterceptor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EntitySynchronizationInterceptor.java	26 Aug 2003 22:11:23 -0000	1.4
  +++ EntitySynchronizationInterceptor.java	8 Sep 2003 04:28:26 -0000	1.5
  @@ -55,9 +55,9 @@
    */
   package org.apache.geronimo.ejb.cache;
   
  -import org.apache.geronimo.common.AbstractInterceptor;
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationResult;
  +import org.apache.geronimo.core.service.AbstractInterceptor;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationResult;
   import org.apache.geronimo.ejb.EJBInvocationUtil;
   import org.apache.geronimo.ejb.EnterpriseContext;
   import org.apache.geronimo.ejb.SynchronizationRegistry;
  
  
  
  1.9       +6 -6      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/StatefulInstanceInterceptor.java
  
  Index: StatefulInstanceInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/StatefulInstanceInterceptor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- StatefulInstanceInterceptor.java	26 Aug 2003 22:11:23 -0000	1.8
  +++ StatefulInstanceInterceptor.java	8 Sep 2003 04:28:26 -0000	1.9
  @@ -59,11 +59,11 @@
   
   import org.apache.geronimo.cache.InstanceCache;
   import org.apache.geronimo.cache.InstancePool;
  -import org.apache.geronimo.common.AbstractInterceptor;
  -import org.apache.geronimo.common.RPCContainer;
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationResult;
  -import org.apache.geronimo.common.InvocationType;
  +import org.apache.geronimo.core.service.AbstractInterceptor;
  +import org.apache.geronimo.core.service.RPCContainer;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationResult;
  +import org.apache.geronimo.core.service.InvocationType;
   import org.apache.geronimo.ejb.EJBInvocationUtil;
   import org.apache.geronimo.ejb.EnterpriseContext;
   import org.apache.geronimo.ejb.container.EJBPlugins;
  
  
  
  1.8       +6 -6      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/StatefulSessionSynchronizationInterceptor.java
  
  Index: StatefulSessionSynchronizationInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/StatefulSessionSynchronizationInterceptor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StatefulSessionSynchronizationInterceptor.java	26 Aug 2003 22:11:23 -0000	1.7
  +++ StatefulSessionSynchronizationInterceptor.java	8 Sep 2003 04:28:26 -0000	1.8
  @@ -66,11 +66,11 @@
   import javax.transaction.TransactionManager;
   
   import org.apache.geronimo.cache.InstanceCache;
  -import org.apache.geronimo.common.AbstractInterceptor;
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationResult;
  -import org.apache.geronimo.common.InvocationType;
  -import org.apache.geronimo.common.RPCContainer;
  +import org.apache.geronimo.core.service.AbstractInterceptor;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationResult;
  +import org.apache.geronimo.core.service.InvocationType;
  +import org.apache.geronimo.core.service.RPCContainer;
   import org.apache.geronimo.ejb.EJBInvocationUtil;
   import org.apache.geronimo.ejb.EnterpriseContext;
   import org.apache.geronimo.ejb.container.EJBPlugins;
  
  
  
  1.6       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/StatelessInstanceFactory.java
  
  Index: StatelessInstanceFactory.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/StatelessInstanceFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StatelessInstanceFactory.java	16 Aug 2003 23:16:43 -0000	1.5
  +++ StatelessInstanceFactory.java	8 Sep 2003 04:28:26 -0000	1.6
  @@ -61,8 +61,8 @@
   import javax.ejb.SessionBean;
   
   import org.apache.geronimo.cache.InstanceFactory;
  -import org.apache.geronimo.common.AbstractComponent;
  -import org.apache.geronimo.common.RPCContainer;
  +import org.apache.geronimo.core.service.AbstractComponent;
  +import org.apache.geronimo.core.service.RPCContainer;
   import org.apache.geronimo.ejb.EnterpriseContext;
   import org.apache.geronimo.ejb.GeronimoSessionContext;
   import org.apache.geronimo.ejb.SimpleEnterpriseContext;
  
  
  
  1.8       +6 -6      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/StatelessInstanceInterceptor.java
  
  Index: StatelessInstanceInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/StatelessInstanceInterceptor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StatelessInstanceInterceptor.java	26 Aug 2003 22:11:23 -0000	1.7
  +++ StatelessInstanceInterceptor.java	8 Sep 2003 04:28:26 -0000	1.8
  @@ -58,11 +58,11 @@
   import java.rmi.RemoteException;
   
   import org.apache.geronimo.cache.InstancePool;
  -import org.apache.geronimo.common.AbstractInterceptor;
  -import org.apache.geronimo.common.RPCContainer;
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationResult;
  -import org.apache.geronimo.common.InvocationType;
  +import org.apache.geronimo.core.service.AbstractInterceptor;
  +import org.apache.geronimo.core.service.RPCContainer;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationResult;
  +import org.apache.geronimo.core.service.InvocationType;
   import org.apache.geronimo.ejb.EJBInvocationUtil;
   import org.apache.geronimo.ejb.EnterpriseContext;
   import org.apache.geronimo.ejb.container.EJBPlugins;
  
  
  
  1.8       +5 -5      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/CallbackInterceptor.java
  
  Index: CallbackInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/CallbackInterceptor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CallbackInterceptor.java	27 Aug 2003 03:43:36 -0000	1.7
  +++ CallbackInterceptor.java	8 Sep 2003 04:28:26 -0000	1.8
  @@ -60,10 +60,10 @@
   
   import javax.ejb.EJBException;
   
  -import org.apache.geronimo.common.AbstractInterceptor;
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationResult;
  -import org.apache.geronimo.common.SimpleInvocationResult;
  +import org.apache.geronimo.core.service.AbstractInterceptor;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationResult;
  +import org.apache.geronimo.core.service.SimpleInvocationResult;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   import org.apache.geronimo.ejb.metadata.EJBMetadata;
   import org.apache.geronimo.ejb.metadata.MethodMetadata;
  
  
  
  1.7       +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/EJBInvocationUtil.java
  
  Index: EJBInvocationUtil.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/EJBInvocationUtil.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- EJBInvocationUtil.java	28 Aug 2003 05:12:10 -0000	1.6
  +++ EJBInvocationUtil.java	8 Sep 2003 04:28:26 -0000	1.7
  @@ -60,8 +60,8 @@
   import java.lang.reflect.Method;
   import java.security.Principal;
   
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationKey;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationKey;
   
   /**
    *
  @@ -151,7 +151,7 @@
       }
   
       /**
  -     * @see org.apache.geronimo.common.InvocationKey#isTransient()
  +     * @see org.apache.geronimo.core.service.InvocationKey#isTransient()
        */
       public boolean isTransient() {
           return isTransient;
  
  
  
  1.6       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/EJBProxyFactoryManager.java
  
  Index: EJBProxyFactoryManager.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/EJBProxyFactoryManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EJBProxyFactoryManager.java	15 Aug 2003 14:12:19 -0000	1.5
  +++ EJBProxyFactoryManager.java	8 Sep 2003 04:28:26 -0000	1.6
  @@ -60,8 +60,8 @@
   import java.util.Map;
   import javax.ejb.EJBException;
   
  -import org.apache.geronimo.common.AbstractComponent;
  -import org.apache.geronimo.common.RPCContainer;
  +import org.apache.geronimo.core.service.AbstractComponent;
  +import org.apache.geronimo.core.service.RPCContainer;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   
   /**
  
  
  
  1.4       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/EnterpriseContext.java
  
  Index: EnterpriseContext.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/EnterpriseContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EnterpriseContext.java	15 Aug 2003 14:12:19 -0000	1.3
  +++ EnterpriseContext.java	8 Sep 2003 04:28:26 -0000	1.4
  @@ -57,7 +57,7 @@
   
   import javax.ejb.EnterpriseBean;
   
  -import org.apache.geronimo.common.RPCContainer;
  +import org.apache.geronimo.core.service.RPCContainer;
   
   /**
    *
  
  
  
  1.5       +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/Entrancy.java
  
  Index: Entrancy.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/Entrancy.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Entrancy.java	28 Aug 2003 05:12:10 -0000	1.4
  +++ Entrancy.java	8 Sep 2003 04:28:26 -0000	1.5
  @@ -62,9 +62,9 @@
   import javax.ejb.EJBLocalObject;
   import javax.ejb.EJBObject;
   
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationType;
  -import org.apache.geronimo.common.StringInvocationKey;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationType;
  +import org.apache.geronimo.core.service.StringInvocationKey;
   
   /**
    *
  
  
  
  1.7       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/GeronimoSessionContext.java
  
  Index: GeronimoSessionContext.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/GeronimoSessionContext.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- GeronimoSessionContext.java	27 Aug 2003 03:43:36 -0000	1.6
  +++ GeronimoSessionContext.java	8 Sep 2003 04:28:26 -0000	1.7
  @@ -72,7 +72,7 @@
   import javax.transaction.UserTransaction;
   import javax.xml.rpc.handler.MessageContext;
   
  -import org.apache.geronimo.common.RPCContainer;
  +import org.apache.geronimo.core.service.RPCContainer;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   import org.apache.geronimo.ejb.context.GeronimoUserTransaction;
   import org.apache.geronimo.ejb.metadata.EJBMetadata;
  
  
  
  1.5       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/SimpleEnterpriseContext.java
  
  Index: SimpleEnterpriseContext.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/SimpleEnterpriseContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleEnterpriseContext.java	15 Aug 2003 14:12:19 -0000	1.4
  +++ SimpleEnterpriseContext.java	8 Sep 2003 04:28:26 -0000	1.5
  @@ -57,7 +57,7 @@
   
   import javax.ejb.EnterpriseBean;
   
  -import org.apache.geronimo.common.RPCContainer;
  +import org.apache.geronimo.core.service.RPCContainer;
   
   /**
    *
  
  
  
  1.9       +5 -5      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/StatelessLifeCycleInterceptor.java
  
  Index: StatelessLifeCycleInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/StatelessLifeCycleInterceptor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- StatelessLifeCycleInterceptor.java	27 Aug 2003 03:43:36 -0000	1.8
  +++ StatelessLifeCycleInterceptor.java	8 Sep 2003 04:28:26 -0000	1.9
  @@ -60,10 +60,10 @@
   import javax.ejb.EJBLocalObject;
   import javax.ejb.EJBObject;
   
  -import org.apache.geronimo.common.AbstractInterceptor;
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationResult;
  -import org.apache.geronimo.common.SimpleInvocationResult;
  +import org.apache.geronimo.core.service.AbstractInterceptor;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationResult;
  +import org.apache.geronimo.core.service.SimpleInvocationResult;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   import org.apache.geronimo.ejb.metadata.EJBMetadata;
   
  
  
  
  1.5       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/SynchronizationRegistry.java
  
  Index: SynchronizationRegistry.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/SynchronizationRegistry.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SynchronizationRegistry.java	15 Aug 2003 14:12:19 -0000	1.4
  +++ SynchronizationRegistry.java	8 Sep 2003 04:28:26 -0000	1.5
  @@ -68,7 +68,7 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.geronimo.common.RPCContainer;
  +import org.apache.geronimo.core.service.RPCContainer;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   import org.apache.geronimo.ejb.context.ExecutionContext;
   import org.apache.geronimo.ejb.context.TxExecutionContext;
  
  
  
  1.8       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/container/ContainerImpl.java
  
  Index: ContainerImpl.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/container/ContainerImpl.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ContainerImpl.java	16 Aug 2003 23:16:46 -0000	1.7
  +++ ContainerImpl.java	8 Sep 2003 04:28:27 -0000	1.8
  @@ -55,7 +55,7 @@
    */
   package org.apache.geronimo.ejb.container;
   
  -import org.apache.geronimo.common.AbstractRPCContainer;
  +import org.apache.geronimo.core.service.AbstractRPCContainer;
   
   /**
    *
  
  
  
  1.6       +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/container/EJBContainerUtil.java
  
  Index: EJBContainerUtil.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/container/EJBContainerUtil.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EJBContainerUtil.java	28 Aug 2003 05:12:10 -0000	1.5
  +++ EJBContainerUtil.java	8 Sep 2003 04:28:27 -0000	1.6
  @@ -60,8 +60,8 @@
   import java.lang.reflect.Method;
   import java.security.Principal;
   
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationKey;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationKey;
   
   /**
    *
  @@ -139,7 +139,7 @@
       }
   
       /**
  -     * @see org.apache.geronimo.common.InvocationKey#isTransient()
  +     * @see org.apache.geronimo.core.service.InvocationKey#isTransient()
        */
       public boolean isTransient() {
           return false;
  
  
  
  1.5       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/container/EJBPlugins.java
  
  Index: EJBPlugins.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/container/EJBPlugins.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EJBPlugins.java	15 Aug 2003 14:12:19 -0000	1.4
  +++ EJBPlugins.java	8 Sep 2003 04:28:27 -0000	1.5
  @@ -60,7 +60,7 @@
   import org.apache.geronimo.cache.InstanceCache;
   import org.apache.geronimo.cache.InstanceFactory;
   import org.apache.geronimo.cache.InstancePool;
  -import org.apache.geronimo.common.RPCContainer;
  +import org.apache.geronimo.core.service.RPCContainer;
   import org.apache.geronimo.ejb.EJBProxyFactoryManager;
   import org.apache.geronimo.ejb.metadata.EJBMetadata;
   import org.apache.geronimo.lock.LockDomain;
  
  
  
  1.8       +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/CMTInterceptor.java
  
  Index: CMTInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/CMTInterceptor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CMTInterceptor.java	26 Aug 2003 22:11:23 -0000	1.7
  +++ CMTInterceptor.java	8 Sep 2003 04:28:27 -0000	1.8
  @@ -65,9 +65,9 @@
   import javax.transaction.Transaction;
   import javax.transaction.TransactionRequiredException;
   
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationResult;
  -import org.apache.geronimo.common.InvocationType;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationResult;
  +import org.apache.geronimo.core.service.InvocationType;
   import org.apache.geronimo.ejb.EJBInvocationUtil;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   import org.apache.geronimo.ejb.metadata.EJBMetadata;
  
  
  
  1.7       +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/ExecutionContextInterceptor.java
  
  Index: ExecutionContextInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/ExecutionContextInterceptor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ExecutionContextInterceptor.java	26 Aug 2003 22:11:23 -0000	1.6
  +++ ExecutionContextInterceptor.java	8 Sep 2003 04:28:27 -0000	1.7
  @@ -59,9 +59,9 @@
   import javax.transaction.Transaction;
   import javax.transaction.TransactionManager;
   
  -import org.apache.geronimo.common.AbstractInterceptor;
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationResult;
  +import org.apache.geronimo.core.service.AbstractInterceptor;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationResult;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   
   /**
  
  
  
  1.6       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/StatefulBMTInterceptor.java
  
  Index: StatefulBMTInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/StatefulBMTInterceptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StatefulBMTInterceptor.java	26 Aug 2003 22:11:23 -0000	1.5
  +++ StatefulBMTInterceptor.java	8 Sep 2003 04:28:27 -0000	1.6
  @@ -60,8 +60,8 @@
   import javax.ejb.EJBException;
   import javax.transaction.Transaction;
   
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationResult;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationResult;
   import org.apache.geronimo.ejb.EJBInvocationUtil;
   
   /**
  
  
  
  1.10      +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/StatelessBMTInterceptor.java
  
  Index: StatelessBMTInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/StatelessBMTInterceptor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- StatelessBMTInterceptor.java	28 Aug 2003 13:32:09 -0000	1.9
  +++ StatelessBMTInterceptor.java	8 Sep 2003 04:28:27 -0000	1.10
  @@ -62,9 +62,9 @@
   import javax.transaction.SystemException;
   import javax.transaction.Transaction;
   
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationResult;
  -import org.apache.geronimo.common.InvocationType;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationResult;
  +import org.apache.geronimo.core.service.InvocationType;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   
   /**
  
  
  
  1.13      +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/TransactionInterceptor.java
  
  Index: TransactionInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/TransactionInterceptor.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- TransactionInterceptor.java	26 Aug 2003 22:11:23 -0000	1.12
  +++ TransactionInterceptor.java	8 Sep 2003 04:28:27 -0000	1.13
  @@ -55,9 +55,9 @@
    */
   package org.apache.geronimo.ejb.context;
   
  -import org.apache.geronimo.common.AbstractInterceptor;
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationResult;
  +import org.apache.geronimo.core.service.AbstractInterceptor;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationResult;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   import org.apache.geronimo.ejb.metadata.EJBMetadata;
   
  
  
  
  1.9       +6 -6      incubator-geronimo/modules/core/src/java/org/apache/geronimo/lock/LockInterceptor.java
  
  Index: LockInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/lock/LockInterceptor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- LockInterceptor.java	26 Aug 2003 22:11:24 -0000	1.8
  +++ LockInterceptor.java	8 Sep 2003 04:28:27 -0000	1.9
  @@ -58,11 +58,11 @@
   import java.rmi.RemoteException;
   import javax.ejb.EJBException;
   
  -import org.apache.geronimo.common.AbstractInterceptor;
  -import org.apache.geronimo.common.RPCContainer;
  -import org.apache.geronimo.common.Invocation;
  -import org.apache.geronimo.common.InvocationResult;
  -import org.apache.geronimo.common.InvocationType;
  +import org.apache.geronimo.core.service.AbstractInterceptor;
  +import org.apache.geronimo.core.service.RPCContainer;
  +import org.apache.geronimo.core.service.Invocation;
  +import org.apache.geronimo.core.service.InvocationResult;
  +import org.apache.geronimo.core.service.InvocationType;
   import org.apache.geronimo.ejb.EJBInvocationUtil;
   import org.apache.geronimo.ejb.container.EJBPlugins;
   import org.apache.geronimo.ejb.context.ExecutionContext;