You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2012/12/10 11:05:19 UTC
svn commit: r1419313 -
/commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c
Author: mturk
Date: Mon Dec 10 10:05:19 2012
New Revision: 1419313
URL: http://svn.apache.org/viewvc?rev=1419313&view=rev
Log:
Add few more common locations for detecting jdk
Modified:
commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c
Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c?rev=1419313&r1=1419312&r2=1419313&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c (original)
+++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c Mon Dec 10 10:05:19 2012
@@ -33,12 +33,20 @@ char *location_home[] = {
"/System/Library/Frameworks/JavaVM.framework/Home",
"/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home/",
#elif defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_BSD)
+ "/usr/java/default",
"/usr/java",
"/usr/local/java",
"/usr/lib/jvm/default-java",
"/usr/lib/jvm/java",
"/etc/alternatives/java_sdk",
+ "/etc/alternatives/java_sdk_openjdk",
"/etc/alternatives/jre",
+#if defined(__LP64__)
+ "/lib64/jvm/java",
+ "/lib64/jvm/java-openjdk",
+#endif
+ "/lib/jvm/java",
+ "/lib/jvm/java-openjdk",
#elif defined(OS_CYGWIN)
"/cygdrive/c/WINNT/system32/java",
#elif defined(OS_SYSV)