Return-Path: Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 47379 invoked by uid 500); 16 Oct 2000 01:59:24 -0000 Delivered-To: apmail-jakarta-tomcat-cvs@apache.org Received: (qmail 47372 invoked by uid 1163); 16 Oct 2000 01:59:24 -0000 Date: 16 Oct 2000 01:59:23 -0000 Message-ID: <20001016015923.47371.qmail@locus.apache.org> From: larryi@locus.apache.org To: jakarta-tomcat-cvs@apache.org Subject: cvs commit: jakarta-tomcat/src/etc wrapper.properties workers.properties obj.conf jni_workers.properties larryi 00/10/15 18:59:23 Modified: src/etc Tag: tomcat_32 wrapper.properties workers.properties obj.conf jni_workers.properties Log: Update to be more relavent to Tomcat 3.2. For example, using jaxp.jar and parser.jar instead of xml.jar, and using the logs directory. Modified default settings for location of JDK and Tomcat. Now assumes JDK is installed in the default location, for example c:\jdk1.2.2, and Tomcat is unzipped to the root of the same drive, i.e. c:\jakarta-tomcat. Revision Changes Path No revision No revision 1.2.2.1 +7 -6 jakarta-tomcat/src/etc/Attic/wrapper.properties Index: wrapper.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/etc/Attic/wrapper.properties,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- wrapper.properties 2000/06/12 09:46:00 1.2 +++ wrapper.properties 2000/10/16 01:59:22 1.2.2.1 @@ -1,7 +1,7 @@ # -# $Header: /home/cvs/jakarta-tomcat/src/etc/Attic/wrapper.properties,v 1.2 2000/06/12 09:46:00 shachor Exp $ -# $Revision: 1.2 $ -# $Date: 2000/06/12 09:46:00 $ +# $Header: /home/cvs/jakarta-tomcat/src/etc/Attic/wrapper.properties,v 1.2.2.1 2000/10/16 01:59:22 larryi Exp $ +# $Revision: 1.2.2.1 $ +# $Date: 2000/10/16 01:59:22 $ # # # jk_service.properties - a bootstrup file for the Tomcat NT service. @@ -47,8 +47,8 @@ # output of Tomcat. This is where System.out.println and # System.err.println goes to. # -wrapper.stdout=$(wrapper.tomcat_home)\jvm.stdout -wrapper.stderr=$(wrapper.tomcat_home)\jvm.stderr +wrapper.stdout=$(wrapper.tomcat_home)\logs\jvm.stdout +wrapper.stderr=$(wrapper.tomcat_home)\logs\jvm.stderr # # Additions to the path. put here directories where you store DLLs for @@ -65,7 +65,8 @@ # claspath you should add a new wrapper.class_path= line. # wrapper.class_path=$(wrapper.tomcat_home)\classes -wrapper.class_path=$(wrapper.tomcat_home)\lib\xml.jar +wrapper.class_path=$(wrapper.tomcat_home)\lib\jaxp.jar +wrapper.class_path=$(wrapper.tomcat_home)\lib\parser.jar wrapper.class_path=$(wrapper.tomcat_home)\lib\webserver.jar wrapper.class_path=$(wrapper.tomcat_home)\lib\servlet.jar wrapper.class_path=$(wrapper.tomcat_home)\lib\jasper.jar 1.3.2.2 +7 -6 jakarta-tomcat/src/etc/Attic/workers.properties Index: workers.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/etc/Attic/workers.properties,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- workers.properties 2000/09/04 21:12:30 1.3.2.1 +++ workers.properties 2000/10/16 01:59:22 1.3.2.2 @@ -1,7 +1,7 @@ # -# $Header: /home/cvs/jakarta-tomcat/src/etc/Attic/workers.properties,v 1.3.2.1 2000/09/04 21:12:30 larryi Exp $ -# $Revision: 1.3.2.1 $ -# $Date: 2000/09/04 21:12:30 $ +# $Header: /home/cvs/jakarta-tomcat/src/etc/Attic/workers.properties,v 1.3.2.2 2000/10/16 01:59:22 larryi Exp $ +# $Revision: 1.3.2.2 $ +# $Date: 2000/10/16 01:59:22 $ # # # workers.properties - @@ -40,13 +40,13 @@ # installed tomcat. This is where you have your conf, webapps and lib # directories. # -workers.tomcat_home=d:\Jakarta\build\tomcat +workers.tomcat_home=c:\jakarta-tomcat # # workers.java_home should point to your Java installation. Normally # you should have a bin and lib directories beneath it. # -workers.java_home=d:\sdk\jdk1.2.2 +workers.java_home=c:\jdk1.2.2 # # You should configure your environment slash... ps=\ on NT and / on UNIX @@ -122,7 +122,7 @@ # The loadbalancer (type lb) workers perform wighted round-robin # load balancing with sticky sessions. # Note: -# ----> If a worker die the load balancer will check its state +# ----> If a worker dies, the load balancer will check its state # once in a while. Until then all work is redirected to peer # workers. worker.loadbalancer.type=lb @@ -170,6 +170,7 @@ # # Setting the command line for tomcat +# Note: The cmd_line string may not contain spaces. # worker.inprocess.cmd_line=-config worker.inprocess.cmd_line=$(workers.tomcat_home)/conf/jni_server.xml 1.1.4.1 +3 -3 jakarta-tomcat/src/etc/Attic/obj.conf Index: obj.conf =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/etc/Attic/obj.conf,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -u -r1.1 -r1.1.4.1 --- obj.conf 2000/03/25 03:35:24 1.1 +++ obj.conf 2000/10/16 01:59:22 1.1.4.1 @@ -5,8 +5,8 @@ # # Initializing the redirector # -Init fn="load-modules" funcs="jk_init,jk_service" shlib="d:/tomcat/bin/netscape/nt4/i386/nsapi_redirect.dll" -Init fn="jk_init" worker_file="d:/tomcat/conf/workers.properties" log_level="debug" log_file="d:/tomcat/nsapi.log" +Init fn="load-modules" funcs="jk_init,jk_service" shlib="c:/jakarta-tomcat/bin/win32/i386/nsapi_redirect.dll" +Init fn="jk_init" worker_file="c:/jakarta-tomcat/conf/workers.properties" log_level="debug" log_file="c:/jakarta-tomcat/logs/nsapi.log" # @@ -19,7 +19,7 @@ # # NameTrans fn="assign-name" from="/examples/jsp/*.jsp" name="servlet" # NameTrans fn="assign-name" from="/examples/servlet/*" name="servlet" -# NameTrans fn=pfx2dir from=/examples dir="d:/tomcat/examples" +# NameTrans fn=pfx2dir from=/examples dir="c:/jakarta-tomcat/webapps/examples" NameTrans fn=pfx2dir from=/ns-icons dir="d:/web-servers/ent3.6/ns-icons" NameTrans fn=pfx2dir from=/mc-icons dir="d:/web-servers/ent3.6/ns-icons" 1.2.4.1 +18 -17 jakarta-tomcat/src/etc/Attic/jni_workers.properties Index: jni_workers.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/etc/Attic/jni_workers.properties,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -r1.2 -r1.2.4.1 --- jni_workers.properties 2000/03/29 09:20:36 1.2 +++ jni_workers.properties 2000/10/16 01:59:22 1.2.4.1 @@ -5,9 +5,9 @@ # You will probably need to update your tomcat # root directory and JVM library path # -# You should begin by replacing any occurrence of d:\tomcat with +# You should begin by replacing any occurrence of c:\jakarta-tomcat with # your own tomcat root. Following that replace path starting with -# d:\sdk\jdk1.2.2\ with your own java home. +# c:\jdk1.2.2\ with your own java home. # worker.list=jni @@ -16,42 +16,43 @@ # # Additional class path components. # -worker.jni.class_path=d:\tomcat\classes -worker.jni.class_path=d:\tomcat\lib\xml.jar -worker.jni.class_path=d:\tomcat\lib\jasper.jar -worker.jni.class_path=d:\tomcat\lib\servlet.jar -worker.jni.class_path=d:\tomcat\lib\webserver.jar -worker.jni.class_path=d:\sdk\jdk1.2.2\lib\tools.jar -# worker.jni.class_path=d:\SQLLIB\java\db2java.zip +worker.jni.class_path=c:\jakarta-tomcat\classes +worker.jni.class_path=c:\jakarta-tomcat\lib\jaxp.jar +worker.jni.class_path=c:\jakarta-tomcat\lib\parser.jar +worker.jni.class_path=c:\jakarta-tomcat\lib\jasper.jar +worker.jni.class_path=c:\jakarta-tomcat\lib\servlet.jar +worker.jni.class_path=c:\jakarta-tomcat\lib\webserver.jar +worker.jni.class_path=c:\jdk1.2.2\lib\tools.jar +# worker.jni.class_path=c:\SQLLIB\java\db2java.zip # # Setting the command line for tomcat # worker.jni.cmd_line=-config -worker.jni.cmd_line=d:\tomcat\conf\jni_server.xml +worker.jni.cmd_line=c:\jakarta-tomcat\conf\jni_server.xml # # The JVM that we are about to use # # This is for jdk1.2.x # -worker.jni.jvm_lib=d:\sdk\jdk1.2.2\jre\bin\classic\jvm.dll +worker.jni.jvm_lib=c:\jdk1.2.2\jre\bin\classic\jvm.dll # -# And this is for jdk1.1.7 +# And this is for jdk1.1.x # -#worker.jni.jvm_lib=d:\sdk\jdk1.1.7\bin\javai.dll +#worker.jni.jvm_lib=c:\jdk1.1.8\bin\javai.dll # # # Setting the place for the stdout and stderr of tomcat # -worker.jni.stdout=d:\tomcat\jvm.stdout -worker.jni.stderr=d:\tomcat\jvm.stderr +worker.jni.stdout=c:\jakarta-tomcat\logs\jvm.stdout +worker.jni.stderr=c:\jakarta-tomcat\logs\jvm.stderr # # Setting the tomcat.home Java property # -worker.jni.sysprops=tomcat.home=D:\tomcat\ +worker.jni.sysprops=tomcat.home=c:\jakarta-tomcat # # Java system properties @@ -62,7 +63,7 @@ # # Additional path components. # -# worker.jni.ld_path=d:\SQLLIB\bin +# worker.jni.ld_path=c:\SQLLIB\bin #