[openejb-scm] openejb1/modules/core/src/java/org/openejb/alt/assembler/classic ContainerBuilder.java

[dblevins]

dblevins    2005/08/29 03:24:40

  Modified:    modules/core/src/java/org/openejb/alt/assembler/classic
                        ContainerBuilder.java
  Log:

  The ability to set openejb.home and start the remote server from outside
  openejb.home was broken.  Now fixed.
  
  Revision  Changes    Path
  1.3       +15 -3     
openejb1/modules/core/src/java/org/openejb/alt/assembler/classic/ContainerBuilder.java
  
  Index: ContainerBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/alt/assembler/classic/ContainerBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContainerBuilder.java     26 Aug 2005 21:04:51 -0000      1.2
  +++ ContainerBuilder.java     29 Aug 2005 07:24:40 -0000      1.3
  @@ -48,6 +48,7 @@
   import org.openejb.Container;
   import org.openejb.OpenEJBException;
   import org.openejb.RpcContainer;
  +import org.openejb.loader.SystemInstance;
   import org.openejb.core.DeploymentInfo;
   import org.openejb.util.Logger;
   import org.openejb.util.SafeToolkit;
  @@ -153,7 +154,18 @@
                   }
               }
   
  -            container.init(containerName, deploymentsList, clonedProps);
  +            Properties systemProperties = System.getProperties();
  +            synchronized(systemProperties) {
  +                String userDir = systemProperties.getProperty("user.dir");
  +                try{
  +                    File base = 
SystemInstance.get().getBase().getDirectory();
  +                    systemProperties.setProperty("user.dir", 
base.getAbsolutePath());
  +                    container.init(containerName, deploymentsList, 
clonedProps);
  +                } finally {
  +                    systemProperties.setProperty("user.dir",userDir);
  +                }
  +            }
  +
               return container;
           } catch (OpenEJBException e) {
               throw new 
OpenEJBException(AssemblerTool.messages.format("as0002", containerName, 
e.getMessage()));