You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/01/22 15:23:07 UTC
[karaf] branch karaf-4.1.x updated: [KARAF-6108] Include
JAVA_HOME/bin in wrapper default PATH
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
new 64f4ea6 [KARAF-6108] Include JAVA_HOME/bin in wrapper default PATH
64f4ea6 is described below
commit 64f4ea69caef2bdc2d56fefc5847a28982504b23
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Tue Jan 22 10:29:24 2019 +0100
[KARAF-6108] Include JAVA_HOME/bin in wrapper default PATH
---
.../org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf | 4 ++++
.../org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf | 4 ++++
.../org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf | 4 ++++
3 files changed, 12 insertions(+)
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
index 38c1afe..9a16cca 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
@@ -23,6 +23,10 @@ set.default.KARAF_HOME=${karaf.home}
set.default.KARAF_BASE=${karaf.base}
set.default.KARAF_DATA=${karaf.data}
set.default.KARAF_ETC=${karaf.etc}
+set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%.
+
+# Include JAVA_HOME/bin in the default PATH variable
+set.PATH=%PATH_WITH_JAVA%
# Java Application
wrapper.working.dir=%KARAF_BASE%
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
index 426761d..07eb92d 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
@@ -23,6 +23,10 @@ set.default.KARAF_HOME=${karaf.home}
set.default.KARAF_BASE=${karaf.base}
set.default.KARAF_DATA=${karaf.data}
set.default.KARAF_ETC=${karaf.etc}
+set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%.
+
+# Include JAVA_HOME/bin in the default PATH variable
+set.PATH=%PATH_WITH_JAVA%
# Java Application
wrapper.working.dir=%KARAF_BASE%
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
index 426761d..07eb92d 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
@@ -23,6 +23,10 @@ set.default.KARAF_HOME=${karaf.home}
set.default.KARAF_BASE=${karaf.base}
set.default.KARAF_DATA=${karaf.data}
set.default.KARAF_ETC=${karaf.etc}
+set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%.
+
+# Include JAVA_HOME/bin in the default PATH variable
+set.PATH=%PATH_WITH_JAVA%
# Java Application
wrapper.working.dir=%KARAF_BASE%