remm 2002/10/26 05:29:56
Modified: catalina/src/share/org/apache/catalina/startup
Bootstrap.java Catalina.java
Log:
- Fix service functionality.
Revision Changes Path
1.7 +7 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Bootstrap.java 24 Oct 2002 22:06:04 -0000 1.6
+++ Bootstrap.java 26 Oct 2002 12:29:56 -0000 1.7
@@ -86,6 +86,7 @@
* class path and therefore not visible to application level classes.
*
* @author Craig R. McClanahan
+ * @author Remy Maucherat
* @version $Revision$ $Date$
*/
@@ -358,9 +359,11 @@
try {
String command = args[0];
if (command.equals("startd")) {
+ args[0] = "start";
daemon.load(args);
daemon.start();
} else if (command.equals("stopd")) {
+ args[0] = "stop";
daemon.stop();
} else if (command.equals("start")) {
daemon.setAwait(true);
1.9 +5 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
Index: Catalina.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Catalina.java 24 Oct 2002 22:06:04 -0000 1.8
+++ Catalina.java 26 Oct 2002 12:29:56 -0000 1.9
@@ -98,6 +98,7 @@
* </u>
*
* @author Craig R. McClanahan
+ * @author Remy Maucherat
* @version $Revision$ $Date$
*/
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
