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 2012/11/19 21:42:41 UTC
svn commit: r1411399 - in /karaf/trunk/wrapper/core/src/main: java/org/apache/karaf/wrapper/internal/ resources/org/apache/karaf/wrapper/internal/unix/ resources/org/apache/karaf/wrapper/internal/windows/ resources/org/apache/karaf/wrapper/internal/win...

Author: jbonofre
Date: Mon Nov 19 20:42:40 2012
New Revision: 1411399

URL: http://svn.apache.org/viewvc?rev=1411399&view=rev
Log:
[KARAF-2017] Populate JAVA_HOME in the karaf-wrapper.conf file

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-wrapper.conf
    karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
    karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf

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=1411399&r1=1411398&r2=1411399&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 Mon Nov 19 20:42:40 2012
@@ -51,6 +51,7 @@ public class WrapperServiceImpl implemen
         }
 
         HashMap<String, String> props = new HashMap<String, String>();
+        props.put("${java.home}", System.getProperty("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-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf?rev=1411399&r1=1411398&r2=1411399&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf (original)
+++ karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf Mon Nov 19 20:42:40 2012
@@ -18,6 +18,7 @@
 #********************************************************************
 # Wrapper Properties
 #********************************************************************
+set.default.JAVA_HOME=${java.home}
 set.default.KARAF_HOME=${karaf.home}
 set.default.KARAF_BASE=${karaf.base}
 set.default.KARAF_DATA=${karaf.data}

Modified: karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf?rev=1411399&r1=1411398&r2=1411399&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf (original)
+++ karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf Mon Nov 19 20:42:40 2012
@@ -18,6 +18,7 @@
 #********************************************************************
 # Wrapper Properties
 #********************************************************************
+set.default.JAVA_HOME=${java.home}
 set.default.KARAF_HOME=${karaf.home}
 set.default.KARAF_BASE=${karaf.base}
 set.default.KARAF_DATA=${karaf.data}

Modified: karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf?rev=1411399&r1=1411398&r2=1411399&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf (original)
+++ karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf Mon Nov 19 20:42:40 2012
@@ -18,6 +18,7 @@
 #********************************************************************
 # Wrapper Properties
 #********************************************************************
+set.default.JAVA_HOME=${java.home}
 set.default.KARAF_HOME=${karaf.home}
 set.default.KARAF_BASE=${karaf.base}
 set.default.KARAF_DATA=${karaf.data}