svn commit: r907206 - in /commons/proper/daemon/trunk/src/native/unix: CHANGES.txt native/java.c

[mturk]

Author: mturk
Date: Sat Feb  6 12:25:10 2010
New Revision: 907206

URL: http://svn.apache.org/viewvc?rev=907206&view=rev
Log:
Fix DAEMON-129 by adding libverify.dylib to the list of VM startups

Modified:
    commons/proper/daemon/trunk/src/native/unix/CHANGES.txt
    commons/proper/daemon/trunk/src/native/unix/native/java.c

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=907206&r1=907205&r2=907206&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/CHANGES.txt (original)
+++ commons/proper/daemon/trunk/src/native/unix/CHANGES.txt Sat Feb  6 12:25:10 
2010
@@ -1,6 +1,9 @@
 JAKARTA COMMONS DAEMON (UNIX) CHANGELOG:
 Last modified at [$Date$]
 
+Changes with 1.0.2
+  * Allow support for OS/X 10.6 (DAEMON-129)
+
 Changes with 1.0.1
   * Allow enableassertions -ea (PR 304310).
   * Add -lpthread to LDFLAGS on Linux (PR 30177).

Modified: commons/proper/daemon/trunk/src/native/unix/native/java.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/java.c?rev=907206&r1=907205&r2=907206&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/java.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/java.c Sat Feb  6 
12:25:10 2010
@@ -131,9 +131,10 @@
        MacOS/X actually has two libraries, one with the REAL vm, and one for
        the VM startup.
        before JVM 1.4.1 The first one (libappshell.dyld) contains CreateVM
-       after JVM 1.4.1 The library name is libjvm_compat.dylib.
+       JVM 1.4.1 through 1.5.* The library name is libjvm_compat.dylib
+       starting with JVM 1.6 on OS X 10.6 the library name is libverify.dylib.
     */
-    if (replace(appf,1024,"$JAVA_HOME/../Libraries/libappshell.dylib",
+        if (replace(appf,1024,"$JAVA_HOME/../Libraries/libappshell.dylib",
                  "$JAVA_HOME",data->path)!=0) {
         log_error("Cannot replace values in loader library");
         return(false);
@@ -145,6 +146,13 @@
             return(false);
         }
     }
+    if (stat(appf, &sb)) {
+        if (replace(appf,1024,"$JAVA_HOME/../Libraries/libverify.dylib",
+                    "$JAVA_HOME",data->path)!=0) {
+            log_error("Cannot replace values in loader library");
+            return(false);
+        }
+    }
     apph=dso_link(appf);
     if (apph==NULL) {
         log_error("Cannot load required shell library %s",appf);