[openejb-scm] openejb/modules/core/src/java/org/openejb AbstractInterceptorBuilder.java GenericEJBContainer.java InterceptorBuilder.java

[dain]

dain        2005/01/20 23:52:13

  Modified:    modules/core/src/java/org/openejb
                        AbstractInterceptorBuilder.java
                        GenericEJBContainer.java InterceptorBuilder.java
  Log:

  Added support for kernel and class loader aware jndi refernces.
  
  Revision  Changes    Path
  1.10      +8 -1      
openejb/modules/core/src/java/org/openejb/AbstractInterceptorBuilder.java
  
  Index: AbstractInterceptorBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/AbstractInterceptorBuilder.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AbstractInterceptorBuilder.java   27 Jul 2004 02:28:51 -0000      1.9
  +++ AbstractInterceptorBuilder.java   21 Jan 2005 04:52:12 -0000      1.10
  @@ -52,6 +52,7 @@
   import org.apache.geronimo.naming.java.ReadOnlyContext;
   import org.apache.geronimo.transaction.TrackedConnectionAssociator;
   import org.apache.geronimo.transaction.context.TransactionContextManager;
  +import org.apache.geronimo.kernel.Kernel;
   import org.openejb.cache.InstanceCache;
   import org.openejb.cache.InstanceFactory;
   import org.openejb.cache.InstancePool;
  @@ -81,7 +82,13 @@
       protected InstanceCache instanceCache;
       protected InstanceFactory instanceFactory;
   
  +    public void setKernel(Kernel kernel) {
  +        componentContext.setKernel(kernel);
  +    }
   
  +    public void setClassLoader(ClassLoader classLoader) {
  +        componentContext.setClassLoader(classLoader);
  +    }
       public void setContainerId(Object containerId) {
           assert (containerId != null) : "containerId is null";
           this.containerId = containerId;
  
  
  
  1.30      +3 -1      
openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java
  
  Index: GenericEJBContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- GenericEJBContainer.java  18 Jan 2005 06:12:43 -0000      1.29
  +++ GenericEJBContainer.java  21 Jan 2005 04:52:13 -0000      1.30
  @@ -162,6 +162,8 @@
           SystemMethodIndices systemMethodIndices = 
contextFactory.setSignatures(getSignatures());
   
           // build the interceptor chain
  +        interceptorBuilder.setKernel(kernel);
  +        interceptorBuilder.setClassLoader(classLoader);
           
interceptorBuilder.setTransactionContextManager(transactionContextManager);
           
interceptorBuilder.setTrackedConnectionAssociator(trackedConnectionAssociator);
           interceptorBuilder.setInstancePool(pool);
  
  
  
  1.9       +5 -2      
openejb/modules/core/src/java/org/openejb/InterceptorBuilder.java
  
  Index: InterceptorBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/InterceptorBuilder.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- InterceptorBuilder.java   27 Jul 2004 02:21:08 -0000      1.8
  +++ InterceptorBuilder.java   21 Jan 2005 04:52:13 -0000      1.9
  @@ -22,6 +22,7 @@
   import org.apache.geronimo.naming.java.ReadOnlyContext;
   import org.apache.geronimo.transaction.TrackedConnectionAssociator;
   import org.apache.geronimo.transaction.context.TransactionContextManager;
  +import org.apache.geronimo.kernel.Kernel;
   
   import org.openejb.cache.InstanceCache;
   import org.openejb.cache.InstanceFactory;
  @@ -35,6 +36,9 @@
    * @version $Revision$ $Date$
    */
   public interface InterceptorBuilder extends Serializable {
  +    void setKernel(Kernel kernel);
  +
  +    void setClassLoader(ClassLoader classLoader);
   
       void setContainerId(Object contextId);
   
  @@ -67,5 +71,4 @@
       void setInstanceFactory(InstanceFactory instanceFactory);
   
       TwoChains buildInterceptorChains();
  -
   }