Author: mturk
Date: Sat Oct 29 16:16:05 2011
New Revision: 1194916
URL: http://svn.apache.org/viewvc?rev=1194916&view=rev
Log:
DAEMON-224: Add /etc/alternatives to the search path. Apply extended patch
provided by Archie Cobbs
Modified:
commons/proper/daemon/trunk/RELEASE-NOTES.txt
commons/proper/daemon/trunk/src/native/unix/CHANGES.txt
commons/proper/daemon/trunk/src/native/unix/native/location.c
Modified: commons/proper/daemon/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/RELEASE-NOTES.txt?rev=1194916&r1=1194915&r2=1194916&view=diff
==============================================================================
--- commons/proper/daemon/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/trunk/RELEASE-NOTES.txt Sat Oct 29 16:16:05 2011
@@ -80,7 +80,7 @@ NEW FEATURES:
BUG FIXES:
-1.0.8: DAEMON-222, DAEMON-223
+1.0.8: DAEMON-222, DAEMON-223, DAEMON-224
1.0.7: DAEMON-211, DAEMON-214
Modified: commons/proper/daemon/trunk/src/native/unix/CHANGES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/CHANGES.txt?rev=1194916&r1=1194915&r2=1194916&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/CHANGES.txt (original)
+++ commons/proper/daemon/trunk/src/native/unix/CHANGES.txt Sat Oct 29 16:16:05
2011
@@ -6,6 +6,7 @@ Changes with 1.0.8
* Use CPPFLAGS in makefile (DAEMON-223)
* Add -umask parameter (DAEMON-221)
* Make sure -procname is visible only on Linux (DAEMON-222)
+ * Add /etc/alternatives to the location search (DAEMON-224)
Changes with 1.0.7
Modified: commons/proper/daemon/trunk/src/native/unix/native/location.c
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/location.c?rev=1194916&r1=1194915&r2=1194916&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/location.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/location.c Sat Oct 29
16:16:05 2011
@@ -35,6 +35,8 @@ char *location_home[] = {
#elif defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_BSD)
"/usr/java",
"/usr/local/java",
+ "/etc/alternatives/java_sdk",
+ "/etc/alternatives/jre",
#elif defined(OS_CYGWIN)
"/cygdrive/c/WINNT/system32/java",
#elif defined(OS_SYSV)
@@ -74,12 +76,6 @@ char *location_jvm_default[] = {
"$JAVA_HOME/jre/bin/classic/jvm.dll", /* Sun JDK 1.3 */
"$JAVA_HOME/jre/bin/client/jvm.dll", /* Sun JDK 1.4 */
#elif defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_BSD) ||
defined(OS_SYSV) || defined(OS_FREEBSD) || defined(OS_TRU64)
-#if defined(HAVE_SABLEVM)
- "$JAVA_HOME/lib/libsablevm.so", /* sableVM */
-#endif
-#if defined(HAVE_KAFFEVM)
- "$JAVA_HOME/jre/lib/" CPU "/libkaffevm.so", /* kaffe */
-#endif
"$JAVA_HOME/jre/lib/" CPU "/classic/libjvm.so", /* Sun JDK 1.2 */
"$JAVA_HOME/jre/lib/" CPU "/server/libjvm.so", /* Sun JDK 1.4 */
"$JAVA_HOME/jre/lib/" CPU "/client/libjvm.so", /* Sun JDK 1.3 */
