summaryrefslogtreecommitdiff
path: root/jvmfwk/inc
AgeCommit message (Collapse)Author
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
2011-12-26sunjavaplugin has been renamedDavid Tardon
2011-12-26export libsunjavaplugin's API functionsDavid Tardon
2011-12-24gbuildize jvmfwk, part 2: finish & clean upDavid Tardon
2011-12-24make exported symbols visibleDavid Tardon
2011-11-27remove precompiled_xxx.hxx/cxxNorbert Thiebaud
2011-11-27remove include of pch header from jvmfwkNorbert Thiebaud
2011-11-27remove PCH support in dmake-moduleNorbert Thiebaud
2010-11-01Merge commit 'ooo/OOO330_m13'Jan Holesovsky
2010-10-27add modelines to .h and .c files as wellCaolán McNamara
2010-10-26jl162 #i115180# fix problems with latest java 1.6.0_22 on MacOS 10.6Joachim Lingner
2010-10-14Add vim/emacs modelines to all source filesSebastian Spaeth
Fixes #fdo30794 Based on bin/add-modelines script (originally posted in mail 1286706307.1871.1399280959@webmail.messagingengine.com) Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-06-11jl152 #i77196# marking two bootstrap variables as deprecated in the header ↵Joachim Lingner
comment, because they were used when running unopkg during the setup
2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun ↵Jens-Heiner Rechtien
Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
2009-04-02CWS-TOOLING: integrate CWS jl119_DEV300Ivo Hinkelmann
2009-03-13 08:14:58 +0100 jl r269453 : CWS-TOOLING: rebase CWS jl119 to branches/OOO310@269350 (milestone: OOO310:m5) 2009-03-10 16:01:33 +0100 jl r269280 : #i98990# apply patch by jbu: fixing the python script provider 2009-03-10 13:25:02 +0100 jl r269268 : #i93939# 2009-03-10 11:44:07 +0100 jl r269261 : #i93939# 2009-03-09 17:14:58 +0100 jl r269205 : #i93939# choose a different JRE when the selected one was uninstalled 2009-03-09 16:34:34 +0100 jl r269201 : #i93939# choose a different JRE when the selected one was uninstalled 2009-03-05 16:40:16 +0100 jl r268924 : #99618# Do not migrate java settings 2009-02-25 14:29:53 +0100 jl r268439 : #i99618# do not invalidate existing javasettings by using a new date in the update element
2008-06-25INTEGRATION: CWS jl102 (1.15.14); FILE MERGEDKurt Zenker
2008/06/04 13:07:44 jl 1.15.14.1: #i90301# using bootstrap variable to switch of examination of system uses accessibility tools
2008-04-11INTEGRATION: CWS changefileheader (1.2.72); FILE MERGEDRüdiger Timm
2008/03/31 07:24:49 rt 1.2.72.1: #i87441# Change license header to LPGL v3.
2008-04-11INTEGRATION: CWS changefileheader (1.14.126); FILE MERGEDRüdiger Timm
2008/03/31 07:24:49 rt 1.14.126.1: #i87441# Change license header to LPGL v3.
2008-04-11INTEGRATION: CWS changefileheader (1.14.48); FILE MERGEDRüdiger Timm
2008/03/31 07:24:49 rt 1.14.48.1: #i87441# Change license header to LPGL v3.
2008-04-11INTEGRATION: CWS changefileheader (1.2.66); FILE MERGEDRüdiger Timm
2008/03/31 07:24:49 rt 1.2.66.1: #i87441# Change license header to LPGL v3.
2007-06-13INTEGRATION: CWS jl64 (1.13.80); FILE MERGEDOliver Bolte
2007/06/07 07:51:17 jl 1.13.80.1: #i76390# support of new bootstrap variable UNO_JAVA_JFW_INSTALL_DATA and UNO_JAVA_JFW_INSTALL_DATA_EXPIRE
2006-10-30INTEGRATION: CWS ause060 (1.1.2); FILE ADDEDRüdiger Timm
2006/09/22 18:03:58 hjs 1.1.2.1: #i69234# add required makefile
generated by cgit (git 2.34.1) at 2024-08-15 17:23:41 +0000