You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@locus.apache.org on 2000/09/10 01:15:35 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/task ApacheConfig.java IISConfig.java NSConfig.java
costin 00/09/09 16:15:35
Modified: src/share/org/apache/tomcat/task ApacheConfig.java
IISConfig.java NSConfig.java
Log:
Changed the location of jk and jserv files - now it's conf/jk, conf/jserv.
I don't know if this is the best location, but it's a step forward ( IMHO ).
( the pattern is similar with /etc, /etc/mail, /etc/www, etc organization -
each "component" have a directory ).
( I am happy with any conf/ organization that groups the files somehow -
please change it or -1 if you want )
Revision Changes Path
1.15 +3 -3 jakarta-tomcat/src/share/org/apache/tomcat/task/ApacheConfig.java
Index: ApacheConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/ApacheConfig.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ApacheConfig.java 2000/08/28 03:06:07 1.14
+++ ApacheConfig.java 2000/09/09 23:15:34 1.15
@@ -76,9 +76,9 @@
*/
public class ApacheConfig { // implements XXX
// XXX maybe conf/
- public static final String APACHE_CONFIG = "/conf/tomcat-apache.conf";
- public static final String MOD_JK_CONFIG = "/conf/mod_jk.conf";
- public static final String WORKERS_CONFIG = "/conf/workers.properties";
+ public static final String APACHE_CONFIG = "/conf/jserv/tomcat-apache.conf";
+ public static final String MOD_JK_CONFIG = "/conf/jk/mod_jk.conf";
+ public static final String WORKERS_CONFIG = "/conf/jk/workers.properties";
public static final String JK_LOG_LOCATION = "/logs/mod_jk.log";
public ApacheConfig() {
1.4 +3 -3 jakarta-tomcat/src/share/org/apache/tomcat/task/IISConfig.java
Index: IISConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/IISConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IISConfig.java 2000/07/11 03:49:01 1.3
+++ IISConfig.java 2000/09/09 23:15:34 1.4
@@ -73,10 +73,10 @@
*/
public class IISConfig { // implements XXX
- public static final String WORKERS_CONFIG = "/conf/workers.properties";
- public static final String URL_WORKERS_MAP_CONFIG = "/conf/uriworkermap.properties";
+ public static final String WORKERS_CONFIG = "/conf/jk/workers.properties";
+ public static final String URL_WORKERS_MAP_CONFIG = "/conf/jk/uriworkermap.properties";
public static final String JK_LOG_LOCATION = "/logs/iis_redirect.log";
- public static final String IIS_REG_FILE = "/conf/iis_redirect.reg";
+ public static final String IIS_REG_FILE = "/conf/jk/iis_redirect.reg";
public IISConfig()
{
1.4 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/task/NSConfig.java
Index: NSConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/task/NSConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NSConfig.java 2000/07/11 03:49:01 1.3
+++ NSConfig.java 2000/09/09 23:15:34 1.4
@@ -73,8 +73,8 @@
*/
public class NSConfig { // implements XXX
- public static final String WORKERS_CONFIG = "/conf/workers.properties";
- public static final String NS_CONFIG = "/conf/obj.conf";
+ public static final String WORKERS_CONFIG = "/conf/jk/workers.properties";
+ public static final String NS_CONFIG = "/conf/jk/obj.conf";
public static final String JK_LOG_LOCATION = "/logs/netscape_redirect.log";
Logger.Helper loghelper = new Logger.Helper("tc_log", this);