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

2001-02-28 Thread remm 

remm01/02/28 17:30:14

  Modified:jasper/src/bin jasper.bat jasper.sh
  Log:
  - Fix Jasper scripts to reflect the changes in the directory structure.
Also add fix to run on Cygwin.
Patch submitted by Steve Downey 
  
  Revision  ChangesPath
  1.3   +3 -1  jakarta-tomcat-4.0/jasper/src/bin/jasper.bat
  
  Index: jasper.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jasper.bat2000/09/05 01:04:54 1.2
  +++ jasper.bat2001/03/01 01:30:13 1.3
  @@ -11,7 +11,7 @@
   rem   JAVA_HOME 
   rem   Must point at your Java Development Kit installation.
   rem
  -rem $Id: jasper.bat,v 1.2 2000/09/05 01:04:54 craigmcc Exp $
  +rem $Id: jasper.bat,v 1.3 2001/03/01 01:30:13 remm Exp $
   rem ---
   
   rem - Save Environment Variables That May Change --
  @@ -41,6 +41,8 @@
   rem FIXME below
   set CLASSPATH=%JASPER_HOME%\classes
   for %%i in (%JASPER_HOME%\lib\*.jar) do call %JASPER_HOME%\bin\jpappend.bat %%i
  +for %%i in (%JASPER_HOME%\jasper\*.jar) do call %JASPER_HOME%\bin\jpappend.bat %%i
  +set CLASSPATH=%CLASSPATH%;%JASPER_HOME%\bin\servlet.jar
   echo Using CLASSPATH: %CLASSPATH%
   
   rem - Execute The Requested Command ---
  
  
  
  1.2   +29 -4 jakarta-tomcat-4.0/jasper/src/bin/jasper.sh
  
  Index: jasper.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jasper.sh 2000/08/12 00:52:05 1.1
  +++ jasper.sh 2001/03/01 01:30:13 1.2
  @@ -13,14 +13,33 @@
   #   JAVA_HOME 
   #   Must point at your Java Development Kit installation.
   #
  -# $Id: jasper.sh,v 1.1 2000/08/12 00:52:05 pierred Exp $
  +# $Id: jasper.sh,v 1.2 2001/03/01 01:30:13 remm Exp $
   # -
   
   
   # - Verify and Set Required Environment Variables -
   
  -if [ "$JASPER_HOME" = "" ] ; then
  -  JASPER_HOME=`pwd`
  +if [ -z "$JASPER_HOME" ] ; then
  +  ## 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
  +  
  +  JASPER_HOME_1=`dirname "$PRG"`/..
  +  echo "Guessing JASPER_HOME from catalina.sh to ${JASPER_HOME_1}" 
  +if [ -d ${JASPER_HOME_1}/conf ] ; then 
  + JASPER_HOME=${JASPER_HOME_1}
  + echo "Setting JASPER_HOME to $JASPER_HOME"
  +fi
   fi
   
   if [ "$JASPER_OPTS" = "" ] ; then
  @@ -37,9 +56,15 @@
   # FIXME CP=$JASPER_HOME/dummy
   # FIXME below
   CP=$CP:$JASPER_HOME/classes
  -for i in $JASPER_HOME/lib/*.jar ; do
  +for i in $JASPER_HOME/lib/*.jar $JASPER_HOME/jasper/*.jar ; do
 CP=$CP:$i
   done
  +
  +# convert the existing path to windows
  +if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
  +   CP=`cygpath --path --windows "$CP"`
  +   JASPER_HOME=`cygpath --path --windows "$JASPER_HOME"`
  +fi
   
   echo Using CLASSPATH: $CP
   
  
  
  

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

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

2001-03-14 Thread horwat 

horwat  01/03/14 16:37:18

  Modified:jasper/src/bin jasper.bat jasper.sh
  Log:
  Fix jspc classpath, point to new servlet.jar file location.
  
  Submitted by: Steve Downey
  
  Revision  ChangesPath
  1.4   +2 -2  jakarta-tomcat-4.0/jasper/src/bin/jasper.bat
  
  Index: jasper.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.bat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jasper.bat2001/03/01 01:30:13 1.3
  +++ jasper.bat2001/03/15 00:37:17 1.4
  @@ -11,7 +11,7 @@
   rem   JAVA_HOME 
   rem   Must point at your Java Development Kit installation.
   rem
  -rem $Id: jasper.bat,v 1.3 2001/03/01 01:30:13 remm Exp $
  +rem $Id: jasper.bat,v 1.4 2001/03/15 00:37:17 horwat Exp $
   rem ---
   
   rem - Save Environment Variables That May Change --
  @@ -42,7 +42,7 @@
   set CLASSPATH=%JASPER_HOME%\classes
   for %%i in (%JASPER_HOME%\lib\*.jar) do call %JASPER_HOME%\bin\jpappend.bat %%i
   for %%i in (%JASPER_HOME%\jasper\*.jar) do call %JASPER_HOME%\bin\jpappend.bat %%i
  -set CLASSPATH=%CLASSPATH%;%JASPER_HOME%\bin\servlet.jar
  +set CLASSPATH=%CLASSPATH%;%JASPER_HOME%\common\lib\servlet.jar
   echo Using CLASSPATH: %CLASSPATH%
   
   rem - Execute The Requested Command ---
  
  
  
  1.3   +3 -2  jakarta-tomcat-4.0/jasper/src/bin/jasper.sh
  
  Index: jasper.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jasper.sh 2001/03/01 01:30:13 1.2
  +++ jasper.sh 2001/03/15 00:37:18 1.3
  @@ -13,7 +13,7 @@
   #   JAVA_HOME 
   #   Must point at your Java Development Kit installation.
   #
  -# $Id: jasper.sh,v 1.2 2001/03/01 01:30:13 remm Exp $
  +# $Id: jasper.sh,v 1.3 2001/03/15 00:37:18 horwat Exp $
   # -
   
   
  @@ -58,6 +58,7 @@
   CP=$CP:$JASPER_HOME/classes
   for i in $JASPER_HOME/lib/*.jar $JASPER_HOME/jasper/*.jar ; do
 CP=$CP:$i
  +CP=$CP:$JASPER_HOME/common/lib/servlet.jar
   done
   
   # convert the existing path to windows
  @@ -71,7 +72,7 @@
   
   # - Execute The Requested Command -
   
  -if [ "$1" = "debug" ] ; then
  +if [ "$1" = "jspc" ] ; then
   
 shift
 java $JASPER_OPTS -classpath $CP \

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

2002-01-30 Thread patrickl 

patrickl02/01/30 13:23:02

  Modified:jasper/src/bin Tag: tomcat_40_branch jasper.bat jasper.sh
  Log:
  Added jar files in common/lib and removed shared/lib to fix Bugzilla bug 6108
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.4.2.3   +2 -3  jakarta-tomcat-4.0/jasper/src/bin/jasper.bat
  
  Index: jasper.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.bat,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- jasper.bat30 Jan 2002 18:10:40 -  1.4.2.2
  +++ jasper.bat30 Jan 2002 21:23:02 -  1.4.2.3
  @@ -15,7 +15,7 @@
   rem   JAVA_OPTS (Optional) Java runtime options used when the "start",
   rem "stop", or "run" command is executed.
   rem
  -rem $Id: jasper.bat,v 1.4.2.2 2002/01/30 18:10:40 patrickl Exp $
  +rem $Id: jasper.bat,v 1.4.2.3 2002/01/30 21:23:02 patrickl Exp $
   rem ---
   
   rem Guess JASPER_HOME if not defined
  @@ -44,8 +44,7 @@
   
   rem Add on extra jar files to CLASSPATH
   for %%i in ("%JASPER_HOME%\lib\*.jar") do call "%JASPER_HOME%\bin\cpappend.bat" %%i
  -for %%i in ("%JASPER_HOME%\shared\lib\*.jar") do call 
"%JASPER_HOME%\bin\cpappend.bat" %%i
  -set CLASSPATH=%CLASSPATH%;%JASPER_HOME%\common\lib\servlet.jar
  +for %%i in ("%JASPER_HOME%\common\lib\*.jar") do call 
"%JASPER_HOME%\bin\cpappend.bat" %%i
   
   rem Parse arguments
   if ""%1"" == ""jspc"" goto doJspc
  
  
  
  1.5.2.2   +2 -3  jakarta-tomcat-4.0/jasper/src/bin/jasper.sh
  
  Index: jasper.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.sh,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- jasper.sh 30 Jan 2002 18:10:40 -  1.5.2.1
  +++ jasper.sh 30 Jan 2002 21:23:02 -  1.5.2.2
  @@ -14,7 +14,7 @@
   #   JAVA_OPTS (Optional) Java runtime options used when the "start",
   # "stop", or "run" command is executed.
   #
  -# $Id: jasper.sh,v 1.5.2.1 2002/01/30 18:10:40 patrickl Exp $
  +# $Id: jasper.sh,v 1.5.2.2 2002/01/30 21:23:02 patrickl Exp $
   # -
   
   # OS specific support.  $var _must_ be set to either true or false.
  @@ -64,10 +64,9 @@
   for i in "$JASPER_HOME"/lib/*.jar; do
 CLASSPATH="$CLASSPATH":"$i"
   done
  -for i in "$JASPER_HOME"/shared/lib/*.jar; do
  +for i in "$JASPER_HOME"/common/lib/*.jar; do
 CLASSPATH="$CLASSPATH":"$i"
   done
  -CLASSPATH="$CLASSPATH":"$JASPER_HOME"/common/lib/servlet.jar
   
   # For Cygwin, switch paths to Windows format before running java
   if $cygwin; then
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

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

2002-01-30 Thread patrickl 

patrickl02/01/30 13:29:03

  Modified:jasper/src/bin jasper.bat jasper.sh
  Log:
  Added common/lib jar files to CLASSPATH to fix Bugzilla bug 6108
  
  Revision  ChangesPath
  1.7   +2 -2  jakarta-tomcat-4.0/jasper/src/bin/jasper.bat
  
  Index: jasper.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.bat,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jasper.bat15 Jan 2002 02:55:39 -  1.6
  +++ jasper.bat30 Jan 2002 21:29:03 -  1.7
  @@ -15,7 +15,7 @@
   rem   JAVA_OPTS (Optional) Java runtime options used when the "start",
   rem "stop", or "run" command is executed.
   rem
  -rem $Id: jasper.bat,v 1.6 2002/01/15 02:55:39 patrickl Exp $
  +rem $Id: jasper.bat,v 1.7 2002/01/30 21:29:03 patrickl Exp $
   rem ---
   
   rem Guess JASPER_HOME if not defined
  @@ -43,7 +43,7 @@
   call "%JASPER_HOME%\bin\setclasspath.bat"
   
   rem Add on extra jar files to CLASSPATH
  -for %%i in ("%JASPER_HOME%\lib\*.jar") do call "%JASPER_HOME%\bin\cpappend.bat" %%i
  +for %%i in ("%JASPER_HOME%\common\lib\*.jar") do call 
"%JASPER_HOME%\bin\cpappend.bat" %%i
   for %%i in ("%JASPER_HOME%\shared\lib\*.jar") do call 
"%JASPER_HOME%\bin\cpappend.bat" %%i
   set CLASSPATH=%CLASSPATH%;%JASPER_HOME%\common\lib\servlet.jar
   
  
  
  
  1.7   +2 -2  jakarta-tomcat-4.0/jasper/src/bin/jasper.sh
  
  Index: jasper.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.sh,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jasper.sh 15 Jan 2002 02:55:39 -  1.6
  +++ jasper.sh 30 Jan 2002 21:29:03 -  1.7
  @@ -14,7 +14,7 @@
   #   JAVA_OPTS (Optional) Java runtime options used when the "start",
   # "stop", or "run" command is executed.
   #
  -# $Id: jasper.sh,v 1.6 2002/01/15 02:55:39 patrickl Exp $
  +# $Id: jasper.sh,v 1.7 2002/01/30 21:29:03 patrickl Exp $
   # -
   
   # OS specific support.  $var _must_ be set to either true or false.
  @@ -61,7 +61,7 @@
   fi
   
   # Add on extra jar files to CLASSPATH
  -for i in "$JASPER_HOME"/lib/*.jar; do
  +for i in "$JASPER_HOME"/common/lib/*.jar; do
 CLASSPATH="$CLASSPATH":"$i"
   done
   for i in "$JASPER_HOME"/shared/lib/*.jar; do
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

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

2002-01-30 Thread patrickl 

patrickl02/01/30 14:04:03

  Modified:jasper/src/bin Tag: tomcat_40_branch jasper.bat jasper.sh
  Log:
  Add classes directory to CLASSPATH
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.4.2.4   +2 -1  jakarta-tomcat-4.0/jasper/src/bin/jasper.bat
  
  Index: jasper.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.bat,v
  retrieving revision 1.4.2.3
  retrieving revision 1.4.2.4
  diff -u -r1.4.2.3 -r1.4.2.4
  --- jasper.bat30 Jan 2002 21:23:02 -  1.4.2.3
  +++ jasper.bat30 Jan 2002 22:04:02 -  1.4.2.4
  @@ -15,7 +15,7 @@
   rem   JAVA_OPTS (Optional) Java runtime options used when the "start",
   rem "stop", or "run" command is executed.
   rem
  -rem $Id: jasper.bat,v 1.4.2.3 2002/01/30 21:23:02 patrickl Exp $
  +rem $Id: jasper.bat,v 1.4.2.4 2002/01/30 22:04:02 patrickl Exp $
   rem ---
   
   rem Guess JASPER_HOME if not defined
  @@ -45,6 +45,7 @@
   rem Add on extra jar files to CLASSPATH
   for %%i in ("%JASPER_HOME%\lib\*.jar") do call "%JASPER_HOME%\bin\cpappend.bat" %%i
   for %%i in ("%JASPER_HOME%\common\lib\*.jar") do call 
"%JASPER_HOME%\bin\cpappend.bat" %%i
  +set CLASSPATH=%CLASSPATH%;%JASPER_HOME%\classes
   
   rem Parse arguments
   if ""%1"" == ""jspc"" goto doJspc
  
  
  
  1.5.2.3   +2 -1  jakarta-tomcat-4.0/jasper/src/bin/jasper.sh
  
  Index: jasper.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.sh,v
  retrieving revision 1.5.2.2
  retrieving revision 1.5.2.3
  diff -u -r1.5.2.2 -r1.5.2.3
  --- jasper.sh 30 Jan 2002 21:23:02 -  1.5.2.2
  +++ jasper.sh 30 Jan 2002 22:04:02 -  1.5.2.3
  @@ -14,7 +14,7 @@
   #   JAVA_OPTS (Optional) Java runtime options used when the "start",
   # "stop", or "run" command is executed.
   #
  -# $Id: jasper.sh,v 1.5.2.2 2002/01/30 21:23:02 patrickl Exp $
  +# $Id: jasper.sh,v 1.5.2.3 2002/01/30 22:04:02 patrickl Exp $
   # -
   
   # OS specific support.  $var _must_ be set to either true or false.
  @@ -67,6 +67,7 @@
   for i in "$JASPER_HOME"/common/lib/*.jar; do
 CLASSPATH="$CLASSPATH":"$i"
   done
  +CLASSPATH="$CLASSPATH":"$JASPER_HOME"/classes
   
   # For Cygwin, switch paths to Windows format before running java
   if $cygwin; then
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

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

2002-01-30 Thread patrickl 

patrickl02/01/30 14:13:50

  Modified:jasper/src/bin jasper.bat jasper.sh
  Log:
  Add shared/classes directory to CLASSPATH
  
  Revision  ChangesPath
  1.8   +2 -2  jakarta-tomcat-4.0/jasper/src/bin/jasper.bat
  
  Index: jasper.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.bat,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jasper.bat30 Jan 2002 21:29:03 -  1.7
  +++ jasper.bat30 Jan 2002 22:13:50 -  1.8
  @@ -15,7 +15,7 @@
   rem   JAVA_OPTS (Optional) Java runtime options used when the "start",
   rem "stop", or "run" command is executed.
   rem
  -rem $Id: jasper.bat,v 1.7 2002/01/30 21:29:03 patrickl Exp $
  +rem $Id: jasper.bat,v 1.8 2002/01/30 22:13:50 patrickl Exp $
   rem ---
   
   rem Guess JASPER_HOME if not defined
  @@ -45,7 +45,7 @@
   rem Add on extra jar files to CLASSPATH
   for %%i in ("%JASPER_HOME%\common\lib\*.jar") do call 
"%JASPER_HOME%\bin\cpappend.bat" %%i
   for %%i in ("%JASPER_HOME%\shared\lib\*.jar") do call 
"%JASPER_HOME%\bin\cpappend.bat" %%i
  -set CLASSPATH=%CLASSPATH%;%JASPER_HOME%\common\lib\servlet.jar
  +set CLASSPATH=%CLASSPATH%;%JASPER_HOME%\shared\classes
   
   rem Parse arguments
   if ""%1"" == ""jspc"" goto doJspc
  
  
  
  1.8   +2 -2  jakarta-tomcat-4.0/jasper/src/bin/jasper.sh
  
  Index: jasper.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jasper.sh 30 Jan 2002 21:29:03 -  1.7
  +++ jasper.sh 30 Jan 2002 22:13:50 -  1.8
  @@ -14,7 +14,7 @@
   #   JAVA_OPTS (Optional) Java runtime options used when the "start",
   # "stop", or "run" command is executed.
   #
  -# $Id: jasper.sh,v 1.7 2002/01/30 21:29:03 patrickl Exp $
  +# $Id: jasper.sh,v 1.8 2002/01/30 22:13:50 patrickl Exp $
   # -
   
   # OS specific support.  $var _must_ be set to either true or false.
  @@ -67,7 +67,7 @@
   for i in "$JASPER_HOME"/shared/lib/*.jar; do
 CLASSPATH="$CLASSPATH":"$i"
   done
  -CLASSPATH="$CLASSPATH":"$JASPER_HOME"/common/lib/servlet.jar
  +CLASSPATH="$CLASSPATH":"$JASPER_HOME"/shared/classes
   
   # For Cygwin, switch paths to Windows format before running java
   if $cygwin; then
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

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

2002-03-31 Thread patrickl 

patrickl02/03/31 16:13:23

  Modified:catalina/src/bin catalina.bat catalina.sh setclasspath.bat
setclasspath.sh tool-wrapper.bat tool-wrapper.sh
   catalina/src/share/org/apache/catalina/startup
Bootstrap.java Tool.java
   jasper/src/bin jasper.bat jasper.sh
  Log:
  Put jar files installed in the JDK's jre/lib/ext directory after the jar files and 
classes bundled with Tomcat. This is done by setting the "java.ext.dirs" property to a 
zero length string and by put the JDK's jre/lib/ext directory in Tomcat's class 
loader. This also fixes the problem that used to happen when you had the JSSE jars 
installed as a system extension and you had JSSE_HOME set.
  
  Revision  ChangesPath
  1.28  +9 -9  jakarta-tomcat-4.0/catalina/src/bin/catalina.bat
  
  Index: catalina.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- catalina.bat  19 Mar 2002 18:10:56 -  1.27
  +++ catalina.bat  1 Apr 2002 00:13:23 -   1.28
  @@ -28,12 +28,12 @@
   rem   system class path used to start Tomcat.
   rem
   rem   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
  -rem   command is executed. The default is "dt_shmem".
  +rem   command is executed. The default is "dt_socket".
   rem
   rem   JPDA_ADDRESS(Optional) Java runtime options used when the "jpda start"
  -rem   command is executed. The default is "jdbconn".
  +rem   command is executed. The default is "8000".
   rem
  -rem $Id: catalina.bat,v 1.27 2002/03/19 18:10:56 patrickl Exp $
  +rem $Id: catalina.bat,v 1.28 2002/04/01 00:13:23 patrickl Exp $
   rem ---
   
   rem Guess CATALINA_HOME if not defined
  @@ -91,10 +91,10 @@
   if not ""%1"" == ""jpda"" goto noJpda
   set JPDA=jpda
   if not "%JPDA_TRANSPORT%" == "" goto gotJpdaTransport
  -set JPDA_TRANSPORT=dt_shmem
  +set JPDA_TRANSPORT=dt_socket
   :gotJpdaTransport
   if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress
  -set JPDA_ADDRESS=jdbconn
  +set JPDA_ADDRESS=8000
   :gotJpdaAddress
   shift
   :noJpda
  @@ -173,17 +173,17 @@
   rem Execute Java with the applicable properties
   if not "%JPDA%" == "" goto doJpda
   if not "%SECURITY_POLICY_FILE%" == "" goto doSecurity
  -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" 
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
  +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -Djava.ext.dirs="%JAVA_EXT_DIRS%" 
-classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" 
-Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% 
%CMD_LINE_ARGS% %ACTION%
   goto end
   :doSecurity
  -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" 
-Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" 
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
  +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -Djava.ext.dirs="%JAVA_EXT_DIRS%" 
-classpath "%CLASSPATH%" -Djava.security.manager 
-Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" 
-Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% 
%CMD_LINE_ARGS% %ACTION%
   goto end
   :doJpda
   if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda
  -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" 
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
  +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" 
-Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%CLASSPATH%" 
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
   goto end
   :doSecurityJpda
  -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" 
-Djava.security.manager -Dja

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

2002-04-01 Thread patrickl 

patrickl02/04/01 11:51:32

  Modified:catalina/src/bin catalina.bat catalina.sh setclasspath.bat
setclasspath.sh tool-wrapper.bat tool-wrapper.sh
   catalina/src/share/org/apache/catalina/startup
Bootstrap.java Tool.java
   jasper/src/bin jasper.bat jasper.sh
  Log:
  Reverse 03/31/2002 patch that forced the JDK's installed extensions to be loaded at 
the end of the Catalina classloader's search list.
  
  Revision  ChangesPath
  1.29  +8 -8  jakarta-tomcat-4.0/catalina/src/bin/catalina.bat
  
  Index: catalina.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- catalina.bat  1 Apr 2002 00:13:23 -   1.28
  +++ catalina.bat  1 Apr 2002 19:51:31 -   1.29
  @@ -28,12 +28,12 @@
   rem   system class path used to start Tomcat.
   rem
   rem   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
  -rem   command is executed. The default is "dt_socket".
  +rem   command is executed. The default is "dt_shmem".
   rem
   rem   JPDA_ADDRESS(Optional) Java runtime options used when the "jpda start"
  -rem   command is executed. The default is "8000".
  +rem   command is executed. The default is "jdbconn".
   rem
  -rem $Id: catalina.bat,v 1.28 2002/04/01 00:13:23 patrickl Exp $
  +rem $Id: catalina.bat,v 1.29 2002/04/01 19:51:31 patrickl Exp $
   rem ---
   
   rem Guess CATALINA_HOME if not defined
  @@ -91,10 +91,10 @@
   if not ""%1"" == ""jpda"" goto noJpda
   set JPDA=jpda
   if not "%JPDA_TRANSPORT%" == "" goto gotJpdaTransport
  -set JPDA_TRANSPORT=dt_socket
  +set JPDA_TRANSPORT=dt_shmem
   :gotJpdaTransport
   if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress
  -set JPDA_ADDRESS=8000
  +set JPDA_ADDRESS=jdbconn
   :gotJpdaAddress
   shift
   :noJpda
  @@ -173,17 +173,17 @@
   rem Execute Java with the applicable properties
   if not "%JPDA%" == "" goto doJpda
   if not "%SECURITY_POLICY_FILE%" == "" goto doSecurity
  -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -Djava.ext.dirs="%JAVA_EXT_DIRS%" 
-classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" 
-Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% 
%CMD_LINE_ARGS% %ACTION%
  +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" 
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
   goto end
   :doSecurity
  -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -Djava.ext.dirs="%JAVA_EXT_DIRS%" 
-classpath "%CLASSPATH%" -Djava.security.manager 
-Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" 
-Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% 
%CMD_LINE_ARGS% %ACTION%
  +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" 
-Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" 
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
   goto end
   :doJpda
   if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda
  -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" 
-Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%CLASSPATH%" 
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
  +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" 
-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
   goto end
   :doSecurityJpda
  -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% 
-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
%DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" 
-Djava.ext.dirs="%JAVA_EXT_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager 
-Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" 
-Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% 
%CMD_LINE_ARGS% %ACTION%
  +%_EXECJAVA% %JAVA_OPTS% %CATALINA

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-01-30 Thread Craig R. McClanahan 



On 30 Jan 2002 [EMAIL PROTECTED] wrote:

> Date: 30 Jan 2002 21:23:02 -
> From: [EMAIL PROTECTED]
> Reply-To: Tomcat Developers List <[EMAIL PROTECTED]>
> To: [EMAIL PROTECTED]
> Subject: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat
> jasper.sh
>
> patrickl02/01/30 13:23:02
>
>   Modified:jasper/src/bin Tag: tomcat_40_branch jasper.bat jasper.sh
>   Log:
>   Added jar files in common/lib and removed shared/lib to fix Bugzilla bug 6108
>

Patrick, the Tomcat 4.0.x equivalents of "$CATALINA_HOME/shared/classes"
and "$CATALINA_HOME/shared/lib" are "$CATALINA_HOME/classes" and
"$CATALINA_HOME/lib", respectively.  You'll need the "lib" directory as
well in the 4.0 branch.

Craig


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

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-01-30 Thread Patrick Luby 

Craig,

"Craig R. McClanahan" wrote:
> 
> Patrick, the Tomcat 4.0.x equivalents of "$CATALINA_HOME/shared/classes"
> and "$CATALINA_HOME/shared/lib" are "$CATALINA_HOME/classes" and
> "$CATALINA_HOME/lib", respectively.  You'll need the "lib" directory as
> well in the 4.0 branch.
> 

I have "$CATALINA_HOME/lib" in the jasper.* scripts in the tomcat_40_branch
and use "$CATALINA_HOME/share/lib" in the HEAD branch. However, the
jasper.* scripts haven't had the "classes" directory in their CLASSPATH for
some time now.

Are these needed by the Jasper compiler? If so, I will add them.

Thanks,

Patrick

-- 
_
Patrick Luby  Email: [EMAIL PROTECTED]
Sun Microsystems  Phone: 408-276-7471
901 San Antonio Road, USCA14-303
Palo Alto, CA 94303-4900
_

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-01-30 Thread Remy Maucherat 

> Craig,
>
> "Craig R. McClanahan" wrote:
> >
> > Patrick, the Tomcat 4.0.x equivalents of "$CATALINA_HOME/shared/classes"
> > and "$CATALINA_HOME/shared/lib" are "$CATALINA_HOME/classes" and
> > "$CATALINA_HOME/lib", respectively.  You'll need the "lib" directory as
> > well in the 4.0 branch.
> >
>
> I have "$CATALINA_HOME/lib" in the jasper.* scripts in the
tomcat_40_branch
> and use "$CATALINA_HOME/share/lib" in the HEAD branch. However, the
> jasper.* scripts haven't had the "classes" directory in their CLASSPATH
for
> some time now.

Well, the old scripts had lots of bugs, so I guess that's one of them.

> Are these needed by the Jasper compiler? If so, I will add them.

It should have the same JARs and classes than when Jasper is running under
Tomcat, so it should also have "classes" (which is "shared/classes" in
4.0-HEAD).

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-01-30 Thread Craig R. McClanahan 



On Wed, 30 Jan 2002, Patrick Luby wrote:

> Date: Wed, 30 Jan 2002 13:42:30 -0800
> From: Patrick Luby <[EMAIL PROTECTED]>
> Reply-To: Tomcat Developers List <[EMAIL PROTECTED]>
> To: Tomcat Developers List <[EMAIL PROTECTED]>
> Subject: Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat
> jasper.sh
>
> Craig,
>
> "Craig R. McClanahan" wrote:
> >
> > Patrick, the Tomcat 4.0.x equivalents of "$CATALINA_HOME/shared/classes"
> > and "$CATALINA_HOME/shared/lib" are "$CATALINA_HOME/classes" and
> > "$CATALINA_HOME/lib", respectively.  You'll need the "lib" directory as
> > well in the 4.0 branch.
> >
>
> I have "$CATALINA_HOME/lib" in the jasper.* scripts in the tomcat_40_branch
> and use "$CATALINA_HOME/share/lib" in the HEAD branch. However, the
> jasper.* scripts haven't had the "classes" directory in their CLASSPATH for
> some time now.
>
> Are these needed by the Jasper compiler? If so, I will add them.
>

Yes, *if* the pages you are compiling reference a bean class that is found
there (handy because you don't need to package things in JAR files for
quick and dirty changes).  Adding the "classes" directories will make the
"class path"  environment seen by pages compiled under jspc identical to
those compiled on demand when you first execute a page.

> Thanks,
>
> Patrick

Craig


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

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-04-01 Thread costinm 

I would be -1 on this - the JDK documentation clearly defines the 
intended behavior of the ext directory, and this would create confusion
and unpredictible behavior. I expect a file in ext/ to be included 
_before_ tomcat classes - the way java documents it.  

( I don't use ext/, but classloader changes do _allways_ create problems )


Costin


On 1 Apr 2002 [EMAIL PROTECTED] wrote:

> patrickl02/03/31 16:13:23
> 
>   Modified:catalina/src/bin catalina.bat catalina.sh setclasspath.bat
> setclasspath.sh tool-wrapper.bat tool-wrapper.sh
>catalina/src/share/org/apache/catalina/startup
> Bootstrap.java Tool.java
>jasper/src/bin jasper.bat jasper.sh
>   Log:
>   Put jar files installed in the JDK's jre/lib/ext directory after the jar files and 
>classes bundled with Tomcat. This is done by setting the "java.ext.dirs" property to 
>a zero length string and by put the JDK's jre/lib/ext directory in Tomcat's class 
>loader. This also fixes the problem that used to happen when you had the JSSE jars 
>installed as a system extension and you had JSSE_HOME set.
>   
>   Revision  ChangesPath
>   1.28  +9 -9  jakarta-tomcat-4.0/catalina/src/bin/catalina.bat
>   
>   Index: catalina.bat
>   ===
>   RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
>   retrieving revision 1.27
>   retrieving revision 1.28
>   diff -u -r1.27 -r1.28
>   --- catalina.bat19 Mar 2002 18:10:56 -  1.27
>   +++ catalina.bat1 Apr 2002 00:13:23 -   1.28
>   @@ -28,12 +28,12 @@
>rem   system class path used to start Tomcat.
>rem
>rem   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
>   -rem   command is executed. The default is "dt_shmem".
>   +rem   command is executed. The default is "dt_socket".
>rem
>rem   JPDA_ADDRESS(Optional) Java runtime options used when the "jpda start"
>   -rem   command is executed. The default is "jdbconn".
>   +rem   command is executed. The default is "8000".
>rem
>   -rem $Id: catalina.bat,v 1.27 2002/03/19 18:10:56 patrickl Exp $
>   +rem $Id: catalina.bat,v 1.28 2002/04/01 00:13:23 patrickl Exp $
>rem ---
>
>rem Guess CATALINA_HOME if not defined
>   @@ -91,10 +91,10 @@
>if not ""%1"" == ""jpda"" goto noJpda
>set JPDA=jpda
>if not "%JPDA_TRANSPORT%" == "" goto gotJpdaTransport
>   -set JPDA_TRANSPORT=dt_shmem
>   +set JPDA_TRANSPORT=dt_socket
>:gotJpdaTransport
>if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress
>   -set JPDA_ADDRESS=jdbconn
>   +set JPDA_ADDRESS=8000
>:gotJpdaAddress
>shift
>:noJpda
>   @@ -173,17 +173,17 @@
>rem Execute Java with the applicable properties
>if not "%JPDA%" == "" goto doJpda
>if not "%SECURITY_POLICY_FILE%" == "" goto doSecurity
>   -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
>-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" 
>-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
>-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
>   +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
>-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -Djava.ext.dirs="%JAVA_EXT_DIRS%" 
>-classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" 
>-Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% 
>%CMD_LINE_ARGS% %ACTION%
>goto end
>:doSecurity
>   -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
>-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" 
>-Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" 
>-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
>-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
>   +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
>-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -Djava.ext.dirs="%JAVA_EXT_DIRS%" 
>-classpath "%CLASSPATH%" -Djava.security.manager 
>-Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" 
>-Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% 
>%CMD_LINE_ARGS% %ACTION%
>goto end
>:doJpda
>if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda
>   -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
>-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n 
>%DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" 
>-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
>-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
>   +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug 
>-Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-04-01 Thread Patrick Luby 

Costin,

The problem with the default JVM behavior can cause your application to 
crash or behave in unexpected ways if there are incompatible jars 
installed in the jre/lib/ext directory.

The method that we are using is still compliant with the JDK 
documentation in that we are using the documented way over overriding 
the extensions via setting the "java.ext.dirs" property at startup. This 
also the same type of override mechanism for the endorsed directories in 
JDK 1.4.

The only feature we are adding is the ability to add your extensions 
back at the end of the classloader's search list.

I am definitely not in favor of just letting the jre/lib/ext directory 
sit at the front of the classloader's search list as that makes Tomcat 
very sensitive (read breakable) due to the user's JVM configuration. 
Hence, I believe that the "java.ext.dirs=" property setting should 
remain. As to whether we should try to add back the extensions at the 
end of the classloader's search list, I am not too picky about.

My first concern is that Tomcat always can at least run no matter what 
extensions that user has installed. Whether or not those extensions are 
accessible to Tomcat is, IMHO, a feature that we may or may not want to 
include.

Thanks,

Patrick

[EMAIL PROTECTED] wrote:

> I would be -1 on this - the JDK documentation clearly defines the 
> intended behavior of the ext directory, and this would create confusion
> and unpredictible behavior. I expect a file in ext/ to be included 
> _before_ tomcat classes - the way java documents it.  
> 
> ( I don't use ext/, but classloader changes do _allways_ create problems )
> 
> 
> Costin
> 
> 
> On 1 Apr 2002 [EMAIL PROTECTED] wrote:
> 
> 
>>patrickl02/03/31 16:13:23
>>
>>  Modified:catalina/src/bin catalina.bat catalina.sh setclasspath.bat
>>setclasspath.sh tool-wrapper.bat tool-wrapper.sh
>>   catalina/src/share/org/apache/catalina/startup
>>Bootstrap.java Tool.java
>>   jasper/src/bin jasper.bat jasper.sh
>>  Log:
>>  Put jar files installed in the JDK's jre/lib/ext directory after the jar files and 
>classes bundled with Tomcat. This is done by setting the "java.ext.dirs" property to 
>a zero length string and by put the JDK's jre/lib/ext directory in Tomcat's class 
>loader. This also fixes the problem that used to happen when you had the JSSE jars 
>installed as a system extension and you had JSSE_HOME set.
>>  
>>  Revision  ChangesPath
>>  1.28  +9 -9  jakarta-tomcat-4.0/catalina/src/bin/catalina.bat
>>  
>>  Index: catalina.bat
>>  ===
>>  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
>>  retrieving revision 1.27
>>  retrieving revision 1.28
>>  diff -u -r1.27 -r1.28
>>  --- catalina.bat19 Mar 2002 18:10:56 -  1.27
>>  +++ catalina.bat1 Apr 2002 00:13:23 -   1.28
>>  @@ -28,12 +28,12 @@
>>   rem   system class path used to start Tomcat.
>>   rem
>>   rem   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
>>  -rem   command is executed. The default is "dt_shmem".
>>  +rem   command is executed. The default is "dt_socket".
>>   rem
>>   rem   JPDA_ADDRESS(Optional) Java runtime options used when the "jpda start"
>>  -rem   command is executed. The default is "jdbconn".
>>  +rem   command is executed. The default is "8000".
>>   rem
>>  -rem $Id: catalina.bat,v 1.27 2002/03/19 18:10:56 patrickl Exp $
>>  +rem $Id: catalina.bat,v 1.28 2002/04/01 00:13:23 patrickl Exp $
>>   rem ---
>>   
>>   rem Guess CATALINA_HOME if not defined
>>  @@ -91,10 +91,10 @@
>>   if not ""%1"" == ""jpda"" goto noJpda
>>   set JPDA=jpda
>>   if not "%JPDA_TRANSPORT%" == "" goto gotJpdaTransport
>>  -set JPDA_TRANSPORT=dt_shmem
>>  +set JPDA_TRANSPORT=dt_socket
>>   :gotJpdaTransport
>>   if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress
>>  -set JPDA_ADDRESS=jdbconn
>>  +set JPDA_ADDRESS=8000
>>   :gotJpdaAddress
>>   shift
>>   :noJpda
>>  @@ -173,17 +173,17 @@
>>   rem Execute Java with the applicable properties
>>   if not "%JPDA%" == "" goto doJpda
>>   if not "%SECURITY_POLICY_FILE%" == "" goto doSecurity
>>  -%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
>-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" 
>-Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" 
>-Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
>>  +%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% 
>-Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -Djava.ext.dirs="%JAVA_EXT_DIRS%" 
>-classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" 
>-Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% 
>%CMD_LINE_ARGS% %ACTION%
>>   goto end
>>   :do

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-04-01 Thread Remy Maucherat 

> Costin,
>
> The problem with the default JVM behavior can cause your application to
> crash or behave in unexpected ways if there are incompatible jars
> installed in the jre/lib/ext directory.
>
> The method that we are using is still compliant with the JDK
> documentation in that we are using the documented way over overriding
> the extensions via setting the "java.ext.dirs" property at startup. This
> also the same type of override mechanism for the endorsed directories in
> JDK 1.4.
>
> The only feature we are adding is the ability to add your extensions
> back at the end of the classloader's search list.
>
> I am definitely not in favor of just letting the jre/lib/ext directory
> sit at the front of the classloader's search list as that makes Tomcat
> very sensitive (read breakable) due to the user's JVM configuration.
> Hence, I believe that the "java.ext.dirs=" property setting should
> remain. As to whether we should try to add back the extensions at the
> end of the classloader's search list, I am not too picky about.
>
> My first concern is that Tomcat always can at least run no matter what
> extensions that user has installed. Whether or not those extensions are
> accessible to Tomcat is, IMHO, a feature that we may or may not want to
> include.

Fine, but your change creates problems (Jasper does not work on JDK 1.4
unless you delete common/endorsed/xerces.jar). I don't know why at this
time, but it should be fixed ASAP.

(Note: I don't care too much about this functionality ... Adding another CL
layer is dangerous and makes CL slower; unless other people think this is
useful I don't think we should add the feature)

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-04-01 Thread Christopher K. St. John 

Remy Maucherat wrote:
> 
> Adding another CL layer is dangerous and makes CL slower;
> unless other people think this is useful I don't think we
> should add the feature)
> 

 Another option is to use the manifest version tags to
identify which versions of the servletapi (and other
sensitive classes) are being used, and print out an
error message if they don't match what Tomcat requires.


Patrick Luby wrote:
> 
> My first concern is that Tomcat always can at least run no matter what
> extensions that user has installed. Whether or not those extensions are
> accessible to Tomcat is, IMHO, a feature that we may or may not want to
> include.

 Quitely dropping extensions that the user has installed
is unintuitve, and in some ways worse than the current
situation. 

 Perhaps a combination? Normal behavior is to check api
versions, exit if they don't match. Fallback if it's
impossible to remove the extensions is to use the
"java.ext.dirs=" hack? That lets a user get Tomcat
running no matter what, but with full awareness of the
tradeoff.


 Either way, the current situation is a problem for many
people, as can be seen by a quick scan of the tomcat-users
list. 


-- 
Christopher St. John [EMAIL PROTECTED]
DistribuTopia http://www.distributopia.com

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-04-01 Thread Remy Maucherat 

> Remy Maucherat wrote:

> >
> > My first concern is that Tomcat always can at least run no matter what
> > extensions that user has installed. Whether or not those extensions are
> > accessible to Tomcat is, IMHO, a feature that we may or may not want to
> > include.
>
>  Quitely dropping extensions that the user has installed
> is unintuitve, and in some ways worse than the current
> situation.
>
>  Perhaps a combination? Normal behavior is to check api
> versions, exit if they don't match. Fallback if it's
> impossible to remove the extensions is to use the
> "java.ext.dirs=" hack? That lets a user get Tomcat
> running no matter what, but with full awareness of the
> tradeoff.
>
>
>  Either way, the current situation is a problem for many
> people, as can be seen by a quick scan of the tomcat-users
> list.

Making life easier for first time users is a commendable goal, but it is
likely that the servlet API as a system extension will cause trouble anyway
at some point later on, so why bother ? Also, since Costin vetoed the patch,
he's the one who should be convinced (I'm merely -0 here; -1 if the problems
with JDK 1.4 can't be fixed).

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-04-01 Thread costinm 

On Mon, 1 Apr 2002, Patrick Luby wrote:

> Costin,
> 
> The problem with the default JVM behavior can cause your application to 
> crash or behave in unexpected ways if there are incompatible jars 
> installed in the jre/lib/ext directory.

Then report the bug to the JVM people :-)


> The method that we are using is still compliant with the JDK 
> documentation in that we are using the documented way over overriding 
> the extensions via setting the "java.ext.dirs" property at startup. This 
> also the same type of override mechanism for the endorsed directories in 
> JDK 1.4.

> The only feature we are adding is the ability to add your extensions 
> back at the end of the classloader's search list.

I can live with having tomcat explicitely disable ext.dir - most people 
agree /ext is evil and it causes problems.

But adding it back with a different behavior is hardly 'compliant'.

The reason I disagree with removing ext - it makes tomcat even more 
dependent on startup script behavior, and adds another difference with the 
'normal' behavior for classloaders ( it already brakes one of the 
fundamental rules - the delegation ). 


> I am definitely not in favor of just letting the jre/lib/ext directory 
> sit at the front of the classloader's search list as that makes Tomcat 
> very sensitive (read breakable) due to the user's JVM configuration. 
> Hence, I believe that the "java.ext.dirs=" property setting should 
> remain. As to whether we should try to add back the extensions at the 
> end of the classloader's search list, I am not too picky about.

The ext/ was created with a purpose - and is a standard part of java.
If we don't like it - we can recommend the users to not use it, but
if the user does want to use it, it should operate the way it was 
intended. 

> My first concern is that Tomcat always can at least run no matter what 
> extensions that user has installed. Whether or not those extensions are 
> accessible to Tomcat is, IMHO, a feature that we may or may not want to 
> include.

If the user installs some incompatible extensions - I think tomcat should 
report an error or not run. I'm ok with adding checks in tomcat to verify 
that the files in ext/ are compatible.

Costin


--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-04-01 Thread Patrick Luby 

Remy,

Remy Maucherat wrote:

> 
> Fine, but your change creates problems (Jasper does not work on JDK 1.4
> unless you delete common/endorsed/xerces.jar). I don't know why at this
> time, but it should be fixed ASAP.
> 
> (Note: I don't care too much about this functionality ... Adding another CL
> layer is dangerous and makes CL slower; unless other people think this is
> useful I don't think we should add the feature)
> 
> Remy
> 
> 
I think I found the problem. In JDK 1.4, the StandardClassLoader's

loadClass() method appears to be unconditionally delegating to its

parent classloader even when setDelegate is set to false. This
appears to be caused by changes to the URLClassLoader class in JDK
1.4.

BTW, I can eliminate the use of a separate classloader and put the
jre/lib/ext directory in the existing catalinaLoader and sharedLoader
instances. However, to do this, I need to change the getClassPath()
method in JspEngineContext.java so that it returns a classpath that
is consistent with the classloaders' search order. Right now, the
getClassPath() method (which is used for all JSP compilation) returns
a classpath in the exact opposite order of the order used by the
sharedLoader classloader.

I originally put the extra classloader in to work around this 
getClassPath() bug. However, given the JDK 1.4 differences in the
classloader delegation behavior, I think it would be better for me
to fix the getClassPath() problem and move the jre/lib/ext directory
into the existing catalinaLoader and sharedLoader instances like we
do for the endorsed directories.

Costin,

Does this sound reasonable to you?

Thanks,

Patrick




-- 

Patrick Luby Email: [EMAIL PROTECTED]
Sun Microsystems Phone: 408-276-7471
901 San Antonio Road, USCA14-303
Palo Alto, CA 94303-4900



--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-04-01 Thread costinm 

On Mon, 1 Apr 2002, Patrick Luby wrote:

> BTW, I can eliminate the use of a separate classloader and put the
> jre/lib/ext directory in the existing catalinaLoader and sharedLoader
> instances. However, to do this, I need to change the getClassPath()
> method in JspEngineContext.java so that it returns a classpath that
> is consistent with the classloaders' search order. Right now, the
> getClassPath() method (which is used for all JSP compilation) returns
> a classpath in the exact opposite order of the order used by the
> sharedLoader classloader.
> 
> I originally put the extra classloader in to work around this 
> getClassPath() bug. However, given the JDK 1.4 differences in the
> classloader delegation behavior, I think it would be better for me
> to fix the getClassPath() problem and move the jre/lib/ext directory
> into the existing catalinaLoader and sharedLoader instances like we
> do for the endorsed directories.
> 
> Costin,
> 
> Does this sound reasonable to you?

No. 

You can edit the doc - and use big font to tell users not to use ext/, 
or add a small check at startup and verify the servlet version. 

Changing the behavior of ext/ and class loader is the wrong solution,
and shouldn't be done.

Are you sure it doesn't have security implications ? JDK/ext can
be protected and may have site-specific sensitive libraries. 


Costin



--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-04-01 Thread Remy Maucherat 

> > Fine, but your change creates problems (Jasper does not work on JDK 1.4
> > unless you delete common/endorsed/xerces.jar). I don't know why at this
> > time, but it should be fixed ASAP.
> >
> > (Note: I don't care too much about this functionality ... Adding another
CL
> > layer is dangerous and makes CL slower; unless other people think this
is
> > useful I don't think we should add the feature)
> >
> > Remy
> >
> >
> I think I found the problem. In JDK 1.4, the StandardClassLoader's
>
> loadClass() method appears to be unconditionally delegating to its
>
> parent classloader even when setDelegate is set to false. This
> appears to be caused by changes to the URLClassLoader class in JDK
> 1.4.

I had missed that it was attempting to change the delegation model
(apparently, Costin didn't, that's why he was complaining, I suppose ;-)).
I'm -1 for the patch then; please revert it. The use case is clearly not
worth introducing non-compliant behavior; I fully agree with Costin here: if
the ext mechanism is broken, then it's up to the JDK to fix it.

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-04-01 Thread Patrick Luby 

Remy and Costin,

I will reverse the patch since there are enough -1s on this. One 
question: should we continue to set the "-Djava.ext.dirs=" in the 
wrapper scripts? This disables the extensions but without any code
change to Tomcat. Or do we want to revert back to the original
scripts where the extensions are enabled by default?

Patrick

Remy Maucherat wrote:

>>>Fine, but your change creates problems (Jasper does not work on JDK 1.4
>>>unless you delete common/endorsed/xerces.jar). I don't know why at this
>>>time, but it should be fixed ASAP.
>>>
>>>(Note: I don't care too much about this functionality ... Adding another
>>>
> CL
> 
>>>layer is dangerous and makes CL slower; unless other people think this
>>>
> is
> 
>>>useful I don't think we should add the feature)
>>>
>>>Remy
>>>
>>>
>>>
>>I think I found the problem. In JDK 1.4, the StandardClassLoader's
>>
>>loadClass() method appears to be unconditionally delegating to its
>>
>>parent classloader even when setDelegate is set to false. This
>>appears to be caused by changes to the URLClassLoader class in JDK
>>1.4.
>>
> 
> I had missed that it was attempting to change the delegation model
> (apparently, Costin didn't, that's why he was complaining, I suppose ;-)).
> I'm -1 for the patch then; please revert it. The use case is clearly not
> worth introducing non-compliant behavior; I fully agree with Costin here: if
> the ext mechanism is broken, then it's up to the JDK to fix it.
> 
> Remy
> 
> 
> --
> To unsubscribe, e-mail:   
> For additional commands, e-mail: 
> 


-- 

Patrick Luby Email: [EMAIL PROTECTED]
Sun Microsystems Phone: 408-276-7471
901 San Antonio Road, USCA14-303
Palo Alto, CA 94303-4900



--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh

2002-04-01 Thread costinm 

On Mon, 1 Apr 2002, Patrick Luby wrote:

> Remy and Costin,
> 
> I will reverse the patch since there are enough -1s on this. One 
> question: should we continue to set the "-Djava.ext.dirs=" in the 
> wrapper scripts? This disables the extensions but without any code
> change to Tomcat. Or do we want to revert back to the original
> scripts where the extensions are enabled by default?

I don't think we should disable ext/  - we can recommend people to 
not use it ( unless they know what they're doing ). 

If someone chooses to use ext/, he expect it to work - because that's 
what the java doc says. 

I'm -0, since we do disable CLASSPATH in the script.

In general I think it's better to minimize the number of special settings
in the command line. The .sh/.bat is just one way to start tomcat, 
there are implications when you embed it, start it with wrapper or 
from other apps, etc. 

If you really want to have fun with the startup, it would be better to  
remove more 'special' behaviors from .sh/.bat and clearly documenting 
what remains - i.e. the java options and classpath that are required
to start tomcat.


Costin


 


> 
> Patrick
> 
> Remy Maucherat wrote:
> 
> >>>Fine, but your change creates problems (Jasper does not work on JDK 1.4
> >>>unless you delete common/endorsed/xerces.jar). I don't know why at this
> >>>time, but it should be fixed ASAP.
> >>>
> >>>(Note: I don't care too much about this functionality ... Adding another
> >>>
> > CL
> > 
> >>>layer is dangerous and makes CL slower; unless other people think this
> >>>
> > is
> > 
> >>>useful I don't think we should add the feature)
> >>>
> >>>Remy
> >>>
> >>>
> >>>
> >>I think I found the problem. In JDK 1.4, the StandardClassLoader's
> >>
> >>loadClass() method appears to be unconditionally delegating to its
> >>
> >>parent classloader even when setDelegate is set to false. This
> >>appears to be caused by changes to the URLClassLoader class in JDK
> >>1.4.
> >>
> > 
> > I had missed that it was attempting to change the delegation model
> > (apparently, Costin didn't, that's why he was complaining, I suppose ;-)).
> > I'm -1 for the patch then; please revert it. The use case is clearly not
> > worth introducing non-compliant behavior; I fully agree with Costin here: if
> > the ext mechanism is broken, then it's up to the JDK to fix it.
> > 
> > Remy
> > 
> > 
> > --
> > To unsubscribe, e-mail:   
> > For additional commands, e-mail: 
> > 
> 
> 
> 


--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh jspc.bat jspc.sh jpappend.bat

2002-01-14 Thread patrickl 

patrickl02/01/14 18:55:39

  Modified:catalina/src/bin catalina.bat catalina.sh cpappend.bat
digest.bat digest.sh shutdown.bat shutdown.sh
startup.bat startup.sh tool-wrapper.bat
tool-wrapper.sh
   jasper/src/bin jasper.bat jasper.sh jspc.bat jspc.sh
  Added:   catalina/src/bin setclasspath.bat setclasspath.sh
  Removed: jasper/src/bin jpappend.bat
  Log:
  Refactor the various Catalina and Jasper shell scripts to implement the
  following improvements:
  1. The ability to handle spaces in the CATALINA_HOME, JASPER_HOME, or JAVA_HOME
 environment variables for both Windows and Unix.
  2. Enable jdb and jpda support on Windows (these were only available on Unix
 previously) and made the Unix version work with 1.3 and 1.4 JDKs.
  3. Enable the scripts to run on Windows 98 and ME (the DOS shell on these
 platforms do not support "=" characters in environment variables and does
 not support the "^" escape character)
  4. Accurate determination of CATALINA_HOME for Unix when the executable is
 a softlink ($0 for a softlink is the path to the softlink, not the path
 to the file that the softlink points too). Thanks to the jakarta-ant
 developers for this fix.
  5. Centralization of the JAVA_HOME checking and setting of the common portion
 of the CLASSPATH.
  6. Provided a means to override the XML parser provided with JDK 1.4 using the
 JDK 1.4 -Djava.endorsed.dirs property. Currently, this property is not set
 pending further testing of this option.
  
  Note: Some of the changes do not work with JDK 1.2 (e.g. new jpda option).
  However, Tomcat currently does not compile with JDK 1.2, so I did not think
  that would be a big issue. If JDK 1.2 support is important, I will test out
  the scripts when a JDK 1.2 build is available.
  
  Revision  ChangesPath
  1.24  +128 -99   jakarta-tomcat-4.0/catalina/src/bin/catalina.bat
  
  Index: catalina.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- catalina.bat  26 Dec 2001 01:22:10 -  1.23
  +++ catalina.bat  15 Jan 2002 02:55:38 -  1.24
  @@ -1,154 +1,183 @@
   @echo off
  +if "%OS%" == "Windows_NT" setlocal
   rem ---
  -rem catalina.bat - Start/Stop Script for the CATALINA Server
  +rem Start/Stop Script for the CATALINA Server
   rem
  -rem Environment Variable Prequisites:
  +rem Environment Variable Prequisites
  +rem
  +rem   CATALINA_HOME   May point at your Catalina "build" directory.
   rem
   rem   CATALINA_BASE   (Optional) Base directory for resolving dynamic portions
   rem   of a Catalina installation.  If not present, resolves to
   rem   the same directory that CATALINA_HOME points to.
   rem
  -rem   CATALINA_HOME   (Optional) May point at your Catalina "build" directory.
  -rem   If not present, the current working directory is assumed.
  -rem
   rem   CATALINA_OPTS   (Optional) Java runtime options used when the "start",
   rem   "stop", or "run" command is executed.
   rem
   rem   CATALINA_TMPDIR (Optional) Directory path location of temporary directory
   rem   the JVM should use (java.io.tmpdir).  Defaults to
  -rem   $CATALINA_BASE/temp.
  +rem   %CATALINA_BASE%\temp.
   rem
   rem   JAVA_HOME   Must point at your Java Development Kit installation.
   rem
  +rem   JAVA_OPTS   (Optional) Java runtime options used when the "start",
  +rem   "stop", or "run" command is executed.
  +rem
   rem   JSSE_HOME   (Optional) May point at your Java Secure Sockets Extension
   rem   (JSSE) installation, whose JAR files will be added to the
   rem   system class path used to start Tomcat.
   rem
  -rem $Id: catalina.bat,v 1.23 2001/12/26 01:22:10 glenn Exp $
  +rem   JPDA_ADDRESS(Optional) Java runtime options used when the "jpda start"
  +rem   command is executed. The default is "jdbconn".
  +rem
  +rem $Id: catalina.bat,v 1.24 2002/01/15 02:55:38 patrickl Exp $
   rem ---
   
  -
  -rem - Save Environment Variables That May Change --
  -
  -set _CATALINA_BASE=%CATALINA_BASE%
  -set _CATALINA_HOME=%CATALINA_HOME%
  -set _CATALINA_TMPDIR=%CATALINA_TMPDIR%
  -set _CLASSPATH=%CLASSPATH%
  -set _CP=%CP%
  -
  -
  -rem - Verify and Set Required Environment Variables ---
  -
  +rem Guess CATALINA_HOME if not defined
   if not "%CATALINA_HOME%" == "" goto gotHome
   set CATALINA_HOME=.
   if exist "%CATALINA_HOME%\bin\catalina.bat" g

cvs commit: jakarta-tomcat-4.0/jasper/src/bin jasper.bat jasper.sh jspc.bat jspc.sh jpappend.bat

2002-01-30 Thread patrickl 

patrickl02/01/30 10:10:40

  Modified:catalina/src/bin Tag: tomcat_40_branch catalina.bat
catalina.sh cpappend.bat digest.bat digest.sh
shutdown.bat shutdown.sh startup.bat startup.sh
   jasper/src/bin Tag: tomcat_40_branch jasper.bat jasper.sh
jspc.bat jspc.sh
  Added:   catalina/src/bin Tag: tomcat_40_branch setclasspath.bat
setclasspath.sh tool-wrapper.bat tool-wrapper.sh
  Removed: jasper/src/bin Tag: tomcat_40_branch jpappend.bat
  Log:
  Integrate newer scripts from HEAD branch into this branch
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.18.2.4  +147 -101  jakarta-tomcat-4.0/catalina/src/bin/catalina.bat
  
  Index: catalina.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.bat,v
  retrieving revision 1.18.2.3
  retrieving revision 1.18.2.4
  diff -u -r1.18.2.3 -r1.18.2.4
  --- catalina.bat  12 Oct 2001 17:10:52 -  1.18.2.3
  +++ catalina.bat  30 Jan 2002 18:10:39 -  1.18.2.4
  @@ -1,137 +1,183 @@
   @echo off
  +if "%OS%" == "Windows_NT" setlocal
   rem ---
  -rem catalina.bat - Start/Stop Script for the CATALINA Server
  +rem Start/Stop Script for the CATALINA Server
   rem
  -rem Environment Variable Prequisites:
  +rem Environment Variable Prequisites
   rem
  -rem   CATALINA_BASE (Optional) Base directory for resolving dynamic portions
  -rem of a Catalina installation.  If not present, resolves to
  -rem the same directory that CATALINA_HOME points to.
  +rem   CATALINA_HOME   May point at your Catalina "build" directory.
   rem
  -rem   CATALINA_HOME (Optional) May point at your Catalina "build" directory.
  -rem If not present, the current working directory is assumed.
  +rem   CATALINA_BASE   (Optional) Base directory for resolving dynamic portions
  +rem   of a Catalina installation.  If not present, resolves to
  +rem   the same directory that CATALINA_HOME points to.
   rem
  -rem   CATALINA_OPTS (Optional) Java runtime options used when the "start",
  -rem "stop", or "run" command is executed.
  +rem   CATALINA_OPTS   (Optional) Java runtime options used when the "start",
  +rem   "stop", or "run" command is executed.
   rem
  -rem   JAVA_HOME Must point at your Java Development Kit installation.
  +rem   CATALINA_TMPDIR (Optional) Directory path location of temporary directory
  +rem   the JVM should use (java.io.tmpdir).  Defaults to
  +rem   %CATALINA_BASE%\temp.
   rem
  -rem   JSSE_HOME (Optional) May point at your Java Secure Sockets Extension
  -rem (JSSE) installation, whose JAR files will be added to the
  -rem system class path used to start Tomcat.
  +rem   JAVA_HOME   Must point at your Java Development Kit installation.
   rem
  -rem $Id: catalina.bat,v 1.18.2.3 2001/10/12 17:10:52 craigmcc Exp $
  +rem   JAVA_OPTS   (Optional) Java runtime options used when the "start",
  +rem   "stop", or "run" command is executed.
  +rem
  +rem   JSSE_HOME   (Optional) May point at your Java Secure Sockets Extension
  +rem   (JSSE) installation, whose JAR files will be added to the
  +rem   system class path used to start Tomcat.
  +rem
  +rem   JPDA_ADDRESS(Optional) Java runtime options used when the "jpda start"
  +rem   command is executed. The default is "jdbconn".
  +rem
  +rem $Id: catalina.bat,v 1.18.2.4 2002/01/30 18:10:39 patrickl Exp $
   rem ---
   
  -
  -rem - Save Environment Variables That May Change --
  -
  -set _CATALINA_BASE=%CATALINA_BASE%
  -set _CATALINA_HOME=%CATALINA_HOME%
  -set _CLASSPATH=%CLASSPATH%
  -set _CP=%CP%
  -
  -
  -rem - Verify and Set Required Environment Variables ---
  -
  -if not "%JAVA_HOME%" == "" goto gotJava
  -echo You must set JAVA_HOME to point at your Java Development Kit installation
  -goto cleanup
  -:gotJava
  -
  +rem Guess CATALINA_HOME if not defined
   if not "%CATALINA_HOME%" == "" goto gotHome
   set CATALINA_HOME=.
   if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
   set CATALINA_HOME=..
   :gotHome
   if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
  -echo Cannot find catalina.bat in %CATALINA_HOME%\bin
  -echo Please check your CATALINA_HOME setting
  -goto cleanup
  +echo The CATALINA_HOME environment variable is not defined correctly
  +echo This environment variable is needed to run this program
  +goto end
   :okHome
   
  -if not "%CATALINA_BASE%" == "