tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@locus.apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.bat catalina.sh
Date Wed, 13 Sep 2000 01:54:20 GMT
craigmcc    00/09/12 18:54:20

  Modified:    catalina/src/bin catalina.bat catalina.sh
  Log:
  Eliminate the use of -Xbootclasspath, which is no longer needed since
  org.apache.catalina.startup.Bootstrap already builds a custom class loader
  for the internal Catalina classes, and does *not* make them visible to
  web applications.
  
  Revision  Changes    Path
  1.5       +7 -18     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- catalina.bat	2000/09/05 01:04:52	1.4
  +++ catalina.bat	2000/09/13 01:54:19	1.5
  @@ -12,13 +12,12 @@
   rem
   rem   JAVA_HOME     Must point at your Java Development Kit installation.
   rem
  -rem $Id: catalina.bat,v 1.4 2000/09/05 01:04:52 craigmcc Exp $
  +rem $Id: catalina.bat,v 1.5 2000/09/13 01:54:19 craigmcc Exp $
   rem ---------------------------------------------------------------------------
   
   
   rem ----- Save Environment Variables That May Change --------------------------
   
  -set _BP=%BP%
   set _CATALINA_HOME=%CATALINA_HOME%
   set _CLASSPATH=%CLASSPATH%
   set _CP=%CP%
  @@ -51,17 +50,9 @@
   set _RUNJAVA="%JAVA_HOME%\bin\java"
   
   
  -rem ----- Set Up The Bootstrap Classpath --------------------------------------
  -
  -:setBootpath
  -set BP=%CATALINA_HOME%\bin\bootstrap.jar;%JAVA_HOME%\jre\lib\i18n.jar;%JAVA_HOME%\jre\lib\rt.jar;%JAVA_HOME%\lib\tools.jar
  -
  -echo Using BOOT PATH: %BP%
  -
  -
   rem ----- Set Up The Runtime Classpath ----------------------------------------
   
  -set CP=%CATALINA_HOME%\dummy
  +set CP=%CATALINA_HOME%\bin\bootstrap.jar
   rem Try to determine if CATALINA_HOME contains spaces
   if exist %CATALINA_HOME%\server\catalina.jar goto dynClasspath
   echo Your CATALINA_HOME appears to contain spaces.
  @@ -117,23 +108,23 @@
   
   :doRun
   if "%2" == "-security" goto doRunSecure
  -%_RUNJAVA% %CATALINA_OPTS% -Xbootclasspath:%BP% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap
%2 %3 %4 %5 %6 %7 %8 %9 start
  +%_RUNJAVA% %CATALINA_OPTS% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap
%2 %3 %4 %5 %6 %7 %8 %9 start
   goto cleanup
   :doRunSecure
  -%_RUNJAVA% %CATALINA_OPTS% -Djava.security.manager -Djava.security.policy=="%CATALINA_HOME%/conf/catalina.policy"
-Xbootclasspath:%BP% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap
%3 %4 %5 %6 %7 %8 %9 start
  +%_RUNJAVA% %CATALINA_OPTS% -Djava.security.manager -Djava.security.policy=="%CATALINA_HOME%/conf/catalina.policy"
-Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap %3 %4 %5 %6 %7 %8
%9 start
   goto cleanup
   
   :doStart
   if "%2" == "-security" goto doStartSecure
  -%_STARTJAVA% %CATALINA_OPTS% -Xbootclasspath:%BP% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap
%2 %3 %4 %5 %6 %7 %8 %9 start
  +%_STARTJAVA% %CATALINA_OPTS% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap
%2 %3 %4 %5 %6 %7 %8 %9 start
   goto cleanup
   :doStartSecure
   echo Using Security Manager
  -%_STARTJAVA% %CATALINA_OPTS% -Djava.security.manager -Djava.security.policy=="%CATALINA_HOME%/conf/catalina.policy"
-Xbootclasspath:%BP% -Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap
%3 %4 %5 %6 %7 %8 %9 start
  +%_STARTJAVA% %CATALINA_OPTS% -Djava.security.manager -Djava.security.policy=="%CATALINA_HOME%/conf/catalina.policy"
-Dcatalina.home="%CATALINA_HOME%" org.apache.catalina.startup.Bootstrap %3 %4 %5 %6 %7 %8
%9 start
   goto cleanup
   
   :doStop
  -%_RUNJAVA% %CATALINA_OPTS% -Xbootclasspath:%BP% -Dcatalina.home=%CATALINA_HOME% org.apache.catalina.startup.Bootstrap
%2 %3 %4 %5 %6 %7 %8 %9 stop
  +%_RUNJAVA% %CATALINA_OPTS% -Dcatalina.home=%CATALINA_HOME% org.apache.catalina.startup.Bootstrap
%2 %3 %4 %5 %6 %7 %8 %9 stop
   goto cleanup
   
   
  @@ -141,8 +132,6 @@
   rem ----- Restore Environment Variables ---------------------------------------
   
   :cleanup
  -set BP=%_BP%
  -set _BP=
   set CATALINA_HOME=%_CATALINA_HOME%
   set _CATALINA_HOME=
   set CLASSPATH=%_CLASSPATH%
  
  
  
  1.4       +12 -35    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- catalina.sh	2000/09/02 00:06:18	1.3
  +++ catalina.sh	2000/09/13 01:54:19	1.4
  @@ -12,7 +12,7 @@
   #
   #   JAVA_HOME     Must point at your Java Development Kit installation.
   #
  -# $Id: catalina.sh,v 1.3 2000/09/02 00:06:18 craigmcc Exp $
  +# $Id: catalina.sh,v 1.4 2000/09/13 01:54:19 craigmcc Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -31,32 +31,18 @@
     exit 1
   fi
   
  -# ----- Set Up The Bootstrap Classpath ----------------------------------------
  -
  -BP=$CATALINA_HOME/bin/bootstrap.jar
  -
  -if [ -f $JAVA_HOME/jre/lib/i18n.jar ] ; then
  -  BP=$BP:$JAVA_HOME/jre/lib/i18n.jar
  -fi
  -
  -if [ -f $JAVA_HOME/jre/lib/rt.jar ] ; then
  -  BP=$BP:$JAVA_HOME/jre/lib/rt.jar
  -fi
  -
  -if [ -f $JAVA_HOME/lib/tools.jar ] ; then
  -  BP=$BP:$JAVA_HOME/lib/tools.jar
  -fi
  -
  -echo Using BOOT PATH: $BP
  -
  -
   # ----- Set Up The System Classpath -------------------------------------------
   
  -CP=$CATALINA_HOME/dummy
  +CP=$CATALINA_HOME/bin/bootstrap.jar
  +
   for i in $CATALINA_HOME/lib/*.jar ; do
     CP=$CP:$i
   done
   
  +if [ -f $JAVA_HOME/lib/tools.jar ] ; then
  +  CP=$CP:$JAVA_HOME/lib/tools.jar
  +fi
  +
   echo Using CLASSPATH: $CP
   
   
  @@ -71,14 +57,12 @@
       jdb \
          $CATALINA_OPTS \
          -sourcepath ../../jakarta-tomcat-4.0/catalina/src/share \
  -       -Xbootclasspath:$BP \
          -classpath $CP -Dcatalina.home=$CATALINA_HOME \
          org.apache.catalina.startup.Bootstrap "$@" start
     else
       jdb \
          $CATALINA_OPTS \
          -sourcepath ../../jakarta-tomcat-4.0/catalina/src/share \
  -       -Xbootclasspath:$BP \
          -classpath $CP -Dcatalina.home=$CATALINA_HOME \
          org.apache.catalina.startup.Bootstrap "$@" start
     fi
  @@ -86,13 +70,6 @@
   
   elif [ "$1" = "embedded" ] ; then
   
  -  # NOTE: Embedded does not currently use the boot class path for
  -  # separating internal classes from the system class path
  -  CP=$CP:$CATALINA_HOME/classes
  -  for i in $CATALINA_HOME/lib/*.jar ; do
  -    CP=$CP:$i
  -  done
  -
     shift
     java $CATALINA_OPTS -classpath $CP \
      -Dcatalina.home=$CATALINA_HOME \
  @@ -109,13 +86,13 @@
     if [ "$1" = "-security" ] ; then
       echo Using Security Manager
       shift
  -    java $CATALINA_OPTS -Xbootclasspath:$BP -classpath $CP \
  +    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 -Xbootclasspath:$BP -classpath $CP \
  +    java $CATALINA_OPTS -classpath $CP \
        -Dcatalina.home=$CATALINA_HOME \
        org.apache.catalina.startup.Bootstrap "$@" start
     fi
  @@ -127,14 +104,14 @@
     if [ "$1" = "-security" ] ; then
       echo Using Security Manager
       shift
  -    java $CATALINA_OPTS -Xbootclasspath:$BP -classpath $CP \
  +    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 2>&1 &
     else
  -    java $CATALINA_OPTS -Xbootclasspath:$BP -classpath $CP \
  +    java $CATALINA_OPTS -classpath $CP \
        -Dcatalina.home=$CATALINA_HOME \
        org.apache.catalina.startup.Bootstrap "$@" start \
        >> $CATALINA_HOME/logs/catalina.out 2>&1 &
  @@ -143,7 +120,7 @@
   elif [ "$1" = "stop" ] ; then
   
     shift
  -  java $CATALINA_OPTS -Xbootclasspath:$BP -classpath $CP \
  +  java $CATALINA_OPTS -classpath $CP \
      -Dcatalina.home=$CATALINA_HOME \
      org.apache.catalina.startup.Bootstrap "$@" stop
   
  
  
  

Mime
View raw message