summaryrefslogtreecommitdiff
path: root/jvmfwk/inc
AgeCommit message (Collapse)Author
2019-07-31Improved loplugin:stringconstant (now that GCC 7 supports it): jvmfwkStephan Bergmann
Change-Id: I2bf2c6b5a896cc58195a5b8f85274b9d17c56ac8 Reviewed-on: https://gerrit.libreoffice.org/76667 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-04-26tdf#42949 Fix IWYU warnings in jvmfwk/ & jvmaccess/Gabor Kelemen
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I6c1041f261ba5a6f81efd3dcbc12baf2746e1839 Reviewed-on: https://gerrit.libreoffice.org/71217 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-04-13loplugin:sequentialassign in embeddedobj..l10ntoolsNoel Grandin
Change-Id: I69377e2f96a376a7a5ccaec268c4f92c00a250f7 Reviewed-on: https://gerrit.libreoffice.org/70705 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-04-12loplugin:unusedmethodsNoel Grandin
Change-Id: Ie90e53583484ee4f378ec92634adf3be7cd9ecbb Reviewed-on: https://gerrit.libreoffice.org/70650 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-04-09tdf#124503: Support JRE installations with unknown java.vendor propertyStephan Bergmann
After recent additions of 61c4f96d6ae6a80370774e53287edb27cbce8067 "Support AdoptOpenJDK" and 41507db590b24e1b9b45d95cad55c71ba2e4091d "Support Amazon Corretto" to our hard-coded list, there is now reports that at least Debian and Ubuntu tried to distribute versions of OpenJDK with the java.vendor propety set to string like "Debian" or "Ubuntu". Instead of trying to catch up with an ever-growing hard-coded list, it is probably better to stop relying exclusively on such a hard-coded list, and for unknown vendor values, try out whether the SunInfo backend (which supports the "generic" OpenJDK) would be able to handle the given JRE. (For simplicity, assume that any versions of such JREs are supported. Our baseline is Java 6, and there are unlikely any older versions of JREs from unknown vendors out there. If this turns out to be problematic, we could include information about problematic vendors after all, or add a general check that JREs from unknown vendors are at least Java 6.) Many functions in jvmfwk/inc/vendorplugin.hxx that used to take a set of sVendor/sMinVersion/sMaxVerison/arExcludeList paramters had to be revised to take a vendorSettings parameter instead, and VendorSettings::getVersionInformation has been changed to return a boost::optional, so that unknown vendors can be handled gracefully. Change-Id: Ibf915f2ddd59e09b77e2c03be688cac0547b9ac9 Reviewed-on: https://gerrit.libreoffice.org/70460 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-02-09loplugin:indentation in jvmfwk..lotuswordproNoel Grandin
Change-Id: I1af665f4c6d34d8514dd23bb7a3eba700ce3ddbc Reviewed-on: https://gerrit.libreoffice.org/67559 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-11-02fix signatures of deleted copy/assign operatorsNoel Grandin
Change-Id: Id1a0749b78a7021be3564487fb974d7084705129 Reviewed-on: https://gerrit.libreoffice.org/62718 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-14Remove useless constructor and destructorArnaud Versini
Change-Id: I3130ffb7e3ec1c39965ddbc921e5b3ef8303fa31 Reviewed-on: https://gerrit.libreoffice.org/61755 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-07-30Add missing sal/log.hxx headersGabor Kelemen
rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx> (and don't make use of it themselves), but many other files happen to depend on it. This is a continuation of commit 6ff2d84ade299cb3d14d4110e4cf1a4b8070c030 to be able to remove those unneeded includes. This commit adds missing headers to every file found by: grep -FwL sal/log.hxx $(git grep -Elw 'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF|SAL_DETAIL_LOG_STREAM|SAL_WHERE|SAL_STREAM|SAL_DEBUG') to directories from filter to jvmfwk Change-Id: I2a73d63f2aaef5f26d7d08957daaa8a30b412ac5 Reviewed-on: https://gerrit.libreoffice.org/58204 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-07-26jvmfwk: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)Stephan Bergmann
...by removing explicitly user-provided functions that do the same as their implicitly-defined counterparts, but may prevent implicitly declared copy functions from being defined as non-deleted in the future. (Even if a dtor was declared non-inline in an include file, the apparently-used implicitly-defined copy functions are already inline, so why bother with a non-inline dtor.) Change-Id: I1330a9fd4fc7f8fe8525b3ea02f9edb9e88e6638 Reviewed-on: https://gerrit.libreoffice.org/58059 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-10-23loplugin:includeform: jvmfwkStephan Bergmann
Change-Id: I7292ced23647692fdc85a3c234fb1469a91ad0ea
2017-04-13Use std::unique_ptr<JavaInfo> in jfw_plugin_getAllJavaInfosStephan Bergmann
Change-Id: I2beb95c42c666a788a87a45f59bc15ccfcf25aa6
2017-04-13Use std::unique_ptr<JavaInfo> in jfw_plugin_getJavaInfoByPathStephan Bergmann
Change-Id: I3511eaa12bb689a374a775204a3480d7c667a915
2017-04-13Use std::unique_ptr<JavaInfo> in jfw_plugin_getJavaInfoFromJavaHomeStephan Bergmann
Change-Id: I8be48d1eec799f347a5edaa67837cf1bbf4d2cc3
2017-04-13Use std::unique_ptr<JavaInfo> in jfw_plugin_getJavaInfosFromPathStephan Bergmann
...thereby fixing a memory leak Change-Id: I1aa91eeb407987abcdaa5221f4abd447f881c5d2
2017-04-13More std::unique_ptr<JavaInfo> lifecycle managementStephan Bergmann
Change-Id: If53347633ec4b2f8c2b221ba2057e0c38fa97b67
2017-04-12Convert rtl_uString -> OUString in jfw_get/setVMParametersStephan Bergmann
Change-Id: I55f96873661f686cd9625d69523718ccb54659dc
2017-04-12Simplify jfw::VersionInfoStephan Bergmann
Change-Id: I2cc1071bbaf9c68fbd621d6c0c6953b7646b1a62
2017-04-12Convert some rtl_uString -> OUString in jvmfwkStephan Bergmann
Change-Id: I08de5cab29dabc6fd824d5df8bac12c8520a05ae
2017-04-11Assert obvious preconditions instead of returning javaPluginError:InvalidArgStephan Bergmann
Change-Id: I93bb3aaa0106bce98995f843ee036c9570f6aaf0
2017-04-11sal_Bool -> boolStephan Bergmann
Change-Id: I8df49f349308cc17d684d5c0e8215aa628dfaeda
2017-03-13Related tdf#54443 List only matching JREsSamuel Mehrbrodt
I.e. show only 64bit JRE for 64bit LO and 32bit JRE for 32bit LO Change-Id: Id5e890637c7e1014bcb4e6fdd9ed9a33765112d5 Reviewed-on: https://gerrit.libreoffice.org/35026 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-12-25tdf#95416 Fix include filetamsil1amani3
Moved elements.hxx and fwkutil.hxx to jvmfwk/inc and changed the #include line in vendorplugin.hxx Change-Id: Ida7395e952c482af92c0561a7756be7cd0578b9f Reviewed-on: https://gerrit.libreoffice.org/32415 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-09-13loplugin:override: No more need for the "MSVC dtor override" workaroundStephan Bergmann
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
2016-08-05(initial) sparc64 portJames Clarke
Change-Id: I8ec9bb5415a9e6b9083ba89a7790872d67625de1
2016-07-22Related: tdf#101057 inherit MalformedVersionException from std::exceptionCaolán McNamara
so we don't get std::terminate on MacOSX if its thrown up to JavaVirtualMachine::getJavaVM Change-Id: I1c6b79bf16cbaa66b8f79d495239e301d3ca58de
2016-07-04Fix some spelling errors in comments and stringsOtto Kekäläinen
Change-Id: Iecd6b5e13d6be14651f77d8e37f01117ba15a11e Reviewed-on: https://gerrit.libreoffice.org/26883 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-05-22Convert javaPluginError to scoped enumNoel Grandin
Change-Id: Ib3a32227d50fa9e0f9cc4106ce40a4c3e840f8c7 Reviewed-on: https://gerrit.libreoffice.org/25206 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-04-30Fix typosAndrea Gelmini
Change-Id: Id81b16ff26283611f0b84929d831c827f847ab73 Reviewed-on: https://gerrit.libreoffice.org/24317 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-04-14clang-tidy performance-unnecessary-value-param in variousNoel Grandin
Change-Id: I7168d44dab8e6a8e37bb7920d744ff32f5e52907 Reviewed-on: https://gerrit.libreoffice.org/24019 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-03-10No more need for jfw_freeJavaInfoStephan Bergmann
Change-Id: I2426a76936b4099a243ce8c102da867e7868aac3
2016-03-09include/jvmfwk/*.h -> .hxx (only ever included from C++ code)Stephan Bergmann
Change-Id: Ia912e937d5a48afb6f8f5345b20bb7bd517fc4f1
2016-02-09Remove excess newlinesChris Sherlock
A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2015-07-10jvmfwk: pluginlib: Add support for mips64.Heiher
Change-Id: I525266468ae2ef04976d7835cc22c930293a0dc3 Reviewed-on: https://gerrit.libreoffice.org/16911 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-05-12java dir for powepc64 and powepc64le can differDavid Tardon
E.g., RHEL >= 7.1 uses ppc64le for reasons listed in https://bugs.openjdk.java.net/browse/JDK-8073139 . This is a follow-up to commit 7a66dbe982623be620ad6ac426fe689a434e5f51. Change-Id: I685f76d51e9775788a7fb225c6a5e2309a45ceb7
2014-12-15Remove obsolete commentStephan Bergmann
Change-Id: I66dcf6284bd1b7afb1c60c838bbbb2052e06072b
2014-12-15Check each potential JRE location only onceStephan Bergmann
i.e., after recent "fdo#83753: consider JAVA_HOME and PATH when selecting JRE" fix, if jfw_findAndSelectJRE found no suitable JRE in jfw_plugin_getJavaInfoFromJavaHome or jfw_plugin_getJavaInfosFromPath, do not re-check those locations in jfw_plugin_getAllJavaInfos. Change-Id: If4e085b4fceff5b2494c7b7b84ac51691dbc78cc
2014-12-15fdo#83753: consider JAVA_HOME and PATH when selecting JREMichael Weghorn
adapted algorithm that selects the Java runtime to be used so that Java installations associated with the JAVA_HOME and PATH environment variables are preferred over others Java installations are now analysed in the following order: * installation that the JAVA_HOME environment variable refers to (if it is set) * Java installations in PATH * other Java installation (algorithm that was used before) Signed-off-by: Stephan Bergmann <sbergman@redhat.com> Conflicts: jvmfwk/source/framework.cxx Change-Id: I3a3ade25322def0c0432b369848f13a6b82034a1
2014-11-19changed type of parameters from rtl_uString to OUStringMichael Weghorn
changed type of several parameters of the functions jfw_plugin_getAllJavaInfos and jfw_plugin_getJavaInfoByPath from rtl_uString to OUString Change-Id: I80feb311542e6ccded9f9924f800c75a7e14a1e7 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-10-09vendorplugin.h is jvmfwk-internal (and no need for extern "C")Stephan Bergmann
Change-Id: I954f789d5850e8016f5900812f9aa99be2416ce4
2013-04-23execute move of global headersBjoern Michaelsen
see https://gerrit.libreoffice.org/#/c/3367/ and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
2013-04-22Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks
2013-04-15fdo#60724 correct spellingThomas Arnhold
Change-Id: Ieb653adbd0cb4371ec5db57e70bcc551872f647f
2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-05Drop jvmaccess and jvmfwk when no SOLAR_JAVATor Lillqvist
Just sprinkle #ifdef SOLAR_JAVA into the code instead. In the source for jvmaccess and jvmfwk such ifdefs can be removed as it isn't compiled unless SOLAR_JAVA. Change-Id: Ia8614f8bd6d833582d3b79b5fb75f9153fa79606
2013-02-22s/the the/the/Tor Lillqvist
Change-Id: Iadacffaad832c6ff06757e8567e24f929f24a4c3
2012-12-18Let JavaVirtualMachine::getJavaVm start the VM it already foundStephan Bergmann
Since b69951996967a1c79e3a55dd13dd5609b19db6a1 "Drop support for /etc/opt/ure and ~/.ure from LibreOffice 4" there is no place any more where a plain URE will store information about a selected JVM, so JavaVirtualMachine::getJavaVM will go into an endless loop of jfw_startVM -> JFW_E_NO_SELECT -> jfw_findAndSelectJRE -> jfw_startVM -> ... The solution is to pass the JavaInfo determined by jfw_findAndSelectJRE into the second invocation of jfw_startVM (for which the parameter list of the latter needed to be changed), instead of relying on jfw_findAndSelectJRE and jfw_startVM implicitly communicating that information via user configuration files. Change-Id: I5799f04c457e8a849c67ed827dc5e134c6563362
2012-08-10Related fdo#51252: No more prereg, no more unopkg syncStephan Bergmann
Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying share/prereg/bundled to avoid startup crashes" removed the use of share/prereg, there is no longer need to generate it in the first place (by calling "unopkg sync" at build or installation time), and so no need for the "unopkg sync" sub- command, either. This also allows to simplify some of the jvmfwk code that was only there so that "unopkg sync" (which can require a JVM) can work in "hostile" environments (during build and installation). Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f
2012-07-14simplify include guardsThomas Arnhold
Change-Id: Id4210229b20a1d54b680ff1a2ccbcdd3684ecf5f
2012-07-13re-base on ALv2 code. Includes:Michael Meeks
cws mba34issues01: #i117709#: make sure that parent of error message box is visible Patch contributed by Mathias Bauer http://svn.apache.org/viewvc?view=revision&revision=1172346 i#119036 - improve user experience of certification dialog - only shown once Patch contributed by Oliver-Rainer Wittmann http://svn.apache.org/viewvc?view=revision&revision=1299727
generated by cgit (git 2.34.1) at 2025-01-11 01:10:31 +0000