diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index 97c25507a5b6..2ff994675229 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -20,14 +20,14 @@ - 2012-07-12 + 2013-05-02 1.5.0 - 1.7.0 + 1.6.0 1.5.0 diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index 3ad59c32193e..e48037f697df 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -20,14 +20,14 @@ - 2012-07-12 + 2013-05-02 1.5.0 - 1.7.0 + 1.6.0 1.5.0 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index f82a286d682d..180bbb935f76 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -57,6 +57,7 @@ char const* const* SunInfo::getRuntimePaths(int * size) "/bin/client/jvm.dll", "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll", + "/bin/jrockit/jvm.dll", // The 64-bit JRE has the jvm in bin/server "/bin/server/jvm.dll" #elif defined MACOSX && defined X86_64 @@ -65,7 +66,8 @@ char const* const* SunInfo::getRuntimePaths(int * size) #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 "/classic/libjvm.so", + "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so" #endif }; *size = SAL_N_ELEMENTS(ar);