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

[dain]

dain        2004/04/03 17:20:10

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

  More deployment code.
  The base structure is in, and now we just need to expand it.
  Also fixed a bunch of serialization errors.
  
  Revision  Changes    Path
  1.2       +11 -7     
openejb/modules/core/src/java/org/openejb/EJBInstanceFactoryImpl.java
  
  Index: EJBInstanceFactoryImpl.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/EJBInstanceFactoryImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EJBInstanceFactoryImpl.java       1 Mar 2004 07:14:42 -0000       1.1
  +++ EJBInstanceFactoryImpl.java       3 Apr 2004 22:20:10 -0000       1.2
  @@ -48,26 +48,26 @@
   package org.openejb;
   
   import java.lang.reflect.InvocationTargetException;
  +import java.io.Serializable;
   import javax.ejb.EnterpriseBean;
   
   import net.sf.cglib.reflect.FastClass;
  +import org.openejb.transaction.ContainerPolicy;
   
   /**
    *
    *
    * @version $Revision$ $Date$
    */
  -public class EJBInstanceFactoryImpl implements EJBInstanceFactory {
  -    private final FastClass implClass;
  +public class EJBInstanceFactoryImpl implements EJBInstanceFactory, Serializable {
  +    private final Class beanClass;
  +    private transient final FastClass implClass;
   
       public EJBInstanceFactoryImpl(Class beanClass) {
  +        this.beanClass = beanClass;
           implClass = FastClass.create(beanClass);
       }
   
  -    public EJBInstanceFactoryImpl(FastClass implClass) {
  -        this.implClass = implClass;
  -    }
  -
       public FastClass getImplClass() {
           return implClass;
       }
  @@ -86,4 +86,8 @@
               }
           }
       }
  +
  +    private Object readResolve() {
  +        return new EJBInstanceFactoryImpl(beanClass);
  +    }
   }
  
  
  
  1.3       +4 -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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GenericEJBContainer.java  1 Apr 2004 22:36:51 -0000       1.2
  +++ GenericEJBContainer.java  3 Apr 2004 22:20:10 -0000       1.3
  @@ -244,6 +244,9 @@
           infoFactory.addReference("transactionManager", TransactionManager.class);
           infoFactory.addReference("trackedConnectionAssociator", 
TrackedConnectionAssociator.class);
   
  +        infoFactory.addAttribute("EJBHome", false);
  +        infoFactory.addAttribute("EJBLocalHome", false);
  +
           GBEAN_INFO = infoFactory.getBeanInfo();
       }