[jBoss-Dev] CVS update: jboss/src/main/org/jboss/ejbContainerFactory.java

[jBoss CVS Development]

  User: oberg   
  Date: 00/05/31 00:24:06

  Modified:    src/main/org/jboss/ejb ContainerFactory.java
  Log:
  Fixed hot deployment of .jar file (!!!!!)
  
  Revision  Changes    Path
  1.11      +14 -3     jboss/src/main/org/jboss/ejb/ContainerFactory.java
  
  Index: ContainerFactory.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/ContainerFactory.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ContainerFactory.java     2000/05/30 18:32:16     1.10
  +++ ContainerFactory.java     2000/05/31 07:24:05     1.11
  @@ -59,7 +59,7 @@
    *   @see Container
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *   @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  - *   @version $Revision: 1.10 $
  + *   @version $Revision: 1.11 $
    */
   public class ContainerFactory
      implements ContainerFactoryMBean, MBeanRegistration
  @@ -151,10 +151,21 @@
            beanCtx.add(efm);
            
            // Load XML
  -         jBossEjbJar jar = efm.load(url);
  +                     jBossEjbJar jar;
  +                     if (url.getProtocol().startsWith("file"))
  +                     {
  +                             // This will copy the jar first so it isn't locked by 
the CL
  +                             efm.load(new File(url.getFile()));
  +                             jar = efm.getEjbJar();
  +                     }
  +                     else
  +                     {
  +                             jar = efm.load(url);
  +                     }
                        
                        // Create classloader for this application
  -         ClassLoader cl = new EJBClassLoader(new URL[] {url}, 
getClass().getClassLoader(), jar.isSecure());
  +//         ClassLoader cl = new EJBClassLoader(new URL[] {url}, 
getClass().getClassLoader(), jar.isSecure());
  +         ClassLoader cl = efm.getClassLoader();
            
                        // Get list of beans for which we will create containers
            Iterator beans = jar.getEnterpriseBeans().iterator();