- setup daemon process

Changed files:
    ApacheJServ.init -> 1.3

diff --git a/ApacheJServ.init b/ApacheJServ.init
index 8ed38e29e578aa38871800d3d73ad58258bcda05..827b221367aa553306bbae9af4a61a17b960024c 100644 (file)
--- a/ApacheJServ.init
+++ b/ApacheJServ.init
@@ -14,6 +14,9 @@
 # Get network config
 . /etc/sysconfig/network
 
+JSERV_PROPERTIES=/etc/jserv/jserv.properties
+JSERV_CLASS=org.apache.jserv.JServ
+
 # Get service config - may override defaults
 [ -f /etc/sysconfig/jserv ] && . /etc/sysconfig/jserv
 
@@ -27,13 +30,20 @@ else
        exit 0
 fi
 
+checkconfig() {
+       JRE=$(awk -F= '/^wrapper.bin=/{print $2}' $JSERV_PROPERTIES) || JRE=/usr/bin/java
+       CLASSPATH=$(awk -F= '/^wrapper\.classpath/{print $2}' $JSERV_PROPERTIES | tr '\n' ':')
+       ENV=$(awk -F= '/^wrapper.env=/{printf("%s=%s\n", $2, $3)}' $JSERV_PROPERTIES)
+}
+
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/jserv ]; then
                msg_starting jserv
-               daemon --user jserv jserv
+               checkconfig || exit 1
+               daemon --fork --user jserv env -i $ENV CLASSPATH="$CLASSPATH" $JRE $JSERV_CLASS $JSERV_PROPERTIES
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/jserv
        else