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

(-)bin/catalina.sh (-10 / +8 lines)
Lines 218-226 Link Here
218
fi
218
fi
219
219
220
if [ -z "$LOGGING_MANAGER" ]; then
220
if [ -z "$LOGGING_MANAGER" ]; then
221
  JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
221
  LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
222
else
223
  JAVA_OPTS="$JAVA_OPTS $LOGGING_MANAGER"
224
fi
222
fi
225
223
226
# ----- Execute The Requested Command -----------------------------------------
224
# ----- Execute The Requested Command -----------------------------------------
Lines 269-275 Link Here
269
        echo "Using Security Manager"
267
        echo "Using Security Manager"
270
      fi
268
      fi
271
      shift
269
      shift
272
      exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
270
      exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
273
        -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
271
        -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
274
        -sourcepath "$CATALINA_HOME"/../../java \
272
        -sourcepath "$CATALINA_HOME"/../../java \
275
        -Djava.security.manager \
273
        -Djava.security.manager \
Lines 279-285 Link Here
279
        -Djava.io.tmpdir="$CATALINA_TMPDIR" \
277
        -Djava.io.tmpdir="$CATALINA_TMPDIR" \
280
        org.apache.catalina.startup.Bootstrap "$@" start
278
        org.apache.catalina.startup.Bootstrap "$@" start
281
    else
279
    else
282
      exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
280
      exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
283
        -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
281
        -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
284
        -sourcepath "$CATALINA_HOME"/../../java \
282
        -sourcepath "$CATALINA_HOME"/../../java \
285
        -Dcatalina.base="$CATALINA_BASE" \
283
        -Dcatalina.base="$CATALINA_BASE" \
Lines 297-303 Link Here
297
      echo "Using Security Manager"
295
      echo "Using Security Manager"
298
    fi
296
    fi
299
    shift
297
    shift
300
    exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
298
    exec "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
301
      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
299
      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
302
      -Djava.security.manager \
300
      -Djava.security.manager \
303
      -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
301
      -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
Lines 306-312 Link Here
306
      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
304
      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
307
      org.apache.catalina.startup.Bootstrap "$@" start
305
      org.apache.catalina.startup.Bootstrap "$@" start
308
  else
306
  else
309
    exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
307
    exec "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
310
      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
308
      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
311
      -Dcatalina.base="$CATALINA_BASE" \
309
      -Dcatalina.base="$CATALINA_BASE" \
312
      -Dcatalina.home="$CATALINA_HOME" \
310
      -Dcatalina.home="$CATALINA_HOME" \
Lines 361-367 Link Here
361
      echo "Using Security Manager"
359
      echo "Using Security Manager"
362
    fi
360
    fi
363
    shift
361
    shift
364
    "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
362
    "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
365
      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
363
      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
366
      -Djava.security.manager \
364
      -Djava.security.manager \
367
      -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
365
      -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
Lines 372-378 Link Here
372
      >> "$CATALINA_OUT" 2>&1 &
370
      >> "$CATALINA_OUT" 2>&1 &
373
371
374
  else
372
  else
375
    "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
373
    "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
376
      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
374
      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
377
      -Dcatalina.base="$CATALINA_BASE" \
375
      -Dcatalina.base="$CATALINA_BASE" \
378
      -Dcatalina.home="$CATALINA_HOME" \
376
      -Dcatalina.home="$CATALINA_HOME" \
Lines 422-428 Link Here
422
    fi
420
    fi
423
  fi
421
  fi
424
  
422
  
425
  "$_RUNJAVA" $JAVA_OPTS \
423
  "$_RUNJAVA" $LOGGING_MANAGER $JAVA_OPTS \
426
    -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
424
    -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
427
    -Dcatalina.base="$CATALINA_BASE" \
425
    -Dcatalina.base="$CATALINA_BASE" \
428
    -Dcatalina.home="$CATALINA_HOME" \
426
    -Dcatalina.home="$CATALINA_HOME" \

Return to bug 54601