karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [karaf] branch master updated: [KARAF-6108] Include JAVA_HOME/bin in wrapper default PATH
Date Tue, 22 Jan 2019 15:20:22 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new b91d674  [KARAF-6108] Include JAVA_HOME/bin in wrapper default PATH
     new c2378f0  Merge pull request #736 from jbonofre/KARAF-6108
b91d674 is described below

commit b91d6742b8fd5e2bfa89046696a4c5a50d3bbf32
Author: Jean-Baptiste Onofré <jbonofre@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-java11.conf  | 4 ++++
 .../org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf   | 4 ++++
 .../apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf   | 4 ++++
 .../apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf    | 4 ++++
 .../apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf | 4 ++++
 .../apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf  | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
index aa49cc5..63d8fa6 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
@@ -25,6 +25,10 @@ set.default.KARAF_DATA=${karaf.data}
 set.default.KARAF_ETC=${karaf.etc}
 set.default.KARAF_LOG=${karaf.log}
 set.default.KARAF_VERSION=${karaf.version}
+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%
 
 set.JDK_JAVA_OPTIONS=--add-reads=java.xml=java.logging --add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED
--patch-module java.base=lib/endorsed/org.apache.karaf.specs.locator-%KARAF_VERSION%.jar --patch-module
java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-%KARAF_VERSION%.jar --add-opens java.base/java.security=ALL-UNNAMED
--add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens
java.base/java.util=ALL-UNNAMED --ad [...]
 
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf
index b14f848..dfb2847 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf
@@ -24,6 +24,10 @@ set.default.KARAF_BASE=${karaf.base}
 set.default.KARAF_DATA=${karaf.data}
 set.default.KARAF_ETC=${karaf.etc}
 set.default.KARAF_LOG=${karaf.log}
+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-java11.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
index 35d6fd5..2d7b4f4 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
@@ -25,6 +25,10 @@ set.default.KARAF_DATA=${karaf.data}
 set.default.KARAF_ETC=${karaf.etc}
 set.default.KARAF_LOG=${karaf.log}
 set.default.KARAF_VERSION=${karaf.version}
+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%
 
 set.JDK_JAVA_OPTIONS=--add-reads=java.xml=java.logging --add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED
--patch-module java.base=lib/endorsed/org.apache.karaf.specs.locator-%KARAF_VERSION%.jar --patch-module
java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-%KARAF_VERSION%.jar --add-opens java.base/java.security=ALL-UNNAMED
--add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens
java.base/java.util=ALL-UNNAMED --ad [...]
 
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf
index 77dfd52..cd15b40 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf
@@ -24,6 +24,10 @@ set.default.KARAF_BASE=${karaf.base}
 set.default.KARAF_DATA=${karaf.data}
 set.default.KARAF_ETC=${karaf.etc}
 set.default.KARAF_LOG=${karaf.log}
+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-java11.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
index 9fa8f55..0065bfa 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
@@ -25,6 +25,10 @@ set.default.KARAF_DATA=${karaf.data}
 set.default.KARAF_ETC=${karaf.etc}
 set.default.KARAF_LOG=${karaf.log}
 set.default.KARAF_VERSION=${karaf.version}
+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%
 
 set.JDK_JAVA_OPTIONS=--add-reads=java.xml=java.logging --add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED
--patch-module java.base=lib/endorsed/org.apache.karaf.specs.locator-%KARAF_VERSION%.jar --patch-module
java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-%KARAF_VERSION%.jar --add-opens java.base/java.security=ALL-UNNAMED
--add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens
java.base/java.util=ALL-UNNAMED --ad [...]
 
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
index b0c8bdb..86d2e2d 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
@@ -24,6 +24,10 @@ set.default.KARAF_BASE=${karaf.base}
 set.default.KARAF_DATA=${karaf.data}
 set.default.KARAF_ETC=${karaf.etc}
 set.default.KARAF_LOG=${karaf.log}
+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%


Mime
View raw message