You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2016/08/17 08:04:50 UTC
karaf git commit: [KARAF-4653]add JAVA_ENDORSED_DIRS back for java <=8
Repository: karaf
Updated Branches:
refs/heads/master 4e339910e -> 50297a42d
[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/50297a42
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/50297a42
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/50297a42
Branch: refs/heads/master
Commit: 50297a42d4ce7dd681a94a4e8e5918a866aa5c8f
Parents: 4e33991
Author: Freeman Fang <fr...@gmail.com>
Authored: Wed Aug 17 16:04:35 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Wed Aug 17 16:04:35 2016 +0800
----------------------------------------------------------------------
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/50297a42/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}")