Line 0
Link Here
|
|
|
1 |
--- bin/daemon.sh.orig |
2 |
+++ bin/daemon.sh |
3 |
@@ -115,12 +115,9 @@ |
4 |
test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd` |
5 |
test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME" |
6 |
test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap |
7 |
-# If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME |
8 |
+# If not explicitly set, look for jsvc in %%PREFIX%% |
9 |
if [ -z "$JSVC" ]; then |
10 |
- JSVC="$CATALINA_BASE/bin/jsvc" |
11 |
- if [ ! -x "$JSVC" ]; then |
12 |
- JSVC="$CATALINA_HOME/bin/jsvc" |
13 |
- fi |
14 |
+ JSVC="%%PREFIX%%/bin/jsvc" |
15 |
fi |
16 |
# Set the default service-start wait time if necessary |
17 |
test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 |
18 |
@@ -137,7 +134,7 @@ |
19 |
|
20 |
# Add on extra jar files to CLASSPATH |
21 |
test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:" |
22 |
-CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar" |
23 |
+CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:%%JAVAJARDIR%%/commons-daemon.jar" |
24 |
|
25 |
test ".$CATALINA_OUT" = . && CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out" |
26 |
test ".$CATALINA_TMP" = . && CATALINA_TMP="$CATALINA_BASE/temp" |