karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1518497 - in /karaf/trunk: manual/src/main/webapp/users-guide/wrapper.conf wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service
Date Thu, 29 Aug 2013 05:57:04 GMT
Author: jbonofre
Date: Thu Aug 29 05:57:03 2013
New Revision: 1518497

URL: http://svn.apache.org/r1518497
Log:
[KARAF-2270] Remove setting the JAVA_HOME in karaf-service script (to avoid to override the
one defined in karaf-wrapper.conf) and update the documentation

Modified:
    karaf/trunk/manual/src/main/webapp/users-guide/wrapper.conf
    karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service

Modified: karaf/trunk/manual/src/main/webapp/users-guide/wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/wrapper.conf?rev=1518497&r1=1518496&r2=1518497&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/wrapper.conf (original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/wrapper.conf Thu Aug 29 05:57:03 2013
@@ -118,9 +118,10 @@ On Ubuntu/Debian Systems:
 
   To uninstall the service :
     $ rm /etc/init.d/KARAF-service
+{code}
 
 h2. Configuration Hints
 
-If you need to append parameters to the "java" invoke (like memory configurations) you add
those in the KARAF-wrapper file using "wrapper.java.additional.n=PARAMETER" where "n" is the
number of the additional config (typically you simply look for the last entry and use n+1)
and PARAMTER is any JVM parameter you would like to append, such as "-XX:MaxPermSize=1024m".
+By default, the wrapper sets the JAVA_HOME in etc/karaf-wrapper.conf file. However, the bin/karaf-service
script uses java. If required, you have to define the JAVA_HOME in this bin/karaf-service
script.
 
-{code}
+If you need to append parameters to the "java" invoke (like memory configurations) you add
those in the KARAF-wrapper file using "wrapper.java.additional.n=PARAMETER" where "n" is the
number of the additional config (typically you simply look for the last entry and use n+1)
and PARAMETER is any JVM parameter you would like to append, such as "-XX:MaxPermSize=1024m".

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=1518497&r1=1518496&r2=1518497&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
Thu Aug 29 05:57:03 2013
@@ -17,12 +17,10 @@
 # limitations under the License.
 # ------------------------------------------------------------------------
 
-# JAVA_HOME, trying the JDK first and fallback to JRE
-export -n JAVA_HOME=x
-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
+# If require, set the JAVA_HOME to launch the wrapper
+#
+#JAVA_HOME=
+#
 
 # Application
 APP_NAME="${name}"



Mime
View raw message