Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 7870e36ff -> 5fa123923
KARAF-3853 - Set JAVA_HOME in bin/karaf-service wrapper Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5fa12392 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5fa12392 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5fa12392 Branch: refs/heads/karaf-3.0.x Commit: 5fa1239232d85835d184417e1422224711ad483d Parents: 7870e36 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Feb 8 17:42:12 2016 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Feb 8 17:42:12 2016 +0100 ---------------------------------------------------------------------- .../org/apache/karaf/wrapper/internal/unix/karaf-service | 6 ++---- .../apache/karaf/wrapper/internal/windows/karaf-service.bat | 1 + .../apache/karaf/wrapper/internal/windows64/karaf-service.bat | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/5fa12392/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service ---------------------------------------------------------------------- diff --git a/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service index fdf37e5..c414e20 100644 --- a/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service +++ b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service @@ -21,10 +21,8 @@ # This script is an Unix SystemV script # -# If require, set the JAVA_HOME to launch the wrapper -# -#JAVA_HOME= -# +# set the JAVA_HOME to launch the wrapper +set JAVA_HOME="${java.home}" # Application APP_NAME="${name}" http://git-wip-us.apache.org/repos/asf/karaf/blob/5fa12392/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-service.bat ---------------------------------------------------------------------- diff --git a/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-service.bat b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-service.bat index 0dd0474..406074e 100644 --- a/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-service.bat +++ b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-service.bat @@ -19,6 +19,7 @@ REM ------------------------------------------------------------------------ setlocal +set JAVA_HOME=${java.home} set APP_NAME=${name} set APP_LONG_NAME=${displayName} set APP_BASE=${karaf.base} http://git-wip-us.apache.org/repos/asf/karaf/blob/5fa12392/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-service.bat ---------------------------------------------------------------------- diff --git a/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-service.bat b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-service.bat index 0dd0474..406074e 100644 --- a/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-service.bat +++ b/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-service.bat @@ -19,6 +19,7 @@ REM ------------------------------------------------------------------------ setlocal +set JAVA_HOME=${java.home} set APP_NAME=${name} set APP_LONG_NAME=${displayName} set APP_BASE=${karaf.base}
