tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lar...@apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup EmbededTomcat.java
Date Sun, 09 Sep 2001 21:57:32 GMT
larryi      01/09/09 14:57:32

  Modified:    src/share/org/apache/tomcat/startup EmbededTomcat.java
  Log:
  To better support separate "install" and "home" directories, establish
  "install" first, then default "home" if necessary.
  
  Revision  Changes    Path
  1.55      +7 -3      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.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- EmbededTomcat.java	2001/09/09 02:01:56	1.54
  +++ EmbededTomcat.java	2001/09/09 21:57:32	1.55
  @@ -386,16 +386,20 @@
   	throws TomcatException 
       {
   	if( initialized ) return;
  -	if( home==null )
  -	    home = System.getProperty("tomcat.home");
   	if( installDir==null ) {
   	    installDir=IntrospectionUtils.guessInstall("tomcat.install",
   						       "tomcat.home","tomcat.jar");
   	    if( dL > 0 ) debug( "Guessed installDir " + installDir );
   	}
  +	if( home==null ) {
  +	    home = System.getProperty("tomcat.home");
  +            if( home == null )
  +                home = installDir;
  +	    if( dL > 0 ) debug( "Using homeDir " + installDir );
  +        }
   
  -	if( installDir==null ) installDir=home;
   	contextM.setInstallDir( installDir );
  +        contextM.setHome( home );
   
   	try {
   	    setTomcatProperties();
  
  
  

Mime
View raw message