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

[dblevins]

dblevins    2005/07/09 01:53:21

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

  Yanking getBase(props) and getHome(props) calls and replacing with a one-time 
call to:
    FileUtils.init(props)
  Which will reset the home and base instances.
  
  Revision  Changes    Path
  1.4       +2 -2      
openejb1/modules/core/src/java/org/openejb/loader/SystemLoader.java
  
  Index: SystemLoader.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/SystemLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SystemLoader.java 6 Jul 2005 23:42:08 -0000       1.3
  +++ SystemLoader.java 9 Jul 2005 05:53:21 -0000       1.4
  @@ -121,7 +121,7 @@
   
       private void addJarsToPath(String dir) throws Exception {
           Hashtable env = System.getProperties();
  -        File dirAtHome = FileUtils.getHome(env).getDirectory(dir);
  +        File dirAtHome = FileUtils.getHome().getDirectory(dir);
           loader.addJarsToPath(dirAtHome);
       }
   }
  
  
  
  1.5       +7 -7      
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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TomcatWebappLoader.java   6 Jul 2005 23:42:08 -0000       1.4
  +++ TomcatWebappLoader.java   9 Jul 2005 05:53:21 -0000       1.5
  @@ -46,6 +46,7 @@
   
   import java.io.File;
   import java.util.Hashtable;
  +import java.util.Properties;
   
   import org.openejb.util.ClasspathUtils;
   import org.openejb.util.FileUtils;
  @@ -107,12 +108,11 @@
       // Sets the openejb.home system variable
       private void importOpenEJBLibraries(  Hashtable env ) throws Exception{
           // Sets the openejb.home system variable
  -        try{
  -            if ( env.get("openejb.home") != null ) {
  -                System.setProperty("openejb.home", 
(String)env.get("openejb.home"));
  -            }
  -        } catch (Exception e){}
  -        
  +
  +        Properties envProperties = new Properties();
  +        envProperties.putAll(env);
  +        FileUtils.init(envProperties);
  +
           try{
               // Loads all the libraries in the openejb.home/lib directory
               addJarsToPath("lib");