costin 00/11/29 23:51:44
Modified: src/native/mod_jk/apache1.3 Makefile.linux
src/share/org/apache/tomcat/resources
LocalStrings.properties
src/share/org/apache/tomcat/startup Tomcat.java
Log:
Merge few more changes from 3.2.
- change in Makefile.linux ( support external APXS definition )
- better comments on startup
( read the original commit log for more details )
Regarding startup - 3.3 will have a new ( and better !) startup mechanism,
that will remove the need for shell scripts, classpath, etc. Tomcat.java
can still be used and we keep it as a backup, in case we can't finish the
refactoring in time.
Submitted by: Paul Frieden <[EMAIL PROTECTED]>
PR: BugRat Bug Report #429
Submitted by: Ralf Suckow <[EMAIL PROTECTED]>
Revision Changes Path
1.3 +2 -0 jakarta-tomcat/src/native/mod_jk/apache1.3/Makefile.linux
Index: Makefile.linux
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/apache1.3/Makefile.linux,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.linux 2000/11/10 18:48:50 1.2
+++ Makefile.linux 2000/11/30 07:51:43 1.3
@@ -6,7 +6,9 @@
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
+#ifndef APXS
APXS=/usr/sbin/apxs
+#endif
JK=../common/
SRCS=${JK}/jk_ajp12_worker.c ${JK}/jk_connect.c ${JK}/jk_msg_buff.c ${JK}/jk_util.c
${JK}/jk_ajp13.c \
1.11 +3 -3
jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/resources/LocalStrings.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LocalStrings.properties 2000/11/06 15:11:07 1.10
+++ LocalStrings.properties 2000/11/30 07:51:43 1.11
@@ -1,4 +1,4 @@
-# $Id: LocalStrings.properties,v 1.10 2000/11/06 15:11:07 nacho Exp $
+# $Id: LocalStrings.properties,v 1.11 2000/11/30 07:51:43 costin Exp $
#
# Localized strings for package org.apache.tomcat.core
@@ -21,14 +21,14 @@
defaulterrorpage.internalservleterror=Internal Servlet Error:
#Tomcat.java
-tomcat.usage=usage:
+tomcat.usage=Usage: java org.apache.tomcat.startup.Tomcat options
tomcat.start=Tomcat started. Check {0} for error and log messages.
tomcat.loading=Loading config file
tomcat.loaded=Loaded config file
tomcat.bindexception=Another service is using the requested port (possibly another
instance of Tomcat). Please stop the other service and try again.
tomcat.fatalconfigerror=FATAL: configuration error
tomcat.nohome=No tomcat.home property, you need to set TOMCAT_HOME or add
-Dtomcat.home
-tomcat.wrongargs=Wrong arguments
+tomcat.wrongargs=Wrong arguments: type tomcat -help for valid options
tomcat.stop=Stopping Tomcat.
tomcat.fatal=FATAL:
tomcat.connectexception=Could not connect to Tomcat. It's probably already stopped.
1.44 +11 -1 jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java
Index: Tomcat.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Tomcat.java 2000/09/29 07:01:39 1.43
+++ Tomcat.java 2000/11/30 07:51:44 1.44
@@ -86,7 +86,13 @@
boolean doGenerate=false;
public static void printUsage() {
- System.out.println(sm.getString("tomcat.usage"));
+ //System.out.println(sm.getString("tomcat.usage"));
+ System.out.println("Usage: java org.apache.tomcat.startup.Tomcat {options}");
+ System.out.println(" Options are:");
+ System.out.println(" -config file (or -f file) Use this fileinstead of
server.xml");
+ System.out.println(" -help (or help) Show this usage report");
+ System.out.println(" -home dir (or -h dir) Use this directory as
tomcat.home");
+ System.out.println(" -stop Shut down currently running
Tomcat");
}
/** Process arguments - set object properties from the list of args.
@@ -107,10 +113,14 @@
i++;
if( i < args.length )
configFile = args[i];
+ else
+ return false;
} else if (arg.equals("-h") || arg.equals("-home")) {
i++;
if (i < args.length)
System.getProperties().put("tomcat.home", args[i]);
+ else
+ return false;
}
}
return true;
