Return-Path: <costin@apache.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 37666 invoked by uid 500); 6 Feb 2001 06:44:00 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Received: (qmail 37661 invoked by uid 1052); 6 Feb 2001 06:43:59 -0000
Date: 6 Feb 2001 06:43:59 -0000
Message-ID: <20010206064359.37660.qmail@apache.org>
From: costin@apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config
 PathSetter.java

costin      01/02/05 22:43:59

  Modified:    src/share/org/apache/tomcat/modules/config PathSetter.java
  Log:
  Better messages in pathsetter.
  home will be displayed, but installDir only if different, also
  simpler message.
  
  Revision  Changes    Path
  1.4       +7 -4      jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PathSetter.java
  
  Index: PathSetter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PathSetter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PathSetter.java	2001/02/03 05:22:19	1.3
  +++ PathSetter.java	2001/02/06 06:43:59	1.4
  @@ -126,13 +126,11 @@
   	// Make it absolute
   	home=FileUtil.getCanonicalPath( home );
   	cm.setHome( home );
  -	log( "engineInit: home= " + home );
   	
   	String installDir=cm.getInstallDir();
   	if( installDir!= null ) {
   	    installDir=FileUtil.getCanonicalPath( installDir );
   	    cm.setInstallDir( installDir );
  -	    log( "engineInit: install= " + installDir );
   	}
   
   	// if only one is set home==installDir
  @@ -179,8 +177,13 @@
   	}
   	cm.setWorkDir( workDir );
   
  -	if(debug>1) log( "Setting: " + cm.getInstallDir() + " " +
  -			 cm.getHome() + " " + workDir);
  +	if( debug>0 ||
  +	    ! cm.getHome().equals( cm.getInstallDir() ) ) {
  +	    log( "install=" + cm.getInstallDir());
  +	}
  +	log( "home=" +  cm.getHome());
  +	if( debug>0)
  +	    log( " work=" + workDir);
       }
   
       /** Adjust paths for a context - make the base and all loggers