tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@locus.apache.org
Subject cvs commit: jakarta-tomcat/proposals/catalina/src/bin catalina.sh
Date Fri, 23 Jun 2000 17:52:39 GMT
craigmcc    00/06/23 10:52:38

  Modified:    proposals/catalina/src/bin catalina.sh
  Log:
  For the "start" command, capture system output and system error to a file
  in the $CATALINA_HOME/logs directory, rather than letting them spill to
  the original shell window.
  
  Shift command line arguments as appropriate to avoid command line parsing
  problems inside the Catalina startup program.
  
  Revision  Changes    Path
  1.10      +12 -4     jakarta-tomcat/proposals/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/bin/catalina.sh,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- catalina.sh	2000/06/19 21:46:47	1.9
  +++ catalina.sh	2000/06/23 17:52:37	1.10
  @@ -13,7 +13,7 @@
   #                 files must be in your Java2 extensions directory.
   #   JAVA_HOME     Must point at your Java Development Kit installation.
   #
  -# $Id: catalina.sh,v 1.9 2000/06/19 21:46:47 craigmcc Exp $
  +# $Id: catalina.sh,v 1.10 2000/06/23 17:52:37 craigmcc Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -66,15 +66,23 @@
   
   elif [ "$1" = "run" ] ; then
   
  -  java $CATALINA_OPTS -classpath $CP -Dcatalina.home=$CATALINA_HOME org.apache.tomcat.startup.Catalina
"$@" start
  +  shift
  +  java $CATALINA_OPTS -classpath $CP -Dcatalina.home=$CATALINA_HOME \
  +   org.apache.tomcat.startup.Catalina "$@" start
   
   elif [ "$1" = "start" ] ; then
   
  -  java $CATALINA_OPTS -classpath $CP -Dcatalina.home=$CATALINA_HOME org.apache.tomcat.startup.Catalina
"$@" start &
  +  shift
  +  touch $CATALINA_HOME/logs/catalina.out
  +  java $CATALINA_OPTS -classpath $CP -Dcatalina.home=$CATALINA_HOME \
  +   org.apache.tomcat.startup.Catalina "$@" start \
  +   >> $CATALINA_HOME/logs/catalina.out 2>&1 &
   
   elif [ "$1" = "stop" ] ; then
   
  -  java $CATALINA_OPTS -classpath $CP -Dcatalina.home=$CATALINA_HOME org.apache.tomcat.startup.Catalina
"$@" stop
  +  shift
  +  java $CATALINA_OPTS -classpath $CP -Dcatalina.home=$CATALINA_HOME \
  +   org.apache.tomcat.startup.Catalina "$@" stop
   
   else
   
  
  
  

Mime
View raw message