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:21:19 UTC
svn commit: r1411393 - in /karaf/branches/karaf-2.3.x/shell/wrapper/src/main: java/org/apache/karaf/shell/wrapper/ resources/org/apache/karaf/shell/wrapper/unix/ resources/org/apache/karaf/shell/wrapper/windows/ resources/org/apache/karaf/shell/wrapper...

Author: jbonofre
Date: Mon Nov 19 20:21:18 2012
New Revision: 1411393

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

Modified:
    karaf/branches/karaf-2.3.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java
    karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf
    karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf
    karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows64/karaf-wrapper.conf

Modified: karaf/branches/karaf-2.3.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java?rev=1411393&r1=1411392&r2=1411393&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java (original)
+++ karaf/branches/karaf-2.3.x/shell/wrapper/src/main/java/org/apache/karaf/shell/wrapper/InstallCommand.java Mon Nov 19 20:21:18 2012
@@ -61,6 +61,7 @@ public class InstallCommand extends Abst
             File lib = new File(base, "lib");
 
             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/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf?rev=1411393&r1=1411392&r2=1411393&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf (original)
+++ karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/unix/karaf-wrapper.conf Mon Nov 19 20:21:18 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/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf?rev=1411393&r1=1411392&r2=1411393&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf (original)
+++ karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows/karaf-wrapper.conf Mon Nov 19 20:21:18 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/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows64/karaf-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows64/karaf-wrapper.conf?rev=1411393&r1=1411392&r2=1411393&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows64/karaf-wrapper.conf (original)
+++ karaf/branches/karaf-2.3.x/shell/wrapper/src/main/resources/org/apache/karaf/shell/wrapper/windows64/karaf-wrapper.conf Mon Nov 19 20:21:18 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}