#i121715# find official JRE>=7 on OSX

jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml

@@ -23,18 +23,22 @@
 <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
- <updated>2006-05-02</updated>
+ <updated>2013-01-01</updated>
 
  <vendorInfos>
   <vendor name="Apple Computer, Inc.">
     <minVersion>1.5.0</minVersion>
   </vendor>
  <vendor name="Apple Inc.">
-  <minVersion>1.5.0</minVersion>
+    <minVersion>1.5.0</minVersion>
+ </vendor>
+ <vendor name="Oracle Corporation">
+    <minVersion>1.7.0</minVersion>
  </vendor>
  </vendorInfos>
  <plugins>
   <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
   <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
+  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
  </plugins>
 </javaSelection>

jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx

@@ -69,13 +69,14 @@ char const* const* SunInfo::getRuntimePaths(int * size)
         "/bin/classic/jvm.dll",
         "/bin/client/jvm.dll",
         // TODO add jrockit here
-#elif UNX
+#elif defined(MACOSX)
+        "/lib/server/libjvm.dylib"
+#elif defined(UNX)
         "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so",
         "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so"
 #endif
-
     };
     *size = sizeof(ar) / sizeof (char*);
     return ar;

jvmfwk/plugins/sunmajor/pluginlib/util.cxx

@@ -97,6 +97,7 @@ char const *g_arCollectDirs[] = {
 char const *g_arSearchPaths[] = {
 #ifdef MACOSX
     "",
+    "Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin",
     "System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/"
 #else
     "",