tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hari...@hyperreal.org
Subject cvs commit: jakarta-tomcat/src/shell shutdown.bat shutdown.sh startup.bat startup.sh
Date Sun, 05 Dec 1999 17:02:46 GMT
harishp     99/12/05 09:02:45

  Modified:    src/share/org/apache/tomcat/core ServletClassLoader.java
               src/shell shutdown.bat shutdown.sh startup.bat startup.sh
  Removed:     src/share/org/apache/tomcat/core ServletLoader.java
  Log:
  Modified startup and shutdown scripts to use tomcat start and tomcat stop.
  Tested the scripts on unix but not on Windoz.
  Can someone test this for me on windoz?
  Removed the obsoleted classloader ServletLoader from the workspace.
  
  Revision  Changes    Path
  1.3       +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/core/ServletClassLoader.java
  
  Index: ServletClassLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletClassLoader.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServletClassLoader.java	1999/11/28 23:52:30	1.2
  +++ ServletClassLoader.java	1999/12/05 17:02:37	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletClassLoader.java,v
1.2 1999/11/28 23:52:30 harishp Exp $
  - * $Revision: 1.2 $
  - * $Date: 1999/11/28 23:52:30 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletClassLoader.java,v
1.3 1999/12/05 17:02:37 harishp Exp $
  + * $Revision: 1.3 $
  + * $Date: 1999/12/05 17:02:37 $
    *
    * ====================================================================
    *
  @@ -70,7 +70,7 @@
   
   /**
    * This class now extends NetworkClassLoader. Previous
  - * implementation of ServletClassLoader is called ServletLoader.
  + * implementation of ServletClassLoader was called ServletLoader.
    * This implementation is a complete rewrite of the earlier
    * class loader. This should speed up performance compared
    * to the earlier class loader.
  
  
  
  1.2       +3 -43     jakarta-tomcat/src/shell/shutdown.bat
  
  Index: shutdown.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/shell/shutdown.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- shutdown.bat	1999/10/09 00:20:56	1.1
  +++ shutdown.bat	1999/12/05 17:02:41	1.2
  @@ -1,45 +1,5 @@
   @echo off
  -rem $Id: shutdown.bat,v 1.1 1999/10/09 00:20:56 duncan Exp $
  -rem Startup batch file for servlet runner.
  -
  -rem This batch file written and tested under Windows NT
  -rem Improvements to this file are welcome
  -
  -set jsdkJars=.\webserver.jar;.\lib\servlet.jar
  -set jspJars=.\lib\jasper.jar
  -set beanJars=.\webpages\WEB-INF\classes\jsp\beans;.\examples\WEB-INF\classes\jsp\beans
  -set miscJars=.\lib\xml.jar
  -
  -set appJars=%jsdkJars%;%jspJars%;%beanJars%;%miscJars%
  -set sysJars=%JAVA_HOME%\lib\tools.jar
  -
  -set appClassPath=.\classes;%appJars%
  -set cp=%CLASSPATH%
  -
  -set CLASSPATH=%appClassPath%;%sysJars%
  -
  -if "%cp%" == "" goto next
  - 
  -rem else 
  -set CLASSPATH=%CLASSPATH%;%cp% 
  - 
  -:next
  -echo Using classpath: %CLASSPATH%
  -
  -java org.apache.tomcat.shell.Shutdown %1 %2 %3 %4 %5 %6 %7 %8 %9
  -
  -rem clean up
  -
  -set CLASSPATH=%cp%
  -set port=
  -set host=
  -set test=
  -set jsdkJars=
  -set jspJars=
  -set beanJars=
  -set miscJars=
  -set appJars=
  -set appClassPath=
  -set cp=
  -
  +rem $Id: shutdown.bat,v 1.2 1999/12/05 17:02:41 harishp Exp $
  +rem Startup batch file for tomcat server.
  +call tomcat stop
   rem pause
  
  
  
  1.2       +3 -37     jakarta-tomcat/src/shell/shutdown.sh
  
  Index: shutdown.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/shell/shutdown.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- shutdown.sh	1999/10/09 00:20:56	1.1
  +++ shutdown.sh	1999/12/05 17:02:42	1.2
  @@ -1,6 +1,6 @@
   #! /bin/sh
   #
  -# $Id: shutdown.sh,v 1.1 1999/10/09 00:20:56 duncan Exp $
  +# $Id: shutdown.sh,v 1.2 1999/12/05 17:02:42 harishp Exp $
   
   # Shell script to shutdown the server
   
  @@ -12,40 +12,6 @@
   #jre -cp runner.jar:servlet.jar:classes org.apache.tomcat.shell.Shutdown $*
   #java -cp runner.jar:servlet.jar:classes org.apache.tomcat.shell.Shutdown $*
   
  -baseDir=`dirname $0`
  +BASEDIR=`dirname $0`
   
  -jsdkJars=${baseDir}/webserver.jar:${baseDir}/lib/servlet.jar
  -jspJars=${baseDir}/lib/jasper.jar
  -beanJars=${baseDir}/webpages/WEB-INF/classes/jsp/beans:${baseDir}/examples/WEB-INF/classes/jsp/beans
  -miscJars=${baseDir}/lib/xml.jar
  -appJars=${jsdkJars}:${jspJars}:${beanJars}:${miscJars}
  -sysJars=${JAVA_HOME}/lib/tools.jar
  -
  -appClassPath=${appJars}
  -cp=$CLASSPATH
  -
  -# Backdoor classpath setting for development purposes when all classes
  -# are compiled into a /classes dir and are not yet jarred.
  -
  -if [ -d ${baseDir}/classes ]; then
  -    appClassPath=${baseDir}/classes:${appClassPath}
  -fi
  -
  -CLASSPATH=${appClassPath}:${sysJars}
  -export CLASSPATH
  -
  -if [ "$cp" != "" ]; then
  -    CLASSPATH=${CLASSPATH}:${cp}
  -    export CLASSPATH
  -fi
  -
  -echo Using classpath: ${CLASSPATH}
  -
  -java org.apache.tomcat.shell.Shutdown $*
  -
  -if [ "$cp" != "" ]; then
  -    CLASSPATH=${cp}
  -    export CLASSPATH
  -else
  -    unset CLASSPATH
  -fi
  +$BASEDIR/tomcat.sh stop "$@"
  
  
  
  1.2       +3 -40     jakarta-tomcat/src/shell/startup.bat
  
  Index: startup.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/shell/startup.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- startup.bat	1999/10/09 00:20:56	1.1
  +++ startup.bat	1999/12/05 17:02:42	1.2
  @@ -1,45 +1,8 @@
   @echo off
  -rem $Id: startup.bat,v 1.1 1999/10/09 00:20:56 duncan Exp $
  -rem Startup batch file for servlet runner.
  +rem $Id: startup.bat,v 1.2 1999/12/05 17:02:42 harishp Exp $
  +rem Startup batch file for tomcat servner.
   
   rem This batch file written and tested under Windows NT
   rem Improvements to this file are welcome
  -
  -set jsdkJars=.\webserver.jar;.\lib\servlet.jar
  -set jspJars=.\lib\jasper.jar
  -set beanJars=.\webpages\WEB-INF\classes\jsp\beans;
  -set miscJars=.\lib\xml.jar
  -set appJars=%jsdkJars%;%jspJars%;%beanJars%;%miscJars%
  -set sysJars=%JAVA_HOME%\lib\tools.jar
  -
  -set appClassPath=.\classes;%appJars%
  -set cp=%CLASSPATH%
  -
  -set CLASSPATH=%appClassPath%;%sysJars%
  -
  -if "%cp%" == "" goto next
  -
  -rem else 
  -set CLASSPATH=%CLASSPATH%;%cp% 
  - 
  -:next
  -echo Using classpath: %CLASSPATH%
  -
  -start java org.apache.tomcat.shell.Startup %1 %2 %3 %4 %5 %6 %7 %8 %9
  -rem java org.apache.tomcat.shell.Startup %1 %2 %3 %4 %5 %6 %7 %8 %9
  -
  -rem clean up
  -
  -set CLASSPATH=%cp%
  -set port=
  -set host=
  -set test=
  -set jsdkJars=
  -set jspJars=
  -set beanJars=
  -set miscJars=
  -set appJars=
  -set appClassPath=
  -set cp=
  -
  +call tomcat start  
   rem pause
  
  
  
  1.2       +3 -41     jakarta-tomcat/src/shell/startup.sh
  
  Index: startup.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/shell/startup.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- startup.sh	1999/10/09 00:20:56	1.1
  +++ startup.sh	1999/12/05 17:02:42	1.2
  @@ -1,6 +1,6 @@
   #! /bin/sh
   #
  -# $Id: startup.sh,v 1.1 1999/10/09 00:20:56 duncan Exp $
  +# $Id: startup.sh,v 1.2 1999/12/05 17:02:42 harishp Exp $
   
   # Shell script to startup the server
   
  @@ -12,44 +12,6 @@
   #jre -cp runner.jar:servlet.jar:classes org.apache.tomcat.shell.Startup $*
   #java -cp runner.jar:servlet.jar:classes org.apache.tomcat.shell.Startup $*
   
  -baseDir=`dirname $0`
  +BASEDIR=`dirname $0`
   
  -jsdkJars=${baseDir}/webserver.jar:${baseDir}/lib/servlet.jar
  -jspJars=${baseDir}/lib/jasper.jar
  -beanJars=${baseDir}/webpages/WEB-INF/classes/jsp/beans
  -miscJars=${baseDir}/lib/xml.jar
  -appJars=${jsdkJars}:${jspJars}:${beanJars}:${miscJars}
  -sysJars=${JAVA_HOME}/lib/tools.jar
  -
  -appClassPath=${appJars}
  -cp=$CLASSPATH
  -
  -# Backdoor classpath setting for development purposes when all classes
  -# are compiled into a /classes dir and are not yet jarred.
  -
  -if [ -d ${baseDir}/classes ]; then
  -    appClassPath=${baseDir}/classes:${appClassPath}
  -fi
  -
  -CLASSPATH=${appClassPath}:${sysJars}
  -export CLASSPATH
  -
  -if [ "$cp" != "" ]; then
  -    CLASSPATH=${CLASSPATH}:${cp}
  -    export CLASSPATH
  -fi
  -
  -echo Using classpath: ${CLASSPATH}
  -
  -# We start the server up in the background for a couple of reasons:
  -#   1) It frees up your command window
  -#   2) You should use `stopserver` instead of ^C to bring down the server
  -
  -java org.apache.tomcat.shell.Startup $* &
  -
  -if [ "$cp" != "" ]; then
  -    CLASSPATH=${cp}
  -    export CLASSPATH
  -else
  -    unset CLASSPATH
  -fi
  +$BASEDIR/tomcat.sh start "$@"
  
  
  

Mime
View raw message