tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfarc...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh catalina.bat
Date Wed, 22 Oct 2003 00:28:44 GMT
jfarcand    2003/10/21 17:28:44

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

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message