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 2016/08/22 09:30:35 UTC
[37/50] [abbrv] karaf git commit: [KARAF-4653]add JAVA_ENDORSED_DIRS
back for java <=8
[KARAF-4653]add JAVA_ENDORSED_DIRS back for java <=8
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c9650bc6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c9650bc6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c9650bc6
Branch: refs/heads/master
Commit: c9650bc6bb9297f49841fede7c59436b6747d126
Parents: 8ab40e4
Author: Freeman Fang <fr...@gmail.com>
Authored: Wed Aug 17 16:04:35 2016 +0800
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Aug 22 11:29:21 2016 +0200
----------------------------------------------------------------------
assemblies/features/base/src/main/resources/resources/bin/karaf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c9650bc6/assemblies/features/base/src/main/resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf b/assemblies/features/base/src/main/resources/resources/bin/karaf
index a745355..c38abf7 100755
--- a/assemblies/features/base/src/main/resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/resources/resources/bin/karaf
@@ -456,7 +456,8 @@ run() {
;;
esac
done
-
+
+ JAVA_ENDORSED_DIRS="${JAVA_HOME}/jre/lib/endorsed:${JAVA_HOME}/lib/endorsed:${KARAF_HOME}/lib/endorsed"
JAVA_EXT_DIRS="${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext:${KARAF_HOME}/lib/ext"
if ${cygwin}; then
KARAF_HOME=$(cygpath --path --windows "${KARAF_HOME}")