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

(-)a/bin/daemon.sh.orig (-8 lines)
Lines 35-45 PROGRAM="`basename $ARG0`" Link Here
35
while [ ".$1" != . ]
35
while [ ".$1" != . ]
36
do
36
do
37
  case "$1" in
37
  case "$1" in
38
    --java-home )
39
        JAVA_HOME="$2"
40
        shift; shift;
41
        continue
42
    ;;
43
    --catalina-home )
38
    --catalina-home )
44
        CATALINA_HOME="$2"
39
        CATALINA_HOME="$2"
45
        shift; shift;
40
        shift; shift;
Lines 178-184 case "$1" in Link Here
178
      shift
173
      shift
179
      "$JSVC" $* \
174
      "$JSVC" $* \
180
      $JSVC_OPTS \
175
      $JSVC_OPTS \
181
      -java-home "$JAVA_HOME" \
182
      -pidfile "$CATALINA_PID" \
176
      -pidfile "$CATALINA_PID" \
183
      -wait "$SERVICE_START_WAIT_TIME" \
177
      -wait "$SERVICE_START_WAIT_TIME" \
184
      -nodetach \
178
      -nodetach \
Lines 194-200 case "$1" in Link Here
194
    ;;
188
    ;;
195
    start   )
189
    start   )
196
      "$JSVC" $JSVC_OPTS \
190
      "$JSVC" $JSVC_OPTS \
197
      -java-home "$JAVA_HOME" \
198
      -user $TOMCAT_USER \
191
      -user $TOMCAT_USER \
199
      -pidfile "$CATALINA_PID" \
192
      -pidfile "$CATALINA_PID" \
200
      -wait "$SERVICE_START_WAIT_TIME" \
193
      -wait "$SERVICE_START_WAIT_TIME" \
Lines 221-227 case "$1" in Link Here
221
    ;;
214
    ;;
222
    version  )
215
    version  )
223
      "$JSVC" \
216
      "$JSVC" \
224
      -java-home "$JAVA_HOME" \
225
      -pidfile "$CATALINA_PID" \
217
      -pidfile "$CATALINA_PID" \
226
      -classpath "$CLASSPATH" \
218
      -classpath "$CLASSPATH" \
227
      -errfile "&2" \
219
      -errfile "&2" \

Return to bug 61441