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 2013/08/27 11:10:10 UTC
svn commit: r1517766 - in /karaf/trunk/wrapper/core/src/main:
java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java
resources/org/apache/karaf/wrapper/internal/unix/karaf-service
Author: jbonofre
Date: Tue Aug 27 09:10:09 2013
New Revision: 1517766
URL: http://svn.apache.org/r1517766
Log:
[KARAF-2270] Fix the JAVA_HOME retrieval, and test if the JAVA_HOME is setted in the karaf-service script
Modified:
karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java
karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service
Modified: karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java?rev=1517766&r1=1517765&r2=1517766&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java (original)
+++ karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java Tue Aug 27 09:10:09 2013
@@ -51,7 +51,7 @@ public class WrapperServiceImpl implemen
}
HashMap<String, String> props = new HashMap<String, String>();
- props.put("${java.home}", System.getProperty("java.home"));
+ props.put("${java.home}", System.getenv("JAVA_HOME"));
props.put("${karaf.home}", System.getProperty("karaf.home"));
props.put("${karaf.base}", base.getPath());
props.put("${karaf.data}", System.getProperty("karaf.data"));
Modified: karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service?rev=1517766&r1=1517765&r2=1517766&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service (original)
+++ karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service Tue Aug 27 09:10:09 2013
@@ -18,9 +18,11 @@
# ------------------------------------------------------------------------
# JAVA_HOME, trying the JDK first and fallback to JRE
-if [ `command -v readlink` ]; then
- [ -z $JAVA_HOME ] && [ -x /usr/bin/javac ] && export JAVA_HOME="$(readlink -f /usr/bin/javac | sed 's:/bin/javac::')"
- [ -z $JAVA_HOME ] && [ -x /usr/bin/java ] && export JAVA_HOME="$(readlink -f /usr/bin/java | sed 's:/bin/java::')"
+if [ "x$JAVA_HOME" = "x" ]; then
+ if [ `command -v readlink` ]; then
+ [ -z $JAVA_HOME ] && [ -x /usr/bin/javac ] && export JAVA_HOME="$(readlink -f /usr/bin/javac | sed 's:/bin/javac::')"
+ [ -z $JAVA_HOME ] && [ -x /usr/bin/java ] && export JAVA_HOME="$(readlink -f /usr/bin/java | sed 's:/bin/java::')"
+ fi
fi
# Application