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

2004-12-24 Thread markt 
markt   2004/12/24 09:17:34

  Modified:catalina/src/bin catalina.sh
  Log:
  Fix bug 28305. Provide greater control over redirection of stdout and stderr
   - Patch provided by Daniel Rall
  
  Revision  ChangesPath
  1.38  +13 -4 jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- catalina.sh   15 Aug 2004 15:20:15 -  1.37
  +++ catalina.sh   24 Dec 2004 17:17:34 -  1.38
  @@ -17,6 +17,9 @@
   #   the JVM should use (java.io.tmpdir).  Defaults to
   #   $CATALINA_BASE/temp.
   #
  +#   CATALINA_OUT(Optional) Location of the file to which stdout and 
stderr
  +#   are written.  Defaults to 
$CATALINA_BASE/logs/catalina.out.
  +#
   #   JAVA_HOME   Must point at your Java Development Kit installation.
   #
   #   JAVA_OPTS   (Optional) Java runtime options used when the start,
  @@ -115,6 +118,11 @@
 CATALINA_TMPDIR=$CATALINA_BASE/temp
   fi
   
  +if [ -z $CATALINA_OUT ] ; then
  +  # Use default location for redirected stdout/stderr
  +  CATALINA_OUT=$CATALINA_BASE/logs/catalina.out
  +fi
  +
   # For Cygwin, switch paths to Windows format before running java
   if $cygwin; then
 JAVA_HOME=`cygpath --path --windows $JAVA_HOME`
  @@ -131,6 +139,7 @@
   echo Using CATALINA_BASE:   $CATALINA_BASE
   echo Using CATALINA_HOME:   $CATALINA_HOME
   echo Using CATALINA_TMPDIR: $CATALINA_TMPDIR
  +echo Using CATALINA_OUT:$CATALINA_OUT
   echo Using JAVA_HOME:   $JAVA_HOME
   
   if [ $1 = jpda ] ; then
  @@ -214,7 +223,7 @@
   elif [ $1 = start ] ; then
   
 shift
  -  touch $CATALINA_BASE/logs/catalina.out
  +  touch $CATALINA_OUT
 if [ $1 = -security ] ; then
   echo Using Security Manager
   shift
  @@ -226,7 +235,7 @@
 -Dcatalina.home=$CATALINA_HOME \
 -Djava.io.tmpdir=$CATALINA_TMPDIR \
 org.apache.catalina.startup.Bootstrap $@ start \
  -   $CATALINA_BASE/logs/catalina.out 21 
  +   $CATALINA_OUT 21 
   
 if [ ! -z $CATALINA_PID ]; then
   echo $!  $CATALINA_PID
  @@ -238,7 +247,7 @@
 -Dcatalina.home=$CATALINA_HOME \
 -Djava.io.tmpdir=$CATALINA_TMPDIR \
 org.apache.catalina.startup.Bootstrap $@ start \
  -   $CATALINA_BASE/logs/catalina.out 21 
  +   $CATALINA_OUT 21 
   
 if [ ! -z $CATALINA_PID ]; then
   echo $!  $CATALINA_PID
  
  
  

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

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

2004-08-15 Thread markt 
markt   2004/08/15 08:20:15

  Modified:catalina/src/bin catalina.sh
  Log:
  Fix bug 12089. CATALINA_HOME ignored and reset by catalina.sh
   - Fixed by porting fix for bug 30325 from TC5
  
  Revision  ChangesPath
  1.37  +5 -2  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- catalina.sh   14 Mar 2004 17:40:23 -  1.36
  +++ catalina.sh   15 Aug 2004 15:20:15 -  1.37
  @@ -61,7 +61,10 @@
   
   # Get standard environment variables
   PRGDIR=`dirname $PRG`
  -CATALINA_HOME=`cd $PRGDIR/.. ; pwd`
  +
  +# Only set CATALINA_HOME if not already set 
  +[ -z $CATALINA_HOME ]  CATALINA_HOME=`cd $PRGDIR/.. ; pwd` 
  +
   if [ -r $CATALINA_HOME/bin/setenv.sh ]; then
 . $CATALINA_HOME/bin/setenv.sh
   fi
  
  
  

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

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

2004-03-14 Thread markt 
markt   2004/03/14 09:40:23

  Modified:catalina/src/bin catalina.sh
  Log:
  - Fix bug 17859. Provide cygwin friendly JAVA_ENDORSED_DIRS property.
  
  Revision  ChangesPath
  1.36  +2 -1  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- catalina.sh   8 May 2003 08:19:58 -   1.35
  +++ catalina.sh   14 Mar 2004 17:40:23 -  1.36
  @@ -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]

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

2004-03-14 Thread Mark Thomas 
Please can one of the moderators remove this address from the tomcat-dev mailing
list.

Thanks,

Mark 

-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] 
Sent: Sunday, March 14, 2004 5:40 PM
To: [EMAIL PROTECTED]
Subject: Re: cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.sh

Lieber Harry Potter Fan!

Der Sprechende Hut hat entschieden, dass du nach Gryffindor gehst. 
Nun kannst du dein Zauberexamen machen. 
Dein Benutzername ist Gryffindor und
dein Kennwort troubadour (achte darauf, den ersten Buchstaben beim
Benutzernamen groß zu schreiben und alles andere klein). Bitte behalte diese
Passwörter für dich (ansonsten sind wir gezwungen, dich von Hogwarts zu
verweisen).

Weiterhin viel Spass auf der Harry Potter Site!
Wünscht dir 
Professor McGonagall

P.S.1: Bei ersten Schwierigkeiten, nicht verzagen - schaut einfach in die FAQ's
(Häufig gestellte Fragen), dort werden fast alle eure Fragen beantwortet.
Ansonsten wendet euch an die Klassensprecherin: [EMAIL PROTECTED]



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

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

2004-03-14 Thread Remy Maucherat 
Mark Thomas wrote:
Please can one of the moderators remove this address from the tomcat-dev mailing
list.
When there's a problem on the list, usually the best is to mail 
[EMAIL PROTECTED]

Rémy

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

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

2004-03-14 Thread Mark Thomas 
Will do.

Thanks.

Mark 

From: Remy Maucherat [mailto:[EMAIL PROTECTED] 
 
 Mark Thomas wrote:
  Please can one of the moderators remove this address from 
 the tomcat-dev mailing
  list.
 
 When there's a problem on the list, usually the best is to mail 
 [EMAIL PROTECTED]
 
 Rémy



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

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

2003-03-06 Thread hgomez 
hgomez  2003/03/06 03:12:34

  Modified:catalina/src/bin catalina.sh
  Log:
  Add support to get catalina mai java process id in a file
  via the CATALINA_PID envvar
  
  Revision  ChangesPath
  1.33  +12 -1 jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- catalina.sh   15 Oct 2002 10:31:21 -  1.32
  +++ catalina.sh   6 Mar 2003 11:12:33 -   1.33
  @@ -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$
   # -
   
  @@ -201,6 +204,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 \
  @@ -209,6 +216,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-4.0/catalina/src/bin catalina.sh

2003-03-06 Thread hgomez 
hgomez  2003/03/06 03:23:25

  Modified:catalina/src/bin catalina.sh
  Log:
  estetic change
  
  Revision  ChangesPath
  1.34  +3 -3  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- catalina.sh   6 Mar 2003 11:12:33 -   1.33
  +++ catalina.sh   6 Mar 2003 11:23:25 -   1.34
  @@ -205,7 +205,7 @@
 org.apache.catalina.startup.Bootstrap $@ start \
  $CATALINA_BASE/logs/catalina.out 21 
   
  -  if [ ! -z $CATALINA_PID]; then
  +  if [ ! -z $CATALINA_PID ]; then
   echo $!  $CATALINA_PID
 fi  
 else
  @@ -217,7 +217,7 @@
 org.apache.catalina.startup.Bootstrap $@ start \
  $CATALINA_BASE/logs/catalina.out 21 
   
  -  if [ ! -z $CATALINA_PID]; then
  +  if [ ! -z $CATALINA_PID ]; then
   echo $!  $CATALINA_PID
 fi  
 fi
  
  
  

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

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

2002-10-15 Thread hgomez 

hgomez  2002/10/15 03:31:21

  Modified:catalina/src/bin catalina.sh
  Log:
  Fix $CATALINA_TMPDIR in Cygwin, submitted by Peter Romianowski
  
  Revision  ChangesPath
  1.32  +2 -1  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- catalina.sh   18 Jul 2002 07:44:22 -  1.31
  +++ catalina.sh   15 Oct 2002 10:31:21 -  1.32
  @@ -100,6 +100,7 @@
 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:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

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

2002-07-18 Thread patrickl 

patrickl2002/07/18 00:44:22

  Modified:catalina/src/bin catalina.sh
  Log:
  Add CATALINA_BASE to environment variables that need to be converted when running 
with Cygwin
  Submitted by: [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.31  +3 -1  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- catalina.sh   1 Apr 2002 19:51:31 -   1.30
  +++ catalina.sh   18 Jul 2002 07:44:22 -  1.31
  @@ -65,6 +65,7 @@
   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
  @@ -98,6 +99,7 @@
   if $cygwin; then
 JAVA_HOME=`cygpath --path --windows $JAVA_HOME`
 CATALINA_HOME=`cygpath --path --windows $CATALINA_HOME`
  +  CATALINA_BASE=`cygpath --path --windows $CATALINA_BASE`
 CLASSPATH=`cygpath --path --windows $CLASSPATH`
 JSSE_HOME=`cygpath --path --windows $JSSE_HOME`
   fi
  
  
  

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

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

2002-07-18 Thread patrickl 

patrickl2002/07/18 00:48:23

  Modified:catalina/src/bin Tag: tomcat_40_branch catalina.sh
  Log:
  Add CATALINA_BASE to environment variables that need to be converted when running 
with Cygwin
  Submitted by: [EMAIL PROTECTED]
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.20.2.4  +3 -1  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.20.2.3
  retrieving revision 1.20.2.4
  diff -u -r1.20.2.3 -r1.20.2.4
  --- catalina.sh   19 Mar 2002 18:24:36 -  1.20.2.3
  +++ catalina.sh   18 Jul 2002 07:48:23 -  1.20.2.4
  @@ -65,6 +65,7 @@
   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
  @@ -98,6 +99,7 @@
   if $cygwin; then
 JAVA_HOME=`cygpath --path --windows $JAVA_HOME`
 CATALINA_HOME=`cygpath --path --windows $CATALINA_HOME`
  +  CATALINA_BASE=`cygpath --path --windows $CATALINA_BASE`
 CLASSPATH=`cygpath --path --windows $CLASSPATH`
 JSSE_HOME=`cygpath --path --windows $JSSE_HOME`
   fi
  
  
  

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

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

2002-03-19 Thread patrickl 

patrickl02/03/19 10:21:14

  Modified:catalina/src/bin catalina.sh
  Log:
  Add JPDA_TRANSPORT environment variable
  
  Revision  ChangesPath
  1.28  +8 -2  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- catalina.sh   18 Mar 2002 17:37:51 -  1.27
  +++ catalina.sh   19 Mar 2002 18:21:14 -  1.28
  @@ -22,6 +22,9 @@
   #   JAVA_OPTS   (Optional) Java runtime options used when the start,
   #   stop, or run command is executed.
   #
  +#   JPDA_TRANSPORT  (Optional) JPDA transport used when the jpda start
  +#   command is executed. The default is dt_socket.
  +#
   #   JPDA_ADDRESS(Optional) Java runtime options used when the jpda start
   #   command is executed. The default is 8000.
   #
  @@ -29,7 +32,7 @@
   #   (JSSE) installation, whose JAR files will be added to the
   #   system class path used to start Tomcat.
   #
  -# $Id: catalina.sh,v 1.27 2002/03/18 17:37:51 patrickl Exp $
  +# $Id: catalina.sh,v 1.28 2002/03/19 18:21:14 patrickl Exp $
   # -
   
   # OS specific support.  $var _must_ be set to either true or false.
  @@ -107,11 +110,14 @@
   echo Using JAVA_HOME:   $JAVA_HOME
   
   if [ $1 = jpda ] ; then
  +  if [ -z $JPDA_TRANSPORT ]; then
  +JPDA_TRANSPORT=dt_socket
  +  fi
 if [ -z $JPDA_ADDRESS ]; then
   JPDA_ADDRESS=8000
 fi
 if [ -z $JPDA_OPTS ]; then
  -JPDA_OPTS=-Xdebug 
-Xrunjdwp:transport=dt_socket,address=$JPDA_ADDRESS,server=y,suspend=n
  +JPDA_OPTS=-Xdebug 
-Xrunjdwp:transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=n
 fi
 CATALINA_OPTS=$CATALINA_OPTS $JPDA_OPTS
 shift
  
  
  

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

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

2002-03-19 Thread patrickl 

patrickl02/03/19 10:24:36

  Modified:catalina/src/bin Tag: tomcat_40_branch catalina.sh
  Log:
  Add JPDA_TRANSPORT environment variable
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.20.2.3  +8 -2  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.20.2.2
  retrieving revision 1.20.2.3
  diff -u -r1.20.2.2 -r1.20.2.3
  --- catalina.sh   18 Mar 2002 17:39:15 -  1.20.2.2
  +++ catalina.sh   19 Mar 2002 18:24:36 -  1.20.2.3
  @@ -22,6 +22,9 @@
   #   JAVA_OPTS   (Optional) Java runtime options used when the start,
   #   stop, or run command is executed.
   #
  +#   JPDA_TRANSPORT  (Optional) JPDA transport used when the jpda start
  +#   command is executed. The default is dt_socket.
  +#
   #   JPDA_ADDRESS(Optional) Java runtime options used when the jpda start
   #   command is executed. The default is 8000.
   #
  @@ -29,7 +32,7 @@
   #   (JSSE) installation, whose JAR files will be added to the
   #   system class path used to start Tomcat.
   #
  -# $Id: catalina.sh,v 1.20.2.2 2002/03/18 17:39:15 patrickl Exp $
  +# $Id: catalina.sh,v 1.20.2.3 2002/03/19 18:24:36 patrickl Exp $
   # -
   
   # OS specific support.  $var _must_ be set to either true or false.
  @@ -107,11 +110,14 @@
   echo Using JAVA_HOME:   $JAVA_HOME
   
   if [ $1 = jpda ] ; then
  +  if [ -z $JPDA_TRANSPORT ]; then
  +JPDA_TRANSPORT=dt_socket
  +  fi
 if [ -z $JPDA_ADDRESS ]; then
   JPDA_ADDRESS=8000
 fi
 if [ -z $JPDA_OPTS ]; then
  -JPDA_OPTS=-Xdebug 
-Xrunjdwp:transport=dt_socket,address=$JPDA_ADDRESS,server=y,suspend=n
  +JPDA_OPTS=-Xdebug 
-Xrunjdwp:transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=n
 fi
 CATALINA_OPTS=$CATALINA_OPTS $JPDA_OPTS
 shift
  
  
  

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

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

2002-03-18 Thread patrickl 

patrickl02/03/18 09:37:51

  Modified:catalina/src/bin catalina.sh
  Log:
  Correct misspelled environment variable name
  
  Revision  ChangesPath
  1.27  +2 -2  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- catalina.sh   21 Jan 2002 17:51:21 -  1.26
  +++ catalina.sh   18 Mar 2002 17:37:51 -  1.27
  @@ -29,7 +29,7 @@
   #   (JSSE) installation, whose JAR files will be added to the
   #   system class path used to start Tomcat.
   #
  -# $Id: catalina.sh,v 1.26 2002/01/21 17:51:21 patrickl Exp $
  +# $Id: catalina.sh,v 1.27 2002/03/18 17:37:51 patrickl Exp $
   # -
   
   # OS specific support.  $var _must_ be set to either true or false.
  @@ -110,7 +110,7 @@
 if [ -z $JPDA_ADDRESS ]; then
   JPDA_ADDRESS=8000
 fi
  -  if [ -z $JDPA_OPTS ]; then
  +  if [ -z $JPDA_OPTS ]; then
   JPDA_OPTS=-Xdebug 
-Xrunjdwp:transport=dt_socket,address=$JPDA_ADDRESS,server=y,suspend=n
 fi
 CATALINA_OPTS=$CATALINA_OPTS $JPDA_OPTS
  
  
  

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

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

2002-03-18 Thread patrickl 

patrickl02/03/18 09:39:15

  Modified:catalina/src/bin Tag: tomcat_40_branch catalina.sh
  Log:
  Correct misspelled environment variable name
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.20.2.2  +2 -2  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.20.2.1
  retrieving revision 1.20.2.2
  diff -u -r1.20.2.1 -r1.20.2.2
  --- catalina.sh   30 Jan 2002 18:10:39 -  1.20.2.1
  +++ catalina.sh   18 Mar 2002 17:39:15 -  1.20.2.2
  @@ -29,7 +29,7 @@
   #   (JSSE) installation, whose JAR files will be added to the
   #   system class path used to start Tomcat.
   #
  -# $Id: catalina.sh,v 1.20.2.1 2002/01/30 18:10:39 patrickl Exp $
  +# $Id: catalina.sh,v 1.20.2.2 2002/03/18 17:39:15 patrickl Exp $
   # -
   
   # OS specific support.  $var _must_ be set to either true or false.
  @@ -110,7 +110,7 @@
 if [ -z $JPDA_ADDRESS ]; then
   JPDA_ADDRESS=8000
 fi
  -  if [ -z $JDPA_OPTS ]; then
  +  if [ -z $JPDA_OPTS ]; then
   JPDA_OPTS=-Xdebug 
-Xrunjdwp:transport=dt_socket,address=$JPDA_ADDRESS,server=y,suspend=n
 fi
 CATALINA_OPTS=$CATALINA_OPTS $JPDA_OPTS
  
  
  

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

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

2002-01-18 Thread patrickl 

patrickl02/01/18 12:59:50

  Modified:catalina/src/bin catalina.sh
  Log:
  Correct typo in comments
  
  Revision  ChangesPath
  1.25  +2 -2  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- catalina.sh   15 Jan 2002 02:55:38 -  1.24
  +++ catalina.sh   18 Jan 2002 20:59:50 -  1.25
  @@ -16,7 +16,7 @@
   #   CATALINA_TMPDIR (Optional) Directory path location of temporary directory
   #   the JVM should use (java.io.tmpdir).  Defaults to
   #   $CATALINA_BASE/temp.
  -
  +#
   #   JAVA_HOME   Must point at your Java Development Kit installation.
   #
   #   JAVA_OPTS   (Optional) Java runtime options used when the start,
  @@ -29,7 +29,7 @@
   #   (JSSE) installation, whose JAR files will be added to the
   #   system class path used to start Tomcat.
   #
  -# $Id: catalina.sh,v 1.24 2002/01/15 02:55:38 patrickl Exp $
  +# $Id: catalina.sh,v 1.25 2002/01/18 20:59:50 patrickl Exp $
   # -
   
   # OS specific support.  $var _must_ be set to either true or false.
  
  
  

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

cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.sh tool-wrapper.sh setenv.sh

2001-11-27 Thread patrickl 

patrickl01/11/27 15:10:14

  Modified:catalina/src/bin catalina.sh tool-wrapper.sh
  Removed: catalina/src/bin setenv.sh
  Log:
  Incorporate Jon Stevens point that we should not distribute a setenv.sh as this will 
cause overwriting of the user's modified setenv.sh upon upgrade. Now, setenv.sh must 
be created by the user and if it does not exist (the default), setenv.sh is not 
sourced.
  
  Revision  ChangesPath
  1.22  +4 -2  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- catalina.sh   2001/11/27 22:34:25 1.21
  +++ catalina.sh   2001/11/27 23:10:14 1.22
  @@ -24,7 +24,7 @@
   # (JSSE) installation, whose JAR files will be added to the
   # system class path used to start Tomcat.
   #
  -# $Id: catalina.sh,v 1.21 2001/11/27 22:34:25 patrickl Exp $
  +# $Id: catalina.sh,v 1.22 2001/11/27 23:10:14 patrickl Exp $
   # -
   
   
  @@ -54,7 +54,9 @@
   fi
   
   # Get user customizable environment variables
  -. $CATALINA_HOME/bin/setenv.sh
  +if [ -r $CATALINA_HOME/bin/setenv.sh ] ; then
  +  . $CATALINA_HOME/bin/setenv.sh
  +fi
   
   if [ -z $CATALINA_OPTS ] ; then
 CATALINA_OPTS=
  
  
  
  1.3   +4 -2  jakarta-tomcat-4.0/catalina/src/bin/tool-wrapper.sh
  
  Index: tool-wrapper.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/tool-wrapper.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- tool-wrapper.sh   2001/11/27 22:34:25 1.2
  +++ tool-wrapper.sh   2001/11/27 23:10:14 1.3
  @@ -12,7 +12,7 @@
   #
   #   TOOL_OPTS (Optional) Java execution options for the tool.
   #
  -# $Id: tool-wrapper.sh,v 1.2 2001/11/27 22:34:25 patrickl Exp $
  +# $Id: tool-wrapper.sh,v 1.3 2001/11/27 23:10:14 patrickl Exp $
   # -
   
   
  @@ -42,7 +42,9 @@
   fi
   
   # Get user customizable environment variables
  -. $CATALINA_HOME/bin/setenv.sh
  +if [ -r $CATALINA_HOME/bin/setenv.sh ] ; then
  +  . $CATALINA_HOME/bin/setenv.sh
  +fi
   
   if [ -z $TOOL_OPTS ] ; then
 TOOL_OPTS=
  
  
  

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

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

2001-09-14 Thread craigmcc 

craigmcc01/09/14 13:01:21

  Modified:.RELEASE-PLAN-4.0.txt
   catalina/src/bin catalina.sh
  Log:
  Eliminate use of pushd and popd in the implementation of the debug
  option, because it is not supported on all shells.
  
  Submitted by: Patrick Luby [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.17  +5 -6  jakarta-tomcat-4.0/RELEASE-PLAN-4.0.txt
  
  Index: RELEASE-PLAN-4.0.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/RELEASE-PLAN-4.0.txt,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- RELEASE-PLAN-4.0.txt  2001/09/14 06:09:00 1.16
  +++ RELEASE-PLAN-4.0.txt  2001/09/14 20:01:21 1.17
  @@ -1,4 +1,4 @@
  -$Id: RELEASE-PLAN-4.0.txt,v 1.16 2001/09/14 06:09:00 craigmcc Exp $
  +$Id: RELEASE-PLAN-4.0.txt,v 1.17 2001/09/14 20:01:21 craigmcc Exp $
   
 Release Plan for Apache Tomcat 4.0
 ==
  @@ -55,6 +55,8 @@
   
   Connectors  3534File Upload doesn't work with Apache, mod_webapp, Tomcat 4
   
  +Jasper  3079NullPointerException in JakartaCommentGenerator.generateEnd
  +
   
   Nice To Have Fixes Before Final Release:
   ---
  @@ -76,17 +78,14 @@
   Catalina3515Process hanging after stopping Tomcat (awaiting
   reproducible failure case)
   
  -Catalina3589Cannot process taglib TLD when deployed through
  -EmbeddedManagerMBean
  -
   Catalina3594Have to reload page or page will not be shown
   (awaiting reproducible failure case, likely user error)
   
   Catalina3597Shutting down takes *ages* (not confirmed against
   latest Tomcat 4.0 build)
   
  -Jasper  3079NullPointerException in JakartaCommentGenerator.generateEnd
  -(awaiting reproducible failure case)
  +Catalina3612getServletPath() returns wrong value (awaiting reproducible
  +failure case)
   
   Jasper  3127jsp:directive.include/ not supported (awaiting
   reproducible failure case)
  
  
  
  1.20  +3 -5  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- catalina.sh   2001/09/12 17:38:47 1.19
  +++ catalina.sh   2001/09/14 20:01:21 1.20
  @@ -24,7 +24,7 @@
   # (JSSE) installation, whose JAR files will be added to the
   # system class path used to start Tomcat.
   #
  -# $Id: catalina.sh,v 1.19 2001/09/12 17:38:47 craigmcc Exp $
  +# $Id: catalina.sh,v 1.20 2001/09/14 20:01:21 craigmcc Exp $
   # -
   
   
  @@ -128,12 +128,11 @@
   if [ $1 = debug ] ; then
   
 shift
  -  pushd $CATALINA_HOME
 if [ $1 = -security ] ; then
   shift
   $JAVA_HOME/bin/jdb \
  $CATALINA_OPTS \
  -   -sourcepath ../../jakarta-tomcat-4.0/catalina/src/share \
  +   -sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
  -classpath $CP \
  -Dcatalina.base=$CATALINA_BASE \
  -Dcatalina.home=$CATALINA_HOME \
  @@ -141,13 +140,12 @@
 else
   $JAVA_HOME/bin/jdb \
  $CATALINA_OPTS \
  -   -sourcepath ../../jakarta-tomcat-4.0/catalina/src/share \
  +   -sourcepath $CATALINA_HOME/../../jakarta-tomcat-4.0/catalina/src/share \
  -classpath $CP \
  -Dcatalina.base=$CATALINA_BASE \
  -Dcatalina.home=$CATALINA_HOME \
  org.apache.catalina.startup.Bootstrap $@ start
 fi
  -  popd
   
   elif [ $1 = embedded ] ; then

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

2001-08-24 Thread craigmcc 

craigmcc01/08/24 12:08:15

  Modified:catalina/src/bin catalina.sh
  Log:
  Make it possible to start Catalina under a JPDA debugging environment.  If
  you execute
  
$CATALINA_HOME/bin/catalina.sh jpda start
  
  the options in the JPDA_OPTS environment variable are added to those
  specified by CATALINA_OPTS to enable debugging.  A convenient default
  value for JPDA_OPTS is made available if you do not specify it.
  
  Submitted by:  Henning P. Schmiedehausen [EMAIL PROTECTED],
   Jon Stevens [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.16  +15 -1 jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- catalina.sh   2001/07/01 22:58:04 1.15
  +++ catalina.sh   2001/08/24 19:08:15 1.16
  @@ -12,7 +12,11 @@
   #
   #   JAVA_HOME Must point at your Java Development Kit installation.
   #
  -# $Id: catalina.sh,v 1.15 2001/07/01 22:58:04 jon Exp $
  +#   JPDA_OPTS (Optional) Java runtime options used when the jpda start
  +# command is executed.  Defaults to
  +# -classic -Xdebug -Xnoagent 
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
  +#
  +# $Id: catalina.sh,v 1.16 2001/08/24 19:08:15 craigmcc Exp $
   # -
   
   
  @@ -45,6 +49,10 @@
 CATALINA_OPTS=
   fi
   
  +if [ -z $JPDA_OPTS ] ; then
  +  JPDA_OPTS=-classic -Xdebug -Xnoagent 
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
  +fi
  +
   if [ -z $JAVA_HOME ] ; then
 echo You must set JAVA_HOME to point at your Java Development Kit installation
 exit 1
  @@ -70,6 +78,11 @@
   
   # - Execute The Requested Command -
   
  +if [ $1 = jpda ] ; then
  +  CATALINA_OPTS=${CATALINA_OPTS} ${JPDA_OPTS}
  +  shift
  +fi
  +
   if [ $1 = debug ] ; then
   
 shift
  @@ -160,6 +173,7 @@
 echo   debug Start Catalina in a debugger
 echo   debug -security   Debug Catalina with a security manager
 echo   env   Set up environment variables that would be used
  +  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
 echo   start Start Catalina in a separate window

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

2001-07-01 Thread jon 

jon 01/07/01 15:58:05

  Modified:catalina/src/bin catalina.sh
  Log:
  removed extra -
  
  Revision  ChangesPath
  1.15  +2 -2  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- catalina.sh   2001/03/06 14:13:49 1.14
  +++ catalina.sh   2001/07/01 22:58:04 1.15
  @@ -12,7 +12,7 @@
   #
   #   JAVA_HOME Must point at your Java Development Kit installation.
   #
  -# $Id: catalina.sh,v 1.14 2001/03/06 14:13:49 glenn Exp $
  +# $Id: catalina.sh,v 1.15 2001/07/01 22:58:04 jon Exp $
   # -
   
   
  @@ -164,7 +164,7 @@
 echo   run -security Start in the current window with security manager
 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  Stop Catalina
 exit 1
   
   fi

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

2001-03-06 Thread glenn 

glenn   01/03/06 06:13:51

  Modified:catalina/src/bin catalina.sh
  Log:
  Fix embedded startup classpath, contributed by Ulf Jaehrig
  
  Revision  ChangesPath
  1.14  +5 -2  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- catalina.sh   2001/02/21 03:38:27 1.13
  +++ catalina.sh   2001/03/06 14:13:49 1.14
  @@ -12,7 +12,7 @@
   #
   #   JAVA_HOME Must point at your Java Development Kit installation.
   #
  -# $Id: catalina.sh,v 1.13 2001/02/21 03:38:27 glenn Exp $
  +# $Id: catalina.sh,v 1.14 2001/03/06 14:13:49 glenn Exp $
   # -
   
   
  @@ -93,7 +93,10 @@
   elif [ "$1" = "embedded" ] ; then
   
 shift
  -  for i in ${CATALINA_HOME}/server/*.jar ; do
  +  for i in ${CATALINA_HOME}/server/lib/*.jar ; do
  +CP=$i:${CP}
  +  done
  +  for i in ${CATALINA_HOME}/common/lib/*.jar ; do
   CP=$i:${CP}
 done
 echo Embedded Classpath: $CP
  
  
  

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

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

2000-12-15 Thread jon 

jon 00/12/15 19:33:09

  Modified:catalina/src/bin catalina.sh
  Log:
  clean some stuff up
  start to add in cygwin support
  
  NOTE: tomcat still cannot startup properly under cygwin! UG
  i will post a stack trace in another email.
  
  Revision  ChangesPath
  1.12  +15 -8 jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- catalina.sh   2000/12/14 20:44:15 1.11
  +++ catalina.sh   2000/12/16 03:33:09 1.12
  @@ -12,13 +12,13 @@
   #
   #   JAVA_HOME Must point at your Java Development Kit installation.
   #
  -# $Id: catalina.sh,v 1.11 2000/12/14 20:44:15 craigmcc Exp $
  +# $Id: catalina.sh,v 1.12 2000/12/16 03:33:09 jon Exp $
   # -
   
   
   # - Verify and Set Required Environment Variables -
   
  -if [ "$CATALINA_HOME" = "" ] ; then
  +if [ -z "$CATALINA_HOME" ] ; then
 ## resolve links - $0 may be a link to  home
 PRG=$0
 progname=`basename $0`
  @@ -41,24 +41,31 @@
   fi
   fi
   
  -if [ "$CATALINA_OPTS" = "" ] ; then
  +if [ -z "$CATALINA_OPTS" ] ; then
 CATALINA_OPTS=""
   fi
   
  -if [ "$JAVA_HOME" = "" ] ; then
  +if [ -z "$JAVA_HOME" ] ; then
 echo You must set JAVA_HOME to point at your Java Development Kit installation
 exit 1
   fi
   
   # - Set Up The System Classpath ---
   
  
-CP=$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/servlet.jar:$CATALINA_HOME/bin/naming.jar
  
+CP="$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/servlet.jar:$CATALINA_HOME/bin/naming.jar"
   
  -if [ -f $JAVA_HOME/lib/tools.jar ] ; then
  -  CP=$CP:$JAVA_HOME/lib/tools.jar
  +if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
  +  CP=$CP:"$JAVA_HOME/lib/tools.jar"
   fi
   
  -echo Using CLASSPATH: $CP
  +# convert the existing path to windows
  +if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
  +   CP=`cygpath --path --windows "$CP"`
  +   CATALINA_HOME=`cygpath --path --windows "$CATALINA_HOME"`
  +fi
  +
  +echo "Using CLASSPATH: $CP"
  +echo "Using CATALINA_HOME: $CATALINA_HOME"
   
   
   # - Execute The Requested Command -

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

2000-12-14 Thread craigmcc 

craigmcc00/12/14 12:44:21

  Modified:catalina/src/bin catalina.sh
  Log:
  Modify the startup/shutdown script so that it works from within the "bin"
  directory, as it already does in the Windows version.  Among other things,
  that means you can double click on the "startup.sh" or "shutdown.sh"
  scripts in a GUI environment to start or stop Tomcat.
  
  Revision  ChangesPath
  1.11  +21 -2 jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- catalina.sh   2000/11/04 16:09:33 1.10
  +++ catalina.sh   2000/12/14 20:44:15 1.11
  @@ -12,14 +12,33 @@
   #
   #   JAVA_HOME Must point at your Java Development Kit installation.
   #
  -# $Id: catalina.sh,v 1.10 2000/11/04 16:09:33 craigmcc Exp $
  +# $Id: catalina.sh,v 1.11 2000/12/14 20:44:15 craigmcc Exp $
   # -
   
   
   # - Verify and Set Required Environment Variables -
   
   if [ "$CATALINA_HOME" = "" ] ; then
  -  CATALINA_HOME=`pwd`
  +  ## resolve links - $0 may be a link to  home
  +  PRG=$0
  +  progname=`basename $0`
  +  
  +  while [ -h "$PRG" ] ; do
  +ls=`ls -ld "$PRG"`
  +link=`expr "$ls" : '.*- \(.*\)$'`
  +if expr "$link" : '.*/.*'  /dev/null; then
  + PRG="$link"
  +else
  + PRG="`dirname $PRG`/$link"
  +fi
  +  done
  +  
  +  CATALINA_HOME_1=`dirname "$PRG"`/..
  +  echo "Guessing CATALINA_HOME from catalina.sh to ${CATALINA_HOME_1}" 
  +if [ -d ${CATALINA_HOME_1}/conf ] ; then 
  + CATALINA_HOME=${CATALINA_HOME_1}
  + echo "Setting CATALINA_HOME to $CATALINA_HOME"
  +fi
   fi
   
   if [ "$CATALINA_OPTS" = "" ] ; then

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

2000-11-04 Thread craigmcc 

craigmcc00/11/04 08:08:55

  Modified:catalina/src/bin catalina.sh
  Log:
  Use "$JAVA_HOME/bin/java" instead of "java" to execute the JVM, to ensure
  that the correct runtime (based on the setting of JAVA_HOME) is selected,
  no matter what is on the user's path.  This functionality already exists
  in the Windows version of the startup script.
  
  PR: BugRat Bug Reports #341, 342
  Submitted by: Juan Jose Pablos ([EMAIL PROTECTED])
  
  Revision  ChangesPath
  1.9   +7 -7  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- catalina.sh   2000/11/02 06:14:08 1.8
  +++ catalina.sh   2000/11/04 16:08:54 1.9
  @@ -12,7 +12,7 @@
   #
   #   JAVA_HOME Must point at your Java Development Kit installation.
   #
  -# $Id: catalina.sh,v 1.8 2000/11/02 06:14:08 remm Exp $
  +# $Id: catalina.sh,v 1.9 2000/11/04 16:08:54 craigmcc Exp $
   # -
   
   
  @@ -71,7 +71,7 @@
   CP=$i:${CP}
 done
 echo Embedded Classpath: $CP
  -  java $CATALINA_OPTS -classpath $CP \
  +  $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
  -Dcatalina.home=$CATALINA_HOME \
  org.apache.catalina.startup.Embedded "$@"
   
  @@ -86,13 +86,13 @@
 if [ "$1" = "-security" ] ; then
   echo Using Security Manager
   shift
  -java $CATALINA_OPTS -classpath $CP \
  +$JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-Djava.security.manager \
-Djava.security.policy==$CATALINA_HOME/conf/catalina.policy \
-Dcatalina.home=$CATALINA_HOME \
org.apache.catalina.startup.Bootstrap "$@" start
 else
  -java $CATALINA_OPTS -classpath $CP \
  +$JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-Dcatalina.home=$CATALINA_HOME \
org.apache.catalina.startup.Bootstrap "$@" start
 fi
  @@ -104,14 +104,14 @@
 if [ "$1" = "-security" ] ; then
   echo Using Security Manager
   shift
  -java $CATALINA_OPTS -classpath $CP \
  +$JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-Djava.security.manager \
-Djava.security.policy==$CATALINA_HOME/conf/catalina.policy \
-Dcatalina.home=$CATALINA_HOME \
org.apache.catalina.startup.Bootstrap "$@" start \
 $CATALINA_HOME/logs/catalina.out 21 
 else
  -java $CATALINA_OPTS -classpath $CP \
  +$JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
-Dcatalina.home=$CATALINA_HOME \
org.apache.catalina.startup.Bootstrap "$@" start \
 $CATALINA_HOME/logs/catalina.out 21 
  @@ -120,7 +120,7 @@
   elif [ "$1" = "stop" ] ; then
   
 shift
  -  java $CATALINA_OPTS -classpath $CP \
  +  $JAVA_HOME/bin/java $CATALINA_OPTS -classpath $CP \
  -Dcatalina.home=$CATALINA_HOME \
  org.apache.catalina.startup.Bootstrap "$@" stop
   
  
  
  

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

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

2000-11-04 Thread craigmcc 

craigmcc00/11/04 08:09:34

  Modified:catalina/src/bin catalina.sh
  Log:
  Oops ... forgot the "jdb" calls for the debug option.
  
  Revision  ChangesPath
  1.10  +3 -3  jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- catalina.sh   2000/11/04 16:08:54 1.9
  +++ catalina.sh   2000/11/04 16:09:33 1.10
  @@ -12,7 +12,7 @@
   #
   #   JAVA_HOME Must point at your Java Development Kit installation.
   #
  -# $Id: catalina.sh,v 1.9 2000/11/04 16:08:54 craigmcc Exp $
  +# $Id: catalina.sh,v 1.10 2000/11/04 16:09:33 craigmcc Exp $
   # -
   
   
  @@ -50,13 +50,13 @@
 pushd $CATALINA_HOME
 if [ "$1" = "-security" ] ; then
   shift
  -jdb \
  +$JAVA_HOME/bin/jdb \
  $CATALINA_OPTS \
  -sourcepath ../../jakarta-tomcat-4.0/catalina/src/share \
  -classpath $CP -Dcatalina.home=$CATALINA_HOME \
  org.apache.catalina.startup.Bootstrap "$@" start
 else
  -jdb \
  +$JAVA_HOME/bin/jdb \
  $CATALINA_OPTS \
  -sourcepath ../../jakarta-tomcat-4.0/catalina/src/share \
  -classpath $CP -Dcatalina.home=$CATALINA_HOME \
  
  
  

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