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/modules/config ApacheConfig.java
Date Wed, 14 Mar 2001 07:29:45 GMT
larryi      01/03/13 23:29:45

  Modified:    src/share/org/apache/tomcat/modules/config ApacheConfig.java
  Log:
  If the absolute path to mod_jserv or mod_jk doesn't exist, use relative path.
  This restores previous behavior if just <ApacheConfig /> is added to
  the server.xml.
  
  Revision  Changes    Path
  1.9       +8 -2      jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ApacheConfig.java
  
  Index: ApacheConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ApacheConfig.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ApacheConfig.java	2001/03/13 22:54:33	1.8
  +++ ApacheConfig.java	2001/03/14 07:29:45	1.9
  @@ -1,4 +1,4 @@
  -/* $Id: ApacheConfig.java,v 1.8 2001/03/13 22:54:33 melaquias Exp $
  +/* $Id: ApacheConfig.java,v 1.9 2001/03/14 07:29:45 larryi Exp $
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
  @@ -112,7 +112,7 @@
       <p>
       @author Costin Manolache
       @author Mel Martinez
  -	@version $Revision: 1.8 $ $Date: 2001/03/13 22:54:33 $
  +	@version $Revision: 1.9 $ $Date: 2001/03/14 07:29:45 $
    */
   public class ApacheConfig  extends BaseInterceptor { 
       
  @@ -439,6 +439,7 @@
           will try first to resolve it absolutely 
           against the return value of getConfigHome().  If that is null, then
           it instead will resolve against the current user.dir.
  +        If this file doesn't exist, the relative path is returned.
           <p>
           @return a File object with the path to the mod_jserv.so file.
       */
  @@ -453,6 +454,8 @@
               }else{//resolve against user.dir
                   jservF = new File(jservF.getAbsolutePath());
               }
  +	    if( !jservF.exists() )
  +		jservF = modJserv;
           }
          return jservF;
       }
  @@ -479,6 +482,7 @@
           will try first to resolve it absolutely 
           against the return value of getConfigHome().  If that is null, then
           it instead will resolve against the current user.dir.
  +        If this file doesn't exist, the relative path is returned.
           <p>
           @return a File object with the path to the mod_jk.so file.
       */
  @@ -493,6 +497,8 @@
               }else{//resolve against user.dir
                   jkF = new File(jkF.getAbsolutePath());
               }
  +	    if( !jkF.exists() )
  +		jkF = modJk;
           }
          return jkF;
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, email: tomcat-dev-help@jakarta.apache.org


Mime
View raw message