You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by gl...@apache.org on 2001/01/10 23:55:49 UTC

cvs commit: jakarta-tomcat/src/shell tomcat.sh

glenn       01/01/10 14:55:49

  Modified:    src/shell Tag: tomcat_32 tomcat.sh
  Log:
  Fixed startup with -security
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.17.2.2  +3 -1      jakarta-tomcat/src/shell/tomcat.sh
  
  Index: tomcat.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.sh,v
  retrieving revision 1.17.2.1
  retrieving revision 1.17.2.2
  diff -u -r1.17.2.1 -r1.17.2.2
  --- tomcat.sh	2000/11/17 22:05:50	1.17.2.1
  +++ tomcat.sh	2001/01/10 22:55:48	1.17.2.2
  @@ -1,6 +1,6 @@
   #!/bin/sh
   #
  -# $Id: tomcat.sh,v 1.17.2.1 2000/11/17 22:05:50 glenn Exp $
  +# $Id: tomcat.sh,v 1.17.2.2 2001/01/10 22:55:48 glenn Exp $
   
   # Shell script to start and stop the server
   
  @@ -122,6 +122,7 @@
     shift 
     echo Using classpath: ${CLASSPATH}
     if [ "$1" = "-security" ] ; then
  +    shift
       echo Starting with a SecurityManager
       $JAVACMD $TOMCAT_OPTS -Djava.security.manager -Djava.security.policy==${TOMCAT_HOME}/conf/tomcat.policy -Dtomcat.home=${TOMCAT_HOME}  org.apache.tomcat.startup.Tomcat "$@" &
     else
  @@ -139,6 +140,7 @@
     shift 
     echo Using classpath: ${CLASSPATH}
     if [ "$1" = "-security" ] ; then
  +    shift
       echo Starting with a SecurityManager
       $JAVACMD $TOMCAT_OPTS -Djava.security.manager -Djava.security.policy==${TOMCAT_HOME}/conf/tomcat.policy -Dtomcat.home=${TOMCAT_HOME} org.apache.tomcat.startup.Tomcat "$@"
     else