* service wrapper fully functioning under Linux and WinXP, should also be...

* service wrapper fully functioning under Linux and WinXP, should also be working for the other *nix platforms but this isn't tested yet
* renaming wrapper binaries to 'i2psvc' for *nix and 'I2Psvc.exe' for win32

installer/lib/wrapper/i2prouter

@@ -17,7 +17,7 @@ APP_NAME="i2p"
 APP_LONG_NAME="I2P Service"
 
 # Wrapper
-WRAPPER_CMD="wrapper"
+WRAPPER_CMD="i2psvc"
 WRAPPER_CONF="wrapper.conf"
 
 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
@@ -157,9 +157,9 @@ console() {
     then
         if [ "X$IGNORE_SIGNALS" = "X" ]
         then
-            exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.pidfile=$PIDFILE
+            exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF i2psvc.pidfile=$PIDFILE
         else
-            exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.pidfile=$PIDFILE wrapper.anchorfile=$ANCHORFILE
+            exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF i2psvc.pidfile=$PIDFILE wrapper.anchorfile=$ANCHORFILE
         fi
     else
         echo "$APP_LONG_NAME is already running."
@@ -176,16 +176,16 @@ start() {
         then
             if [ "X$RUN_AS_USER" = "X" ]
             then
-                exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.pidfile=$PIDFILE wrapper.daemonize=TRUE
+                exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF i2psvc.pidfile=$PIDFILE wrapper.daemonize=TRUE
             else
-                su -m $RUN_AS_USER -c "exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.pidfile=$PIDFILE wrapper.daemonize=TRUE"
+                su -m $RUN_AS_USER -c "exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF i2psvc.pidfile=$PIDFILE wrapper.daemonize=TRUE"
             fi
         else
             if [ "X$RUN_AS_USER" = "X" ]
             then
-                exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.pidfile=$PIDFILE wrapper.anchorfile=$ANCHORFILE wrapper.ignore_signals=TRUE wrapper.daemonize=TRUE
+                exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF i2psvc.pidfile=$PIDFILE wrapper.anchorfile=$ANCHORFILE wrapper.ignore_signals=TRUE wrapper.daemonize=TRUE
             else
-                su -m $RUN_AS_USER -c "exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF wrapper.pidfile=$PIDFILE wrapper.anchorfile=$ANCHORFILE wrapper.ignore_signals=TRUE wrapper.daemonize=TRUE"
+                su -m $RUN_AS_USER -c "exec $CMDNICE $WRAPPER_CMD $WRAPPER_CONF i2psvc.pidfile=$PIDFILE wrapper.anchorfile=$ANCHORFILE wrapper.ignore_signals=TRUE wrapper.daemonize=TRUE"
             fi
         fi
     else

installer/lib/wrapper/i2prouter.bat

@@ -20,7 +20,7 @@ rem Find the application home.
 rem
 rem %~dp0 is location of current script under NT
 set _REALPATH=%~dp0
-set _WRAPPER_EXE=%_REALPATH%Wrapper.exe
+set _WRAPPER_EXE=%_REALPATH%I2Psvc.exe
 
 rem
 rem Find the wrapper.conf

installer/lib/wrapper/install_i2p_service_winnt.bat

@@ -15,7 +15,7 @@ rem Find the application home.
 rem
 rem %~dp0 is location of current script under NT
 set _REALPATH=%~dp0
-set _WRAPPER_EXE=%_REALPATH%Wrapper.exe
+set _WRAPPER_EXE=%_REALPATH%I2Psvc.exe
 
 rem
 rem Find the wrapper.conf

installer/lib/wrapper/uninstall_i2p_service_winnt.bat

@@ -15,7 +15,7 @@ rem Find the application home.
 rem
 rem %~dp0 is location of current script under NT
 set _REALPATH=%~dp0
-set _WRAPPER_EXE=%_REALPATH%Wrapper.exe
+set _WRAPPER_EXE=%_REALPATH%I2Psvc.exe
 
 rem
 rem Find the wrapper.conf

installer/lib/wrapper/wrapper.conf

@@ -47,7 +47,7 @@ wrapper.java.library.path.2=lib
 # Application parameters.  Add parameters as needed starting from 1
 wrapper.app.parameter.1=net.i2p.router.Router
 wrapper.app.parameter.2=--quiet
-wrapper.app.parameter.3=> /dev/null &
+wrapper.app.parameter.3=> /dev/null
 
 #********************************************************************
 # Wrapper Logging Properties
@@ -59,7 +59,7 @@ wrapper.console.format=PM
 wrapper.console.loglevel=INFO
 
 # Log file to use for wrapper output logging.
-wrapper.logfile=../logs/wrapper.log
+wrapper.logfile=logs/wrapper.log
 
 # Format of output for the log file.  (See docs for formats)
 wrapper.logfile.format=LPTM