diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-06-10 22:31:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-02 13:37:26 +0100 |
| commit | 55d2d982d0722e2ede96811d2a38ad3d70fc9d62 (patch) | |
| tree | 0565e906bbaf0c6a5e88101a13209bc27c686c99 /jvmfwk | |
| parent | 7d528592ac756f5495b2fb300f4302cce89ca017 (diff) | |
Resolves: #i66923# Add support for JRockit JVM
(cherry picked from commit cb38ee0da6fa928118fbc1da118a707d7799cb40)
Conflicts:
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
Change-Id: Iffd413ba1d74ae3b7da58df7b092c43c4f64a7c9
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 4 | ||||
| -rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml | 4 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 4 |
3 files changed, 7 insertions, 5 deletions
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 @@ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <updated>2012-07-12</updated> + <updated>2013-05-02</updated> <vendorInfos> <vendor name="Sun Microsystems Inc."> <minVersion>1.5.0</minVersion> </vendor> <vendor name="Oracle Corporation"> - <minVersion>1.7.0</minVersion> + <minVersion>1.6.0</minVersion> </vendor> <vendor name="IBM Corporation"> <minVersion>1.5.0</minVersion> 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 @@ <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <updated>2012-07-12</updated> + <updated>2013-05-02</updated> <vendorInfos> <vendor name="Sun Microsystems Inc."> <minVersion>1.5.0</minVersion> </vendor> <vendor name="Oracle Corporation"> - <minVersion>1.7.0</minVersion> + <minVersion>1.6.0</minVersion> </vendor> <vendor name="IBM Corporation"> <minVersion>1.5.0</minVersion> 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); |