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 2011/01/14 14:15:19 UTC
svn commit: r1058999 -
/karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf
Author: jbonofre
Date: Fri Jan 14 13:15:19 2011
New Revision: 1058999
URL: http://svn.apache.org/viewvc?rev=1058999&view=rev
Log:
[KARAF-384] Better management of JAVA_HOME and java endorsed/ext dirs in cygwin environment.
Modified:
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf
Modified: karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf?rev=1058999&r1=1058998&r2=1058999&view=diff
==============================================================================
--- karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf (original)
+++ karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf Fri Jan 14 13:15:19 2011
@@ -331,14 +331,19 @@ run() {
;;
esac
+ 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"`
KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
+ JAVA_EXT_DIRS=`cygpath --path --windows "$JAVA_EXT_DIRS"`
fi
cd "$KARAF_BASE"
- exec "$JAVA" $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_HOME}/jre/lib/endorsed:${JAVA_HOME}/lib/endorsed:${KARAF_HOME}/lib/endorsed" -Djava.ext.dirs="${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext:${KARAF_HOME}/lib/ext" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $OPTS -classpath "$CLASSPATH" $MAIN "$@"
+ exec "$JAVA" $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" -Djava.ext.dirs="${JAVA_EXT_DIRS}" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $OPTS -classpath "$CLASSPATH" $MAIN "$@"
}
main() {