View | Details | Raw Unified | Return to bug 47919
Collapse All | Expand All

(-)original/apache-tomcat-6.0.20/bin/catalina.sh (-3 / +16 lines)
Lines 289-297 Link Here
289
elif [ "$1" = "start" ] ; then
289
elif [ "$1" = "start" ] ; then
290
290
291
  shift
291
  shift
292
  touch "$CATALINA_BASE"/logs/catalina.out
292
  CATALINA_OUT="$CATALINA_BASE"/logs/catalina.out
293
  touch "$CATALINA_OUT"
294
  echo "Using CATALINA_BASE:      $CATALINA_BASE" >> "$CATALINA_OUT"
295
  echo "Using CATALINA_HOME:      $CATALINA_HOME" >> "$CATALINA_OUT"
296
  echo "Using CATALINA_TMPDIR:    $CATALINA_TMPDIR" >> "$CATALINA_OUT"
297
  echo "Using JAVA_HOME:          $JAVA_HOME" >> "$CATALINA_OUT"
298
  echo "Using JRE_HOME:           $JRE_HOME" >> "$CATALINA_OUT"
299
  echo "Using _RUNJAVA:           $_RUNJAVA" >> "$CATALINA_OUT"
300
  echo "Using JAVA_OPTS:          $JAVA_OPTS" >> "$CATALINA_OUT"
301
  echo "Using CATALINA_OPTS:      $CATALINA_OPTS" >> "$CATALINA_OUT"
302
  echo "Using JAVA_ENDORSED_DIRS: $JAVA_ENDORSED_DIRS" >> "$CATALINA_OUT"
303
  echo "Using CLASSPATH:          $CLASSPATH" >> "$CATALINA_OUT"
304
293
  if [ "$1" = "-security" ] ; then
305
  if [ "$1" = "-security" ] ; then
294
    echo "Using Security Manager"
306
    echo "Using Security Manager"
307
    echo "Using Security Manager" >> "$CATALINA_OUT"
295
    shift
308
    shift
296
    "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
309
    "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
297
      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
310
      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
Lines 301-307 Link Here
301
      -Dcatalina.home="$CATALINA_HOME" \
314
      -Dcatalina.home="$CATALINA_HOME" \
302
      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
315
      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
303
      org.apache.catalina.startup.Bootstrap "$@" start \
316
      org.apache.catalina.startup.Bootstrap "$@" start \
304
      >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
317
      >> "$CATALINA_OUT" 2>&1 &
305
318
306
      if [ ! -z "$CATALINA_PID" ]; then
319
      if [ ! -z "$CATALINA_PID" ]; then
307
        echo $! > $CATALINA_PID
320
        echo $! > $CATALINA_PID
Lines 313-319 Link Here
313
      -Dcatalina.home="$CATALINA_HOME" \
326
      -Dcatalina.home="$CATALINA_HOME" \
314
      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
327
      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
315
      org.apache.catalina.startup.Bootstrap "$@" start \
328
      org.apache.catalina.startup.Bootstrap "$@" start \
316
      >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
329
      >> "$CATALINA_OUT" 2>&1 &
317
330
318
      if [ ! -z "$CATALINA_PID" ]; then
331
      if [ ! -z "$CATALINA_PID" ]; then
319
        echo $! > $CATALINA_PID
332
        echo $! > $CATALINA_PID

Return to bug 47919