cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup EmbededTomcat.java

[costin]

costin      01/09/08 19:01:56

  Modified:    src/share/org/apache/tomcat/startup EmbededTomcat.java
  Log:
  Bug 3483: install.dir and home.dir not working as expected ( however setting 
tomcat.home
  in server.xml did work fine - and is the best way to set multi-homed tomcat ).
  
  Bug reported by Ben Kelley
  
  Submitted by:  [EMAIL PROTECTED]
  
  Revision  Changes    Path
  1.54      +6 -7      
jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java
  
  Index: EmbededTomcat.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/EmbededTomcat.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- EmbededTomcat.java        2001/09/09 00:46:28     1.53
  +++ EmbededTomcat.java        2001/09/09 02:01:56     1.54
  @@ -22,7 +22,7 @@
      lib/common, and without lib/container. It'll deal with setting a separate
      class loader for container and applications.
   
  -   - home property must be set, or TOMCAT_HOME env.
  +   - tomcat.install or tomcat.home property must be set ( from TOMCAT_HOME env.)
   
   */
   
  @@ -388,15 +388,14 @@
        if( initialized ) return;
        if( home==null )
            home = System.getProperty("tomcat.home");
  -     if( home==null ) {
  -         IntrospectionUtils.guessInstall("tomcat.install",
  -                                         "tomcat.home","tomcat.jar");
  -         home = System.getProperty("tomcat.home");
  -         if( dL > 0 ) debug( "Guessed home " + home );
  +     if( installDir==null ) {
  +         installDir=IntrospectionUtils.guessInstall("tomcat.install",
  +                                                    "tomcat.home","tomcat.jar");
  +         if( dL > 0 ) debug( "Guessed installDir " + installDir );
        }
   
  -     contextM.setHome( home );
        if( installDir==null ) installDir=home;
  +     contextM.setInstallDir( installDir );
   
        try {
            setTomcatProperties();