You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2001/09/14 22:01:21 UTC

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

craigmcc    01/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 <pa...@sun.com>
  
  Revision  Changes    Path
  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  3534    File Upload doesn't work with Apache, mod_webapp, Tomcat 4
   
  +Jasper      3079    NullPointerException in JakartaCommentGenerator.generateEnd
  +
   
   Nice To Have Fixes Before Final Release:
   ---------------------------------------
  @@ -76,17 +78,14 @@
   Catalina    3515    Process hanging after stopping Tomcat (awaiting
                       reproducible failure case)
   
  -Catalina    3589    Cannot process taglib TLD when deployed through
  -                    EmbeddedManagerMBean
  -
   Catalina    3594    Have to reload page or page will not be shown
                       (awaiting reproducible failure case, likely user error)
   
   Catalina    3597    Shutting down takes *ages* (not confirmed against
                       latest Tomcat 4.0 build)
   
  -Jasper      3079    NullPointerException in JakartaCommentGenerator.generateEnd
  -                    (awaiting reproducible failure case)
  +Catalina    3612    getServletPath() returns wrong value (awaiting reproducible
  +                    failure case)
   
   Jasper      3127    <jsp: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