Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 87932 invoked by uid 500); 13 Mar 2001 16:41:53 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: tomcat-dev@jakarta.apache.org Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 87920 invoked from network); 13 Mar 2001 16:41:53 -0000 Message-ID: <8940E26B14DA3E489D6E38084542C5740297E9@goldmine.ilan.net> From: Mike Braden To: tomcat-dev@jakarta.apache.org Subject: [PATCH] fix for ApacheConfig.java paths for unix Date: Tue, 13 Mar 2001 11:41:15 -0500 MIME-Version: 1.0 X-Mailer: Internet Mail Service (5.5.2650.21) Content-Type: multipart/mixed; boundary="----_=_NextPart_000_01C0ABDC.71364862" X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N ------_=_NextPart_000_01C0ABDC.71364862 Content-Type: text/plain; charset="iso-8859-1" This patch is for the ApacheConfig.java classes. It changes the static (default) paths from absolute paths to relative paths. Without this fix, the paths are not configurable from the server.xml file as intended. The conf paths also default to / - i.e. /conf/jk/ and /conf/jserv/. When using absolute paths, the TOMCAT_HOME is ignored as well as any prefix that you set in server.xml. Tested on Solaris and Windows 2000 # cvs diff -u ApacheConfig.java Index: ApacheConfig.java =================================================================== RCS file: /home/cvspublic/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/Ap acheConfig.java,v retrieving revision 1.7 diff -u -r1.7 ApacheConfig.java --- ApacheConfig.java 2001/03/05 02:56:49 1.7 +++ ApacheConfig.java 2001/03/13 16:32:59 @@ -118,13 +118,13 @@ // XXX maybe conf/ /** default path to JServ .conf location */ - public static final String APACHE_CONFIG="/conf/jserv/tomcat-apache.conf"; + public static final String APACHE_CONFIG="conf/jserv/tomcat-apache.conf"; /** default path to mod_jk .conf location */ - public static final String MOD_JK_CONFIG = "/conf/jk/mod_jk.conf"; + public static final String MOD_JK_CONFIG = "conf/jk/mod_jk.conf"; /** default path to workers.properties file */ - public static final String WORKERS_CONFIG = "/conf/jk/workers.properties"; + public static final String WORKERS_CONFIG = "conf/jk/workers.properties"; /** default mod_jk log file location */ - public static final String JK_LOG_LOCATION = "/logs/mod_jk.log"; + public static final String JK_LOG_LOCATION = "logs/mod_jk.log"; /** default location of mod_jserv Apache plug-in. */ public static final String MOD_JSERV; /** default location of mod_jk Apache plug-in. */ -- Mike Braden mbraden@utenzi.com mikeb@mwbinc.com ------_=_NextPart_000_01C0ABDC.71364862 Content-Type: application/octet-stream; name="ApacheConfig.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="ApacheConfig.patch" Index: ApacheConfig.java=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: = /home/cvspublic/jakarta-tomcat/src/share/org/apache/tomcat/modules/confi= g/ApacheConfig.java,v=0A= retrieving revision 1.7=0A= diff -u -r1.7 ApacheConfig.java=0A= --- ApacheConfig.java 2001/03/05 02:56:49 1.7=0A= +++ ApacheConfig.java 2001/03/13 16:32:59=0A= @@ -118,13 +118,13 @@=0A= // XXX maybe conf/=0A= =0A= /** default path to JServ .conf location */=0A= - public static final String = APACHE_CONFIG=3D"/conf/jserv/tomcat-apache.conf";=0A= + public static final String = APACHE_CONFIG=3D"conf/jserv/tomcat-apache.conf";=0A= /** default path to mod_jk .conf location */=0A= - public static final String MOD_JK_CONFIG =3D = "/conf/jk/mod_jk.conf";=0A= + public static final String MOD_JK_CONFIG =3D = "conf/jk/mod_jk.conf";=0A= /** default path to workers.properties file */=0A= - public static final String WORKERS_CONFIG =3D = "/conf/jk/workers.properties";=0A= + public static final String WORKERS_CONFIG =3D = "conf/jk/workers.properties";=0A= /** default mod_jk log file location */=0A= - public static final String JK_LOG_LOCATION =3D = "/logs/mod_jk.log";=0A= + public static final String JK_LOG_LOCATION =3D = "logs/mod_jk.log";=0A= /** default location of mod_jserv Apache plug-in. */=0A= public static final String MOD_JSERV;=0A= /** default location of mod_jk Apache plug-in. */=0A= ------_=_NextPart_000_01C0ABDC.71364862 Content-Type: text/plain; charset=us-ascii --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, email: tomcat-dev-help@jakarta.apache.org ------_=_NextPart_000_01C0ABDC.71364862--