[openejb-scm] openejb1/modules/core/src/java/org/openejb/loader EmbeddedLoader.java SystemInstance.java TomcatWebappLoader.java

[dblevins]

dblevins    2005/07/09 05:46:29

  Modified:    modules/core/src/java/org/openejb/loader EmbeddedLoader.java
                        SystemInstance.java TomcatWebappLoader.java
  Log:

  Magic bit that should make per-webapp work better now
  
  Revision  Changes    Path
  1.4       +8 -3      
openejb1/modules/core/src/java/org/openejb/loader/EmbeddedLoader.java
  
  Index: EmbeddedLoader.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/EmbeddedLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EmbeddedLoader.java       16 Jun 2005 22:29:51 -0000      1.3
  +++ EmbeddedLoader.java       9 Jul 2005 09:46:29 -0000       1.4
  @@ -44,7 +44,10 @@
    */
   package org.openejb.loader;
   
  -import java.util.Hashtable;
import java.util.Properties;

import org.openejb.EnvProps;
  +import java.util.Hashtable;
  +import java.util.Properties;
  +
  +import org.openejb.EnvProps;
   
   /**
    * 
  @@ -65,7 +68,9 @@
       
               //  Override defauls again with Env properties
               props.putAll( env );
  -    
  +
  +            SystemInstance.init(props);
  +
               org.openejb.OpenEJB.init( props );
       
           } catch( Exception e){
  
  
  
  1.4       +1 -1      
openejb1/modules/core/src/java/org/openejb/loader/SystemInstance.java
  
  Index: SystemInstance.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/SystemInstance.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SystemInstance.java       9 Jul 2005 09:28:24 -0000       1.3
  +++ SystemInstance.java       9 Jul 2005 09:46:29 -0000       1.4
  @@ -71,10 +71,10 @@
       private final ClassPath classPath;
   
       private SystemInstance(Properties properties) throws Exception {
  +        this.components = new HashMap();
           this.properties = properties;
           this.home = new FileUtils("openejb.home", "user.dir", properties);
           this.base = new FileUtils("openejb.base", "openejb.home", 
properties);
  -        this.components = new HashMap();
           classPath = 
ClassPathFactory.createLoader(properties.getProperty("openejb.loader", 
"context"));
       }
   
  
  
  
  1.10      +5 -3      
openejb1/modules/core/src/java/org/openejb/loader/TomcatWebappLoader.java
  
  Index: TomcatWebappLoader.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/TomcatWebappLoader.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TomcatWebappLoader.java   9 Jul 2005 09:28:24 -0000       1.9
  +++ TomcatWebappLoader.java   9 Jul 2005 09:46:29 -0000       1.10
  @@ -74,6 +74,10 @@
       public void load( Hashtable env ) throws Exception{
           if (loaded) return;
   
  +        Properties properties = new Properties();
  +        properties.putAll(env);
  +        SystemInstance.init(properties);
  +
           ClassLoader cl = getContextClassLoader();
           try{
               cl.loadClass("org.openejb.OpenEJB");
  @@ -106,8 +110,6 @@
   
       // Sets the openejb.home system variable
       private void importOpenEJBLibraries(  Hashtable env ) throws Exception{
  -        // Sets the openejb.home system variable
  -
           try{
               // Loads all the libraries in the openejb.home/lib directory
               addJarsToPath("lib");