Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 28 files changed
  • 0 commit comments
  • 2 contributors
Commits on Sep 06, 2013
@dizzzz dizzzz [lib-upgrade] upgrading to Java Service Wrapper Community Edition 3.5.20
- including 64bit windows support
- synced scripts with originals

release notes on http://wrapper.tanukisoftware.com/doc/english/release-notes.html#3.5.20 (jumped from .17 to .20)
c167039
Commits on Sep 08, 2013
@ljo ljo Merge pull request #37 from dizzzz/feature/update-wrapper
[lib-upgrade] upgrading to Java Service Wrapper Community Edition 3.5.20
d59ced9
Showing with 239 additions and 79 deletions.
  1. +44 −22 tools/wrapper/bin/exist.bat
  2. +9 −9 tools/wrapper/bin/exist.sh.in
  3. +43 −21 tools/wrapper/bin/install.bat
  4. +51 −18 tools/wrapper/bin/uninstall.bat
  5. BIN  tools/wrapper/bin/wrapper-linux-ia-64
  6. BIN  tools/wrapper/bin/wrapper-linux-x86-32
  7. BIN  tools/wrapper/bin/wrapper-linux-x86-64
  8. BIN  tools/wrapper/bin/wrapper-macosx-universal-32
  9. BIN  tools/wrapper/bin/wrapper-macosx-universal-64
  10. BIN  tools/wrapper/bin/wrapper-solaris-sparc-32
  11. BIN  tools/wrapper/bin/wrapper-solaris-sparc-64
  12. BIN  tools/wrapper/bin/wrapper-solaris-x86-32
  13. BIN  tools/wrapper/bin/wrapper-solaris-x86-64
  14. BIN  tools/wrapper/bin/wrapper-windows-x86-32.exe
  15. BIN  tools/wrapper/bin/wrapper-windows-x86-64.exe
  16. +92 −9 tools/wrapper/conf/wrapper.conf.in
  17. BIN  tools/wrapper/lib/libwrapper-linux-ia-64.so
  18. BIN  tools/wrapper/lib/libwrapper-linux-x86-32.so
  19. BIN  tools/wrapper/lib/libwrapper-linux-x86-64.so
  20. BIN  tools/wrapper/lib/libwrapper-macosx-universal-32.jnilib
  21. BIN  tools/wrapper/lib/libwrapper-macosx-universal-64.jnilib
  22. BIN  tools/wrapper/lib/libwrapper-solaris-sparc-32.so
  23. BIN  tools/wrapper/lib/libwrapper-solaris-sparc-64.so
  24. BIN  tools/wrapper/lib/libwrapper-solaris-x86-32.so
  25. BIN  tools/wrapper/lib/libwrapper-solaris-x86-64.so
  26. BIN  tools/wrapper/lib/wrapper-windows-x86-32.dll
  27. BIN  tools/wrapper/lib/wrapper-windows-x86-64.dll
  28. BIN  tools/wrapper/lib/wrapper.jar
View
66 tools/wrapper/bin/exist.bat
@@ -1,9 +1,8 @@
@echo off
setlocal
-rem $Id$
-
-rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
+rem
+rem Copyright (c) 1999, 2013 Tanuki Software, Ltd.
rem http://www.tanukisoftware.com
rem All rights reserved.
rem
@@ -12,19 +11,26 @@ rem You shall use it only in accordance with the terms of the
rem license agreement you entered into with Tanuki Software.
rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
rem
-rem Java Service Wrapper general startup script.
+rem Java Service Wrapper general passthrough startup script.
rem
-
rem -----------------------------------------------------------------------------
-rem Optimized for use with version 3.5.17 of the Wrapper.
+rem These settings can be modified to fit the needs of your application
+rem Optimized for use with version 3.5.20 of the Wrapper.
rem The base name for the Wrapper binary.
set _WRAPPER_BASE=wrapper
+rem The directory where the Wrapper binary (.exe) file is located, this can be
+rem either a absolute or relative path. If the path contains any special characters,
+rem please make sure to quote the variable.
+set _WRAPPER_DIR=
+
rem The name and location of the Wrapper configuration file. This will be used
rem if the user does not specify a configuration file as the first parameter to
rem this script. It will not be possible to specify a configuration file on the
-rem command line if _PASS_THROUGH is set.
+rem command line if _PASS_THROUGH is set.
+rem If a relative path is specified, please note that the location is based on the
+rem location.
set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
rem Makes it possible to override the Wrapper configuration file by specifying it
@@ -48,31 +54,46 @@ echo This script only works with NT-based versions of Windows.
goto :eof
:nt
-rem
rem Find the application home.
-rem
-rem %~dp0 is location of current script under NT
-set _REALPATH=%~dp0
-
+rem if no path path specified do the default action
+IF not DEFINED _WRAPPER_DIR goto dir_undefined
+set _WRAPPER_DIR_QUOTED="%_WRAPPER_DIR:"=%"
+if not "%_WRAPPER_DIR:~-2,1%" == "\" set _WRAPPER_DIR_QUOTED="%_WRAPPER_DIR_QUOTED:"=%\"
+rem check if absolute path
+if "%_WRAPPER_DIR_QUOTED:~2,1%" == ":" goto absolute_path
+if "%_WRAPPER_DIR_QUOTED:~1,1%" == "\" goto absolute_path
+rem everythig else means relative path
+set _REALPATH="%~dp0%_WRAPPER_DIR_QUOTED:"=%"
+goto pathfound
+
+:dir_undefined
+rem Use a relative path to the wrapper %~dp0 is location of current script under NT
+set _REALPATH="%~dp0"
+goto pathfound
+:absolute_path
+rem Use an absolute path to the wrapper
+set _REALPATH="%_WRAPPER_DIR_QUOTED:"=%"
+
+:pathfound
rem
rem Decide on the specific Wrapper binary to use (See delta-pack)
rem
if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+set _WRAPPER_L_EXE="%_REALPATH:"=%%_WRAPPER_BASE%-windows-x86-32.exe"
goto search
:amd64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+set _WRAPPER_L_EXE="%_REALPATH:"=%%_WRAPPER_BASE%-windows-x86-64.exe"
goto search
:ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+set _WRAPPER_L_EXE="%_REALPATH:"=%%_WRAPPER_BASE%-windows-ia-64.exe"
goto search
:search
-set _WRAPPER_EXE=%_WRAPPER_L_EXE%
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
-if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE="%_WRAPPER_L_EXE:"=%"
+if exist %_WRAPPER_EXE% goto conf
+set _WRAPPER_EXE="%_REALPATH:"=%%_WRAPPER_BASE%.exe"
+if exist %_WRAPPER_EXE% goto conf
echo Unable to locate a Wrapper executable using any of the following names:
echo %_WRAPPER_L_EXE%
echo %_WRAPPER_EXE%
@@ -90,7 +111,7 @@ if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
goto :startup
)
)
-set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
+set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT:"=%"
rem
rem Start the Wrapper
@@ -104,10 +125,11 @@ shift
if not [%1]==[] goto :parameters
if [%_PASS_THROUGH%]==[] (
- "%_WRAPPER_EXE%" -c %_WRAPPER_CONF%
+ %_WRAPPER_EXE% -c %_WRAPPER_CONF%
) else (
- "%_WRAPPER_EXE%" -c %_WRAPPER_CONF% -- %_PARAMETERS%
+ %_WRAPPER_EXE% -c %_WRAPPER_CONF% -- %_PARAMETERS%
)
if not errorlevel 1 goto :eof
pause
+
View
18 tools/wrapper/bin/exist.sh.in
@@ -23,7 +23,7 @@
#-----------------------------------------------------------------------------
# These settings can be modified to fit the needs of your application
-# Optimized for use with version 3.5.17 of the Wrapper.
+# Optimized for use with version 3.5.20 of the Wrapper.
# Application
APP_NAME="@app.name@"
@@ -789,7 +789,7 @@ launchinternal() {
prepAdditionalParams "$@"
# The string passed to eval must handles spaces in paths correctly.
- COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
+ COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.20 $ADDITIONAL_PARA"
eval $COMMAND_LINE
else
eval echo `gettext '$APP_LONG_NAME is already running.'`
@@ -812,7 +812,7 @@ console() {
prepAdditionalParams "$@"
# The string passed to eval must handles spaces in paths correctly.
- COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
+ COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.20 $ADDITIONAL_PARA"
eval $COMMAND_LINE
else
eval echo `gettext '$APP_LONG_NAME is already running.'`
@@ -934,7 +934,7 @@ start() {
prepAdditionalParams "$@"
# The string passed to eval must handles spaces in paths correctly.
- COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.17 $ADDITIONAL_PARA"
+ COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.20 $ADDITIONAL_PARA"
eval $COMMAND_LINE
else
eval echo `gettext '$APP_LONG_NAME is already running.'`
@@ -1063,7 +1063,7 @@ installdaemon() {
APP_NAME_LOWER=`echo "$APP_NAME" | $TREXE "[A-Z]" "[a-z]"`
if [ "$DIST_OS" = "solaris" ] ; then
eval echo `gettext 'Detected Solaris:'`
- if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME"] ; then
+ if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
exit 1
else
@@ -1098,8 +1098,8 @@ installdaemon() {
ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
insserv "/etc/init.d/$APP_NAME"
fi
- elif [ -f /etc/lsb-release ] ; then
- eval echo `gettext 'Detected Ubuntu:'`
+ elif [ -f /etc/lsb-release -o -f /etc/debian_version -o -f /etc/debian_release ] ; then
+ eval echo `gettext 'Detected Ubuntu or Debian:'`
if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" -o -f "/etc/init/${APP_NAME}.conf" ] ; then
eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
exit 1
@@ -1293,8 +1293,8 @@ removedaemon() {
eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
exit 1
fi
- elif [ -f /etc/lsb-release ] ; then
- eval echo `gettext 'Detected Ubuntu:'`
+ elif [ -f /etc/lsb-release -o -f /etc/debian_version -o -f /etc/debian_release ] ; then
+ eval echo `gettext 'Detected Ubuntu or Debian:'`
if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
stopit "0"
eval echo `gettext ' Removing $APP_LONG_NAME daemon from init.d...'`
View
64 tools/wrapper/bin/install.bat
@@ -2,7 +2,7 @@
setlocal
rem
-rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
+rem Copyright (c) 1999, 2013 Tanuki Software, Ltd.
rem http://www.tanukisoftware.com
rem All rights reserved.
rem
@@ -11,21 +11,27 @@ rem You shall use it only in accordance with the terms of the
rem license agreement you entered into with Tanuki Software.
rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
rem
-rem Java Service Wrapper general startup script.
+rem Java Service Wrapper general passthrough startup script.
rem
-
rem -----------------------------------------------------------------------------
rem These settings can be modified to fit the needs of your application
-rem Optimized for use with version 3.5.17 of the Wrapper.
+rem Optimized for use with version 3.5.20 of the Wrapper.
rem The base name for the Wrapper binary.
set _WRAPPER_BASE=wrapper
+rem The directory where the Wrapper binary (.exe) file is located, this can be
+rem either a absolute or relative path. If the path contains any special characters,
+rem please make sure to quote the variable.
+set _WRAPPER_DIR=
+
rem The name and location of the Wrapper configuration file. This will be used
rem if the user does not specify a configuration file as the first parameter to
rem this script. It will not be possible to specify a configuration file on the
-rem command line if _PASS_THROUGH is set.
-set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
+rem command line if _PASS_THROUGH is set.
+rem If a relative path is specified, please note that the location is based on the
+rem location.
+set _WRAPPER_CONF_DEFAULT="../conf/%_WRAPPER_BASE%.conf"
rem Makes it possible to override the Wrapper configuration file by specifying it
rem as the first parameter.
@@ -33,7 +39,7 @@ rem set _WRAPPER_CONF_OVERRIDE=true
rem _PASS_THROUGH tells the script to pass all parameters through to the JVM as
rem is.
-rem set _PASS_THROUGH=true
+set _PASS_THROUGH=true
rem Do not modify anything beyond this point
rem -----------------------------------------------------------------------------
@@ -48,31 +54,46 @@ echo This script only works with NT-based versions of Windows.
goto :eof
:nt
-rem
rem Find the application home.
-rem
-rem %~dp0 is location of current script under NT
-set _REALPATH=%~dp0
+rem if no path path specified do the default action
+IF not DEFINED _WRAPPER_DIR goto dir_undefined
+set _WRAPPER_DIR_QUOTED="%_WRAPPER_DIR:"=%"
+if not "%_WRAPPER_DIR:~-2,1%" == "\" set _WRAPPER_DIR_QUOTED="%_WRAPPER_DIR_QUOTED:"=%\"
+rem check if absolute path
+if "%_WRAPPER_DIR_QUOTED:~2,1%" == ":" goto absolute_path
+if "%_WRAPPER_DIR_QUOTED:~1,1%" == "\" goto absolute_path
+rem everythig else means relative path
+set _REALPATH="%~dp0%_WRAPPER_DIR_QUOTED:"=%"
+goto pathfound
+
+:dir_undefined
+rem Use a relative path to the wrapper %~dp0 is location of current script under NT
+set _REALPATH="%~dp0"
+goto pathfound
+:absolute_path
+rem Use an absolute path to the wrapper
+set _REALPATH="%_WRAPPER_DIR_QUOTED:"=%"
+:pathfound
rem
rem Decide on the specific Wrapper binary to use (See delta-pack)
rem
if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+set _WRAPPER_L_EXE="%_REALPATH:"=%%_WRAPPER_BASE%-windows-x86-32.exe"
goto search
:amd64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+set _WRAPPER_L_EXE="%_REALPATH:"=%%_WRAPPER_BASE%-windows-x86-64.exe"
goto search
:ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+set _WRAPPER_L_EXE="%_REALPATH:"=%%_WRAPPER_BASE%-windows-ia-64.exe"
goto search
:search
-set _WRAPPER_EXE=%_WRAPPER_L_EXE%
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
-if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE="%_WRAPPER_L_EXE:"=%"
+if exist %_WRAPPER_EXE% goto conf
+set _WRAPPER_EXE="%_REALPATH:"=%%_WRAPPER_BASE%.exe"
+if exist %_WRAPPER_EXE% goto conf
echo Unable to locate a Wrapper executable using any of the following names:
echo %_WRAPPER_L_EXE%
echo %_WRAPPER_EXE%
@@ -90,7 +111,7 @@ if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
goto :startup
)
)
-set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
+set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT:"=%"
rem
rem Start the Wrapper
@@ -104,10 +125,11 @@ shift
if not [%1]==[] goto :parameters
if [%_PASS_THROUGH%]==[] (
- "%_WRAPPER_EXE%" -i %_WRAPPER_CONF%
+ %_WRAPPER_EXE% -i %_WRAPPER_CONF%
) else (
- "%_WRAPPER_EXE%" -i %_WRAPPER_CONF% -- %_PARAMETERS%
+ %_WRAPPER_EXE% -i %_WRAPPER_CONF% -- %_PARAMETERS%
)
if not errorlevel 1 goto :eof
pause
+
View
69 tools/wrapper/bin/uninstall.bat
@@ -2,7 +2,7 @@
setlocal
rem
-rem Copyright (c) 1999, 2012 Tanuki Software, Ltd.
+rem Copyright (c) 1999, 2013 Tanuki Software, Ltd.
rem http://www.tanukisoftware.com
rem All rights reserved.
rem
@@ -16,15 +16,23 @@ rem
rem -----------------------------------------------------------------------------
rem These settings can be modified to fit the needs of your application
-rem Optimized for use with version 3.5.17 of the Wrapper.
+rem Optimized for use with version 3.5.20 of the Wrapper.
rem The base name for the Wrapper binary.
set _WRAPPER_BASE=wrapper
+rem The directory where the Wrapper binary (.exe) file is located, this can be
+rem either a absolute or relative path. If the path contains any special characters,
+rem please make sure to quote the variable.
+set _WRAPPER_DIR=
+
rem The name and location of the Wrapper configuration file. This will be used
rem if the user does not specify a configuration file as the first parameter to
-rem this script.
-set _WRAPPER_CONF_DEFAULT=../conf/wrapper.conf
+rem this script. It will not be possible to specify a configuration file on the
+rem command line if _PASS_THROUGH is set.
+rem If a relative path is specified, please note that the location is based on the
+rem location.
+set _WRAPPER_CONF_DEFAULT="../conf/%_WRAPPER_BASE%.conf"
rem Makes it possible to override the Wrapper configuration file by specifying it
rem as the first parameter.
@@ -46,31 +54,46 @@ echo This script only works with NT-based versions of Windows.
goto :eof
:nt
-rem
rem Find the application home.
-rem
-rem %~dp0 is location of current script under NT
-set _REALPATH=%~dp0
+rem if no path path specified do the default action
+IF not DEFINED _WRAPPER_DIR goto dir_undefined
+set _WRAPPER_DIR_QUOTED="%_WRAPPER_DIR:"=%"
+if not "%_WRAPPER_DIR:~-2,1%" == "\" set _WRAPPER_DIR_QUOTED="%_WRAPPER_DIR_QUOTED:"=%\"
+rem check if absolute path
+if "%_WRAPPER_DIR_QUOTED:~2,1%" == ":" goto absolute_path
+if "%_WRAPPER_DIR_QUOTED:~1,1%" == "\" goto absolute_path
+rem everythig else means relative path
+set _REALPATH="%~dp0%_WRAPPER_DIR_QUOTED:"=%"
+goto pathfound
+
+:dir_undefined
+rem Use a relative path to the wrapper %~dp0 is location of current script under NT
+set _REALPATH="%~dp0"
+goto pathfound
+:absolute_path
+rem Use an absolute path to the wrapper
+set _REALPATH="%_WRAPPER_DIR_QUOTED:"=%"
+:pathfound
rem
rem Decide on the specific Wrapper binary to use (See delta-pack)
rem
if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+set _WRAPPER_L_EXE="%_REALPATH:"=%%_WRAPPER_BASE%-windows-x86-32.exe"
goto search
:amd64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+set _WRAPPER_L_EXE="%_REALPATH:"=%%_WRAPPER_BASE%-windows-x86-64.exe"
goto search
:ia64
-set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+set _WRAPPER_L_EXE="%_REALPATH:"=%%_WRAPPER_BASE%-windows-ia-64.exe"
goto search
:search
-set _WRAPPER_EXE=%_WRAPPER_L_EXE%
-if exist "%_WRAPPER_EXE%" goto conf
-set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
-if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE="%_WRAPPER_L_EXE:"=%"
+if exist %_WRAPPER_EXE% goto conf
+set _WRAPPER_EXE="%_REALPATH:"=%%_WRAPPER_BASE%.exe"
+if exist %_WRAPPER_EXE% goto conf
echo Unable to locate a Wrapper executable using any of the following names:
echo %_WRAPPER_L_EXE%
echo %_WRAPPER_EXE%
@@ -88,13 +111,23 @@ if not [%_WRAPPER_CONF_OVERRIDE%]==[] (
goto :startup
)
)
-set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
+set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT:"=%"
rem
rem Start the Wrapper
rem
:startup
-"%_WRAPPER_EXE%" -r %_WRAPPER_CONF%
+
+rem Collect an parameters
+:parameters
+set _PARAMETERS=%_PARAMETERS% %1
+shift
+if not [%1]==[] goto :parameters
+
+if [%_PASS_THROUGH%]==[] (
+ %_WRAPPER_EXE% -r %_WRAPPER_CONF%
+) else (
+ %_WRAPPER_EXE% -r %_WRAPPER_CONF% -- %_PARAMETERS%
+)
if not errorlevel 1 goto :eof
pause
-
View
BIN  tools/wrapper/bin/wrapper-linux-ia-64
Binary file not shown
View
BIN  tools/wrapper/bin/wrapper-linux-x86-32
Binary file not shown
View
BIN  tools/wrapper/bin/wrapper-linux-x86-64
Binary file not shown
View
BIN  tools/wrapper/bin/wrapper-macosx-universal-32
Binary file not shown
View
BIN  tools/wrapper/bin/wrapper-macosx-universal-64
Binary file not shown
View
BIN  tools/wrapper/bin/wrapper-solaris-sparc-32
Binary file not shown
View
BIN  tools/wrapper/bin/wrapper-solaris-sparc-64
Binary file not shown
View
BIN  tools/wrapper/bin/wrapper-solaris-x86-32
Binary file not shown
View
BIN  tools/wrapper/bin/wrapper-solaris-x86-64
Binary file not shown
View
BIN  tools/wrapper/bin/wrapper-windows-x86-32.exe
Binary file not shown
View
BIN  tools/wrapper/bin/wrapper-windows-x86-64.exe
Binary file not shown
View
101 tools/wrapper/conf/wrapper.conf.in
@@ -2,18 +2,52 @@
# Configuration files must begin with a line specifying the encoding
# of the the file.
-# $Id$
+#********************************************************************
+# Wrapper License Properties (Ignored by Community Edition)
+#********************************************************************
+# Professional and Standard Editions of the Wrapper require a valid
+# License Key to start. Licenses can be purchased or a trial license
+# requested on the following pages:
+# http://wrapper.tanukisoftware.com/purchase
+# http://wrapper.tanukisoftware.com/trial
# Include file problems can be debugged by removing the first '#'
# from the following line:
##include.debug
+# The Wrapper will look for either of the following optional files for a
+# valid License Key. License Key properties can optionally be included
+# directly in this configuration file.
+#include ../conf/wrapper-license.conf
+#include ../conf/wrapper-license-%WRAPPER_HOST_NAME%.conf
+
+# The following property will output information about which License Key(s)
+# are being found, and can aid in resolving any licensing problems.
+#wrapper.license.debug=TRUE
+
#********************************************************************
-# Wrapper Properties
+# Wrapper Localization
+#********************************************************************
+# Specify the locale which the Wrapper should use. By default the system
+# locale is used.
+#wrapper.lang=en_US # en_US or ja_JP
+
+# Specify the location of the Wrapper's language resources. If these are
+# missing, the Wrapper will default to the en_US locale.
+wrapper.lang.folder=../lang
+
+#********************************************************************
+# Wrapper Java Properties
#********************************************************************
# Java Application
wrapper.java.command=@java.vm@
+# Specify a specific java binary:
+#set.JAVA_HOME=/java/path
+#wrapper.java.command=%JAVA_HOME%/bin/java
+
+# Tell the Wrapper to log the full generated Java command line.
+#wrapper.java.command.loglevel=INFO
# EXIST_HOME
set.EXIST_HOME=$INSTALL_PATH
@@ -72,6 +106,9 @@ wrapper.app.parameter.2=../../../@jetty.dir@/etc/jetty.xml
#********************************************************************
# Wrapper Logging Properties
#********************************************************************
+# Enables Debug output from the Wrapper.
+# wrapper.debug=TRUE
+
# Format of output for the console. (See docs for formats)
wrapper.console.format=PM
@@ -106,29 +143,74 @@ wrapper.syslog.loglevel=NONE
# Allow for the use of non-contiguous numbered properties
wrapper.ignore_sequence_gaps=TRUE
+# Do not start if the pid file already exists.
+wrapper.pidfile.strict=TRUE
+
# Title to use when running as a console
-##wrapper.console.title=@app.long.name@
wrapper.console.title=eXist-db Server with Jetty
#********************************************************************
# Wrapper JVM Checks
#********************************************************************
+# Detect DeadLocked Threads in the JVM. (Requires Standard Edition)
+##wrapper.check.deadlock=TRUE
+##wrapper.check.deadlock.interval=60
+##wrapper.check.deadlock.action=RESTART
+##wrapper.check.deadlock.output=FULL
+
# Out Of Memory detection.
+# Ignore -verbose:class output to avoid false positives.
+wrapper.filter.trigger.1000=[Loaded java.lang.OutOfMemoryError
+wrapper.filter.action.1000=NONE
# (Simple match)
-wrapper.filter.trigger.1000=java.lang.OutOfMemoryError
+wrapper.filter.trigger.1001=java.lang.OutOfMemoryError
# (Only match text in stack traces if -XX:+PrintClassHistogram is being used.)
-#wrapper.filter.trigger.1000=Exception in thread "*" java.lang.OutOfMemoryError
-#wrapper.filter.allow_wildcards.1000=TRUE
-wrapper.filter.action.1000=SHUTDOWN
-wrapper.filter.message.1000=The JVM has run out of memory.
+#wrapper.filter.trigger.1001=Exception in thread "*" java.lang.OutOfMemoryError
+#wrapper.filter.allow_wildcards.1001=TRUE
+
+## Note: Original value: RESTART
+wrapper.filter.action.1001=SHUTDOWN
+wrapper.filter.message.1001=The JVM has run out of memory.
# Do not allow the wrapper to restart the JVM.
# A restart could cause issues if eXist-db wasn't shut down completely.
wrapper.disable_restarts.automatic=TRUE
#********************************************************************
-# Wrapper Windows Properties
+# Wrapper Email Notifications. (Requires Professional Edition)
#********************************************************************
+# Common Event Email settings.
+#wrapper.event.default.email.debug=TRUE
+#wrapper.event.default.email.smtp.host=<SMTP_Host>
+#wrapper.event.default.email.smtp.port=25
+#wrapper.event.default.email.subject=[%WRAPPER_HOSTNAME%:%WRAPPER_NAME%:%WRAPPER_EVENT_NAME%] Event Notification
+#wrapper.event.default.email.sender=<Sender email>
+#wrapper.event.default.email.recipient=<Recipient email>
+
+# Configure the log attached to event emails.
+#wrapper.event.default.email.attach_log=TRUE
+#wrapper.event.default.email.maillog.lines=50
+#wrapper.event.default.email.maillog.format=LPTM
+#wrapper.event.default.email.maillog.loglevel=INFO
+
+# Enable specific event emails.
+#wrapper.event.wrapper_start.email=TRUE
+#wrapper.event.jvm_prelaunch.email=TRUE
+#wrapper.event.jvm_start.email=TRUE
+#wrapper.event.jvm_started.email=TRUE
+#wrapper.event.jvm_deadlock.email=TRUE
+#wrapper.event.jvm_stop.email=TRUE
+#wrapper.event.jvm_stopped.email=TRUE
+#wrapper.event.jvm_restart.email=TRUE
+#wrapper.event.jvm_failed_invocation.email=TRUE
+#wrapper.event.jvm_max_failed_invocations.email=TRUE
+#wrapper.event.jvm_kill.email=TRUE
+#wrapper.event.jvm_killed.email=TRUE
+#wrapper.event.jvm_unexpected_exit.email=TRUE
+#wrapper.event.wrapper_stop.email=TRUE
+
+# Specify custom mail content
+wrapper.event.jvm_restart.email.body=The JVM was restarted.\n\nPlease check on its status.\n
#********************************************************************
# Wrapper Windows NT/2000/XP Service Properties
@@ -159,4 +241,5 @@ wrapper.ntservice.interactive=false
#********************************************************************
# Timeouts
#********************************************************************
+# DWES: still valid?
wrapper.ping.timeout=120
View
BIN  tools/wrapper/lib/libwrapper-linux-ia-64.so
Binary file not shown
View
BIN  tools/wrapper/lib/libwrapper-linux-x86-32.so
Binary file not shown
View
BIN  tools/wrapper/lib/libwrapper-linux-x86-64.so
Binary file not shown
View
BIN  tools/wrapper/lib/libwrapper-macosx-universal-32.jnilib
Binary file not shown
View
BIN  tools/wrapper/lib/libwrapper-macosx-universal-64.jnilib
Binary file not shown
View
BIN  tools/wrapper/lib/libwrapper-solaris-sparc-32.so
Binary file not shown
View
BIN  tools/wrapper/lib/libwrapper-solaris-sparc-64.so
Binary file not shown
View
BIN  tools/wrapper/lib/libwrapper-solaris-x86-32.so
Binary file not shown
View
BIN  tools/wrapper/lib/libwrapper-solaris-x86-64.so
Binary file not shown
View
BIN  tools/wrapper/lib/wrapper-windows-x86-32.dll
Binary file not shown
View
BIN  tools/wrapper/lib/wrapper-windows-x86-64.dll
Binary file not shown
View
BIN  tools/wrapper/lib/wrapper.jar
Binary file not shown

No commit comments for this range

Something went wrong with that request. Please try again.