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

[dblevins]

dblevins    2005/09/20 19:58:27

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

  Fix for OPENEJB-66 -- Ignored system properties
  
  Revision  Changes    Path
  1.6       +7 -7      
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SystemInstance.java       12 Jul 2005 23:51:16 -0000      1.5
  +++ SystemInstance.java       20 Sep 2005 23:58:27 -0000      1.6
  @@ -76,15 +76,15 @@
           this.properties.putAll(System.getProperties());
           this.properties.putAll(properties);
           
  -        this.home = new FileUtils("openejb.home", "user.dir", properties);
  -        this.base = new FileUtils("openejb.base", "openejb.home", 
properties);
  -        this.classPath = 
ClassPathFactory.createClassPath(properties.getProperty("openejb.loader", 
"context"));
  +        this.home = new FileUtils("openejb.home", "user.dir", 
this.properties);
  +        this.base = new FileUtils("openejb.base", "openejb.home", 
this.properties);
  +        this.classPath = 
ClassPathFactory.createClassPath(this.properties.getProperty("openejb.loader", 
"context"));
           this.classLoader = classPath.getClassLoader();
   
           // TODO Setup the jar url handler too
   
  -        properties.setProperty("openejb.home", 
home.getDirectory().getCanonicalPath());
  -        properties.setProperty("openejb.base", 
base.getDirectory().getCanonicalPath());
  +        this.properties.setProperty("openejb.home", 
home.getDirectory().getCanonicalPath());
  +        this.properties.setProperty("openejb.base", 
base.getDirectory().getCanonicalPath());
       }