diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:35:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:35:14 +0000 |
| commit | c2dcc8650fd31b8097c7efb0bf107db755b1fbe0 (patch) | |
| tree | 3b3cbdbf8bf6fbb21c4289342e97a20334064448 /jvmfwk | |
| parent | dfb6c6834f9a2a37c56af3d0a604b76f6bb9546a (diff) | |
INTEGRATION: CWS morejava (1.7.2); FILE MERGED
2005/08/26 13:55:41 fridrich_strba 1.7.2.1: Issue number:
Submitted by: fridrich_strba
Reviewed by: fridrich_strba
Add JRE of BEA Systems, Inc. among supported java virtual machines
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index e8423eca6371..fc29ffb6358e 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -4,9 +4,9 @@ * * $RCSfile: otherjre.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:30:24 $ + * last change: $Author: hr $ $Date: 2005-10-25 11:35:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,14 +71,16 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/client/jvm.dll", "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll" + "/bin/jrockit/jvm.dll" #elif UNX #ifdef MACOSX "/../../../JavaVM" #else - "/bin/classic/libjvm.so", // for IBM Java + "/bin/classic/libjvm.so", // for IBM Java "/jre/bin/classic/libjvm.so", // for IBM Java "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so" // for Blackdown PPC + "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so" // for Java of BEA Systems #endif #endif @@ -102,6 +104,7 @@ char const* const* OtherInfo::getLibraryPaths(int* size) "/jre/bin/classic", "/lib/" JFW_PLUGIN_ARCH "/client", "/lib/" JFW_PLUGIN_ARCH "/classic", + "/lib/" JFW_PLUGIN_ARCH "/jrockit", "/lib/" JFW_PLUGIN_ARCH "/native_threads", "/lib/" JFW_PLUGIN_ARCH #endif |