cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh setclasspath.sh

2005-01-10 Thread remm 
remm2005/01/10 10:16:10

  Modified:catalina/src/bin catalina.sh setclasspath.sh
  Log:
  - 32081: Remove the JDK requirement from the Unix scripts.
  - I suppose a lot of Windows users will use the .exe or similar wrappers. The 
rest are probably developers so would have the JDK anyway.
  
  Revision  ChangesPath
  1.18  +12 -3 jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- catalina.sh   17 Nov 2004 20:17:46 -  1.17
  +++ catalina.sh   10 Jan 2005 18:16:10 -  1.18
  @@ -18,6 +18,10 @@
   #   $CATALINA_BASE/temp.
   #
   #   JAVA_HOME   Must point at your Java Development Kit installation.
  +#   Required to run the with the debug or javac argument.
  +#
  +#   JRE_HOMEMust point at your Java Development Kit installation.
  +#   Defaults to JAVA_HOME if empty.
   #
   #   JAVA_OPTS   (Optional) Java runtime options used when the start,
   #   stop, or run command is executed.
  @@ -72,6 +76,7 @@
   # For Cygwin, ensure paths are in UNIX format before anything is touched
   if $cygwin; then
 [ -n $JAVA_HOME ]  JAVA_HOME=`cygpath --unix $JAVA_HOME`
  +  [ -n $JRE_HOME ]  JRE_HOME=`cygpath --unix $JRE_HOME`
 [ -n $CATALINA_HOME ]  CATALINA_HOME=`cygpath --unix $CATALINA_HOME`
 [ -n $CATALINA_BASE ]  CATALINA_BASE=`cygpath --unix $CATALINA_BASE`
 [ -n $CLASSPATH ]  CLASSPATH=`cygpath --path --unix $CLASSPATH`
  @@ -127,6 +132,7 @@
   # For Cygwin, switch paths to Windows format before running java
   if $cygwin; then
 JAVA_HOME=`cygpath --absolute --windows $JAVA_HOME`
  +  JRE_HOME=`cygpath --absolute --windows $JRE_HOME`
 CATALINA_HOME=`cygpath --absolute --windows $CATALINA_HOME`
 CATALINA_BASE=`cygpath --absolute --windows $CATALINA_BASE`
 CATALINA_TMPDIR=`cygpath --absolute --windows $CATALINA_TMPDIR`
  @@ -140,7 +146,11 @@
   echo Using CATALINA_BASE:   $CATALINA_BASE
   echo Using CATALINA_HOME:   $CATALINA_HOME
   echo Using CATALINA_TMPDIR: $CATALINA_TMPDIR
  -echo Using JAVA_HOME:   $JAVA_HOME
  +if [ $1 = debug -o $1 = javac ] ; then
  +  echo Using JAVA_HOME:   $JAVA_HOME
  +else
  +  echo Using JRE_HOME:   $JRE_HOME
  +fi
   
   if [ $1 = jpda ] ; then
 if [ -z $JPDA_TRANSPORT ]; then
  @@ -157,7 +167,6 @@
   fi
   
   if [ $1 = debug ] ; then
  -
 if $os400; then
   echo Debug command not available on OS400
   exit 1
  
  
  
  1.11  +32 -19jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh
  
  Index: setclasspath.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- setclasspath.sh   17 Nov 2004 20:17:46 -  1.10
  +++ setclasspath.sh   10 Jan 2005 18:16:10 -  1.11
  @@ -5,24 +5,35 @@
   # 
-
   
   # Make sure prerequisite environment variables are set
  -if [ -z $JAVA_HOME ]; then
  -  echo The JAVA_HOME environment variable is not defined
  -  echo This environment variable is needed to run this program
  +if [ -z $JAVA_HOME -a -z $JRE_HOME ]; then
  +  echo Neither the JAVA_HOME nor the JRE_HOME environment variable is 
defined
  +  echo At least one of these environment variable is needed to run this 
program
 exit 1
   fi
  -if [ $os400 = true ]; then
  -  if [ ! -x $JAVA_HOME/bin/java -o ! -x $JAVA_HOME/bin/javac ]; then
  -echo The JAVA_HOME environment variable is not defined correctly
  -echo This environment variable is needed to run this program
  -echo NB: JAVA_HOME should point to a JDK not a JRE
  -exit 1
  -  fi
  -else
  -  if [ ! -x $JAVA_HOME/bin/java -o ! -x $JAVA_HOME/bin/jdb -o ! -x 
$JAVA_HOME/bin/javac ]; then
  -echo The JAVA_HOME environment variable is not defined correctly
  -echo This environment variable is needed to run this program
  -echo NB: JAVA_HOME should point to a JDK not a JRE
  -exit 1
  +if [ -z $JAVA_HOME -a $1 = debug ]; then
  +  echo JAVA_HOME should point to a JDK in order to run in debug mode.
  +  exit 1
  +fi
  +if [ -z $JRE_HOME ]; then
  +  JRE_HOME=$JAVA_HOME
  +fi
  +
  +# If we're running under jdb, we need a full jdk.
  +if [ $1 = debug -o $1 = javac ] ; then
  +  if [ $os400 = true ]; then
  +if [ ! -x $JAVA_HOME/bin/java -o ! -x $JAVA_HOME/bin/javac ]; then
  +  echo The JAVA_HOME environment variable is not defined correctly
  +  echo This environment variable is needed to run this program
  +  echo NB: JAVA_HOME should point to a JDK not a JRE
  +  exit 1

cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh

2004-07-27 Thread funkman 
funkman 2004/07/27 17:47:47

  Modified:catalina/src/bin catalina.sh
  Log:
  BZ 29938
  Cygwin fixes
  Patch from amoebaworks at yahoo .ca
  
  Revision  ChangesPath
  1.15  +7 -7  jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- catalina.sh   30 Jun 2004 15:25:31 -  1.14
  +++ catalina.sh   28 Jul 2004 00:47:47 -  1.15
  @@ -72,7 +72,7 @@
 [ -n $CATALINA_HOME ]  CATALINA_HOME=`cygpath --unix $CATALINA_HOME`
 [ -n $CATALINA_BASE ]  CATALINA_BASE=`cygpath --unix $CATALINA_BASE`
 [ -n $CLASSPATH ]  CLASSPATH=`cygpath --path --unix $CLASSPATH`
  -  [ -n $JSSE_HOME ]  JSSE_HOME=`cygpath --path --unix $JSSE_HOME`
  +  [ -n $JSSE_HOME ]  JSSE_HOME=`cygpath --absolute --unix $JSSE_HOME`
   fi
   
   # For OS400
  @@ -114,12 +114,12 @@
   
   # For Cygwin, switch paths to Windows format before running java
   if $cygwin; then
  -  JAVA_HOME=`cygpath --path --windows $JAVA_HOME`
  -  CATALINA_HOME=`cygpath --path --windows $CATALINA_HOME`
  -  CATALINA_BASE=`cygpath --path --windows $CATALINA_BASE`
  -  CATALINA_TMPDIR=`cygpath --path --windows $CATALINA_TMPDIR`
  +  JAVA_HOME=`cygpath --absolute --windows $JAVA_HOME`
  +  CATALINA_HOME=`cygpath --absolute --windows $CATALINA_HOME`
  +  CATALINA_BASE=`cygpath --absolute --windows $CATALINA_BASE`
  +  CATALINA_TMPDIR=`cygpath --absolute --windows $CATALINA_TMPDIR`
 CLASSPATH=`cygpath --path --windows $CLASSPATH`
  -  JSSE_HOME=`cygpath --path --windows $JSSE_HOME`
  +  [ -n $JSSE_HOME ]  JSSE_HOME=`cygpath --absolute --windows $JSSE_HOME`
 JAVA_ENDORSED_DIRS=`cygpath --path --windows $JAVA_ENDORSED_DIRS`
   fi
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh

2004-05-26 Thread yoavs 
yoavs   2004/05/26 12:45:33

  Modified:catalina/src/bin catalina.sh
  Log:
  Fixed stop -force option per Bugzilla 29133.
  http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29133
  
  Revision  ChangesPath
  1.13  +9 -3  jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- catalina.sh   14 Mar 2004 17:41:05 -  1.12
  +++ catalina.sh   26 May 2004 19:45:33 -  1.13
  @@ -234,6 +234,12 @@
   elif [ $1 = stop ] ; then
   
 shift
  +  FORCE=0
  +  if [ $1 = -force ]; then
  +shift
  +FORCE=1
  +  fi
  +
 $_RUNJAVA $JAVA_OPTS $CATALINA_OPTS \
   -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
   -Dcatalina.base=$CATALINA_BASE \
  @@ -241,8 +247,7 @@
   -Djava.io.tmpdir=$CATALINA_TMPDIR \
   org.apache.catalina.startup.Bootstrap $@ stop
   
  -  if [ $1 = -force ] ; then
  -shift
  +  if [ $FORCE -eq 1 ]; then
   if [ ! -z $CATALINA_PID ]; then
  echo Killing: `cat $CATALINA_PID`
  kill -9 `cat $CATALINA_PID`
  @@ -266,6 +271,7 @@
 echo   start Start Catalina in a separate window
 echo   start -security   Start in a separate window with security manager
 echo   stop  Stop Catalina
  +  echo   stop -force   Stop Catalina (followed by kill -KILL)
 exit 1
   
   fi
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh

2004-03-14 Thread markt 
markt   2004/03/14 09:41:05

  Modified:catalina/src/bin catalina.sh
  Log:
  - Fix bug 17859. Provide cygwin friendly JAVA_ENDORSED_DIRS property.
  - Ported from TC4.
  
  Revision  ChangesPath
  1.12  +2 -1  jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- catalina.sh   22 Oct 2003 00:28:44 -  1.11
  +++ catalina.sh   14 Mar 2004 17:41:05 -  1.12
  @@ -120,6 +120,7 @@
 CATALINA_TMPDIR=`cygpath --path --windows $CATALINA_TMPDIR`
 CLASSPATH=`cygpath --path --windows $CLASSPATH`
 JSSE_HOME=`cygpath --path --windows $JSSE_HOME`
  +  JAVA_ENDORSED_DIRS=`cygpath --path --windows $JAVA_ENDORSED_DIRS`
   fi
   
   # - Execute The Requested Command -
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh catalina.bat

2003-10-21 Thread jfarcand 
jfarcand2003/10/21 17:28:44

  Modified:catalina/src/bin catalina.sh catalina.bat
  Log:
  Remove supports for Embedded options.
  
  Revert if you still use it (and make it work againt :-) ).
  
  Revision  ChangesPath
  1.11  +1 -13 jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- catalina.sh   10 Oct 2003 15:42:20 -  1.10
  +++ catalina.sh   22 Oct 2003 00:28:44 -  1.11
  @@ -173,17 +173,6 @@
   fi
 fi
   
  -elif [ $1 = embedded ] ; then
  -
  -  shift
  -  echo Embedded Classpath: $CLASSPATH
  -  exec $_RUNJAVA $JAVA_OPTS $CATALINA_OPTS \
  --Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
  --Dcatalina.base=$CATALINA_BASE \
  --Dcatalina.home=$CATALINA_HOME \
  --Djava.io.tmpdir=$CATALINA_TMPDIR \
  -org.apache.catalina.startup.Embedded $@
  -
   elif [ $1 = run ]; then
   
 shift
  @@ -270,7 +259,6 @@
   echo   debug Start Catalina in a debugger
   echo   debug -security   Debug Catalina with a security manager
 fi
  -  echo   embedded  Start Catalina in embedded mode
 echo   jpda startStart Catalina under JPDA debugger
 echo   run   Start Catalina in the current window
 echo   run -security Start in the current window with security manager
  
  
  
  1.6   +1 -8  jakarta-tomcat-catalina/catalina/src/bin/catalina.bat
  
  Index: catalina.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.bat,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- catalina.bat  2 Oct 2003 17:07:40 -   1.5
  +++ catalina.bat  22 Oct 2003 00:28:44 -  1.6
  @@ -102,7 +102,6 @@
   :noJpda
   
   if %1 == debug goto doDebug
  -if %1 == embedded goto doEmbedded
   if %1 == run goto doRun
   if %1 == start goto doStart
   if %1 == stop goto doStop
  @@ -111,7 +110,6 @@
   echo commands:
   echo   debug Start Catalina in a debugger
   echo   debug -security   Debug Catalina with a security manager
  -echo   embedded  Start Catalina in embedded mode
   echo   jpda startStart Catalina under JPDA debugger
   echo   run   Start Catalina in the current window
   echo   run -security Start in the current window with security manager
  @@ -128,11 +126,6 @@
   shift
   echo Using Security Manager
   set SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy
  -goto execCmd
  -
  -:doEmbedded
  -shift
  -set MAINCLASS=org.apache.catalina.startup.Embedded
   goto execCmd
   
   :doRun
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh

2003-10-10 Thread remm 
remm2003/10/10 08:42:20

  Modified:catalina/src/bin catalina.sh
  Log:
  - Explicitely add commons-logging-api on the classpath on Unix.
  
  Revision  ChangesPath
  1.10  +2 -2  jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- catalina.sh   2 Oct 2003 17:07:40 -   1.9
  +++ catalina.sh   10 Oct 2003 15:42:20 -  1.10
  @@ -101,7 +101,7 @@
   if [ -n $JSSE_HOME ]; then
 
CLASSPATH=$CLASSPATH:$JSSE_HOME/lib/jcert.jar:$JSSE_HOME/lib/jnet.jar:$JSSE_HOME/lib/jsse.jar
   fi
  -CLASSPATH=$CLASSPATH:$CATALINA_HOME/bin/bootstrap.jar
  
+CLASSPATH=$CLASSPATH:$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-logging-api.jar
   
   if [ -z $CATALINA_BASE ] ; then
 CATALINA_BASE=$CATALINA_HOME
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh catalina.bat

2003-10-02 Thread jfarcand 
jfarcand2003/10/02 10:07:40

  Modified:catalina/src/bin catalina.sh catalina.bat
  Log:
  Minor fixes (should we remove that props?).
  
  Revision  ChangesPath
  1.9   +3 -3  jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- catalina.sh   2 Sep 2003 12:23:13 -   1.8
  +++ catalina.sh   2 Oct 2003 17:07:40 -   1.9
  @@ -155,7 +155,7 @@
 shift
 exec $_RUNJDB $JAVA_OPTS $CATALINA_OPTS \
   -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
  --sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
  +-sourcepath 
$CATALINA_HOME/../../jakarta-tomcat-catalina/catalina/src/share \
   -Djava.security.manager \
   -Djava.security.policy==$CATALINA_BASE/conf/catalina.policy \
   -Dcatalina.base=$CATALINA_BASE \
  @@ -165,7 +165,7 @@
   else
 exec $_RUNJDB $JAVA_OPTS $CATALINA_OPTS \
   -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
  --sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
  +-sourcepath 
$CATALINA_HOME/../../jakarta-tomcat-catalina/catalina/src/share \
   -Dcatalina.base=$CATALINA_BASE \
   -Dcatalina.home=$CATALINA_HOME \
   -Djava.io.tmpdir=$CATALINA_TMPDIR \
  
  
  
  1.5   +2 -2  jakarta-tomcat-catalina/catalina/src/bin/catalina.bat
  
  Index: catalina.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.bat,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- catalina.bat  29 Sep 2003 10:27:20 -  1.4
  +++ catalina.bat  2 Oct 2003 17:07:40 -   1.5
  @@ -123,7 +123,7 @@
   :doDebug
   shift
   set _EXECJAVA=%_RUNJDB%
  -set DEBUG_OPTS=-sourcepath 
%CATALINA_HOME%\..\..\jakarta-tomcat-4.0\catalina\src\share
  +set DEBUG_OPTS=-sourcepath 
%CATALINA_HOME%\..\..\jakarta-tomcat-catalina\catalina\src\share
   if not %1 == -security goto execCmd
   shift
   echo Using Security Manager
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh

2003-09-02 Thread remm 
remm2003/09/02 05:23:13

  Modified:catalina/src/bin catalina.sh
  Log:
  - The -force part was never executed. Tradeoff: the script will no longer
return right away.
  - Bug 20029: submitted by Christian Brensing.
  
  Revision  ChangesPath
  1.8   +2 -2  jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- catalina.sh   31 Jul 2003 15:03:04 -  1.7
  +++ catalina.sh   2 Sep 2003 12:23:13 -   1.8
  @@ -244,7 +244,7 @@
   elif [ $1 = stop ] ; then
   
 shift
  -  exec $_RUNJAVA $JAVA_OPTS $CATALINA_OPTS \
  +  $_RUNJAVA $JAVA_OPTS $CATALINA_OPTS \
   -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
   -Dcatalina.base=$CATALINA_BASE \
   -Dcatalina.home=$CATALINA_HOME \
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh

2003-07-31 Thread funkman 
funkman 2003/07/31 08:03:04

  Modified:catalina/src/bin catalina.sh
  Log:
  Port os400 change from 4.1.
  
  Actually just copied the entire file from 4.1 to here. And kept the
  -force logic.
  
  This worked fine with cygwin. The diff seems innocent.
  
  Comments on -sourcepath
 $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share ?
  
  Does anyone debug with a debugger on 5? Should this be removed?
  
  Revision  ChangesPath
  1.7   +50 -26jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- catalina.sh   20 Mar 2003 23:30:45 -  1.6
  +++ catalina.sh   31 Jul 2003 15:03:04 -  1.7
  @@ -40,8 +40,10 @@
   
   # OS specific support.  $var _must_ be set to either true or false.
   cygwin=false
  +os400=false
   case `uname` in
   CYGWIN*) cygwin=true;;
  +OS400*) os400=true;;
   esac
   
   # resolve links - $0 may be a softlink
  @@ -68,10 +70,23 @@
   if $cygwin; then
 [ -n $JAVA_HOME ]  JAVA_HOME=`cygpath --unix $JAVA_HOME`
 [ -n $CATALINA_HOME ]  CATALINA_HOME=`cygpath --unix $CATALINA_HOME`
  +  [ -n $CATALINA_BASE ]  CATALINA_BASE=`cygpath --unix $CATALINA_BASE`
 [ -n $CLASSPATH ]  CLASSPATH=`cygpath --path --unix $CLASSPATH`
 [ -n $JSSE_HOME ]  JSSE_HOME=`cygpath --path --unix $JSSE_HOME`
   fi
   
  +# For OS400
  +if $os400; then
  +  # Set job priority to standard for interactive (interactive - 6) by using
  +  # the interactive priority - 6, the helper threads that respond to requests
  +  # will be running at the same priority as interactive jobs.
  +  COMMAND='chgjob job('$JOBNAME') runpty(6)'
  +  system $COMMAND
  +
  +  # Enable multi threading
  +  export QIBM_MULTI_THREADED=Y
  +fi
  +
   # Get standard Java environment variables
   if [ -r $CATALINA_HOME/bin/setclasspath.sh ]; then
 BASEDIR=$CATALINA_HOME
  @@ -130,27 +145,32 @@
   
   if [ $1 = debug ] ; then
   
  -  shift
  -  if [ $1 = -security ] ; then
  -echo Using Security Manager
  -shift
  -exec $_RUNJDB $JAVA_OPTS $CATALINA_OPTS \
  -  -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
  -  -sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
  -  -Djava.security.manager \
  -  -Djava.security.policy==$CATALINA_BASE/conf/catalina.policy \
  -  -Dcatalina.base=$CATALINA_BASE \
  -  -Dcatalina.home=$CATALINA_HOME \
  -  -Djava.io.tmpdir=$CATALINA_TMPDIR \
  -  org.apache.catalina.startup.Bootstrap $@ start
  +  if $os400; then
  +echo Debug command not available on OS400
  +exit 1
 else
  -exec $_RUNJDB $JAVA_OPTS $CATALINA_OPTS \
  -  -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
  -  -sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
  -  -Dcatalina.base=$CATALINA_BASE \
  -  -Dcatalina.home=$CATALINA_HOME \
  -  -Djava.io.tmpdir=$CATALINA_TMPDIR \
  -  org.apache.catalina.startup.Bootstrap $@ start
  +shift
  +if [ $1 = -security ] ; then
  +  echo Using Security Manager
  +  shift
  +  exec $_RUNJDB $JAVA_OPTS $CATALINA_OPTS \
  +-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
  +-sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
  +-Djava.security.manager \
  +-Djava.security.policy==$CATALINA_BASE/conf/catalina.policy \
  +-Dcatalina.base=$CATALINA_BASE \
  +-Dcatalina.home=$CATALINA_HOME \
  +-Djava.io.tmpdir=$CATALINA_TMPDIR \
  +org.apache.catalina.startup.Bootstrap $@ start
  +else
  +  exec $_RUNJDB $JAVA_OPTS $CATALINA_OPTS \
  +-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
  +-sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
  +-Dcatalina.base=$CATALINA_BASE \
  +-Dcatalina.home=$CATALINA_HOME \
  +-Djava.io.tmpdir=$CATALINA_TMPDIR \
  +org.apache.catalina.startup.Bootstrap $@ start
  +fi
 fi
   
   elif [ $1 = embedded ] ; then
  @@ -206,7 +226,7 @@
   
 if [ ! -z $CATALINA_PID ]; then
   echo $!  $CATALINA_PID
  -  fi  
  +  fi
 else
   $_RUNJAVA $JAVA_OPTS $CATALINA_OPTS \
 -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
  @@ -218,7 +238,7 @@
   
 if [ ! -z $CATALINA_PID ]; then
   echo $!  $CATALINA_PID
  -  fi  
  +  fi
 fi
   
   elif [ $1 = stop ] ; then
  @@ -239,13 +259,17 @@
   fi
 fi
   
  -
   else
   
 echo Usage: catalina.sh ( commands ... )
 echo commands:
  -  echo   debug Start Catalina in a debugger
  -  echo   debug -security   Debug Catalina with a security manager
  +  if

cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh

2003-03-20 Thread costin 
costin  2003/03/20 15:30:46

  Modified:catalina/src/bin catalina.sh
  Log:
  Port from 3.3 - if -force option is used and a pid file was set, use it to
  kill tomcat. This allows getting rid of hunged instances.
  
  Revision  ChangesPath
  1.6   +10 -1 jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- catalina.sh   6 Mar 2003 11:24:05 -   1.5
  +++ catalina.sh   20 Mar 2003 23:30:45 -  1.6
  @@ -231,6 +231,15 @@
   -Djava.io.tmpdir=$CATALINA_TMPDIR \
   org.apache.catalina.startup.Bootstrap $@ stop
   
  +  if [ $1 = -force ] ; then
  +shift
  +if [ ! -z $CATALINA_PID ]; then
  +   echo Killing: `cat $CATALINA_PID`
  +   kill -9 `cat $CATALINA_PID`
  +fi
  +  fi
  +
  +
   else
   
 echo Usage: catalina.sh ( commands ... )
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh

2003-03-06 Thread hgomez 
hgomez  2003/03/06 03:24:05

  Modified:catalina/src/bin catalina.sh
  Log:
  Add support to get catalina mai java process id in a file (from TC 4.1)
  
  Revision  ChangesPath
  1.5   +12 -1 jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- catalina.sh   14 Feb 2003 00:53:27 -  1.4
  +++ catalina.sh   6 Mar 2003 11:24:05 -   1.5
  @@ -32,6 +32,9 @@
   #   (JSSE) installation, whose JAR files will be added to the
   #   system class path used to start Tomcat.
   #
  +#   CATALINA_PID(Optional) Path of the file which should contains the pid
  +#   of catalina startup java process, when start (fork) is used
  +#
   # $Id$
   # -
   
  @@ -200,6 +203,10 @@
 -Djava.io.tmpdir=$CATALINA_TMPDIR \
 org.apache.catalina.startup.Bootstrap $@ start \
  $CATALINA_BASE/logs/catalina.out 21 
  +
  +  if [ ! -z $CATALINA_PID ]; then
  +echo $!  $CATALINA_PID
  +  fi  
 else
   $_RUNJAVA $JAVA_OPTS $CATALINA_OPTS \
 -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
  @@ -208,6 +215,10 @@
 -Djava.io.tmpdir=$CATALINA_TMPDIR \
 org.apache.catalina.startup.Bootstrap $@ start \
  $CATALINA_BASE/logs/catalina.out 21 
  +
  +  if [ ! -z $CATALINA_PID ]; then
  +echo $!  $CATALINA_PID
  +  fi  
 fi
   
   elif [ $1 = stop ] ; then
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh

2003-02-13 Thread jfarcand 
jfarcand2003/02/13 16:53:27

  Modified:catalina/src/bin catalina.sh
  Log:
  Allow Tomcat 5 to startup/shutdown with CYGWIN (I didn't catch it because I was 
using the .bat).
  
  Submitted by: Tim Funk at hoedog.org
  FIX #17061
  
  Revision  ChangesPath
  1.4   +3 -1  jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- catalina.sh   4 Aug 2002 18:19:43 -   1.3
  +++ catalina.sh   14 Feb 2003 00:53:27 -  1.4
  @@ -98,6 +98,8 @@
   if $cygwin; then
 JAVA_HOME=`cygpath --path --windows $JAVA_HOME`
 CATALINA_HOME=`cygpath --path --windows $CATALINA_HOME`
  +  CATALINA_BASE=`cygpath --path --windows $CATALINA_BASE`
  +  CATALINA_TMPDIR=`cygpath --path --windows $CATALINA_TMPDIR`
 CLASSPATH=`cygpath --path --windows $CLASSPATH`
 JSSE_HOME=`cygpath --path --windows $JSSE_HOME`
   fi
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]