summaryrefslogtreecommitdiff
path: root/jvmfwk/inc
AgeCommit message (Collapse)AuthorFilesLines
2015-07-10jvmfwk: pluginlib: Add support for mips64.Heiher1-2/+8
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 Tardon1-1/+5
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 Bergmann1-5/+0
Change-Id: I66dcf6284bd1b7afb1c60c838bbbb2052e06072b
2014-12-15Check each potential JRE location only onceStephan Bergmann2-3/+193
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 Weghorn1-0/+78
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 Weghorn1-12/+10
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 Bergmann1-0/+247
Change-Id: I954f789d5850e8016f5900812f9aa99be2416ce4
2013-04-23execute move of global headersBjoern Michaelsen4-1141/+0
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 Meeks2-48/+8
2013-04-15fdo#60724 correct spellingThomas Arnhold1-1/+1
Change-Id: Ieb653adbd0cb4371ec5db57e70bcc551872f647f
2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák1-1/+1
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 Lillqvist2-8/+0
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 Lillqvist1-1/+1
Change-Id: Iadacffaad832c6ff06757e8567e24f929f24a4c3
2012-12-18Let JavaVirtualMachine::getJavaVm start the VM it already foundStephan Bergmann1-3/+5
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 Bergmann1-24/+0
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 Arnhold2-2/+2
Change-Id: Id4210229b20a1d54b680ff1a2ccbcdd3684ecf5f
2012-07-13re-base on ALv2 code. Includes:Michael Meeks2-46/+28
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 Tardon1-1/+1
2011-12-26export libsunjavaplugin's API functionsDavid Tardon2-4/+49
2011-12-24gbuildize jvmfwk, part 2: finish & clean upDavid Tardon1-39/+0
2011-12-24make exported symbols visibleDavid Tardon2-21/+66
2011-11-27remove precompiled_xxx.hxx/cxxNorbert Thiebaud2-63/+0
2011-11-27remove include of pch header from jvmfwkNorbert Thiebaud2-2/+0
2011-11-27remove PCH support in dmake-moduleNorbert Thiebaud1-8/+0
2010-11-01Merge commit 'ooo/OOO330_m13'Jan Holesovsky2-0/+20
2010-10-27add modelines to .h and .c files as wellCaolán McNamara2-0/+6
2010-10-26jl162 #i115180# fix problems with latest java 1.6.0_22 on MacOS 10.6Joachim Lingner2-0/+20
2010-10-14Add vim/emacs modelines to all source filesSebastian Spaeth2-0/+4
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 Lingner1-3/+4
comment, because they were used when running unopkg during the setup
2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun ↵Jens-Heiner Rechtien5-21/+5
Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
2009-04-02CWS-TOOLING: integrate CWS jl119_DEV300Ivo Hinkelmann1-0/+21
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 Zenker1-1/+10
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 Timm2-46/+36
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 Timm1-23/+18
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 Timm1-23/+18
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 Timm1-23/+19
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 Bolte1-4/+26
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 Timm1-0/+55
2006/09/22 18:03:58 hjs 1.1.2.1: #i69234# add required makefile
2006-09-16INTEGRATION: CWS pchfix02 (1.1.2); FILE ADDEDOliver Bolte2-0/+77
2006/09/01 17:31:38 kaib 1.1.2.1: #i68856# Added header markers and pch files
2005-09-07INTEGRATION: CWS ooo19126 (1.13.34); FILE MERGEDRüdiger Timm1-47/+21
2005/09/05 17:12:20 rt 1.13.34.1: #i54170# Change license header: remove SISSL
2005-09-07INTEGRATION: CWS ooo19126 (1.12.34); FILE MERGEDRüdiger Timm1-45/+21
2005/09/05 17:12:20 rt 1.12.34.1: #i54170# Change license header: remove SISSL
2004-12-16INTEGRATION: CWS jl15 (1.12.2); FILE MERGEDKurt Zenker1-26/+34
2004/11/26 10:07:39 jl 1.12.2.3: #i37828# removed support of bootstrap parameters UNO_JAVA_JFW_DISABLE and UNO_JAVA_JFW_PLUGIN 2004/11/25 10:29:06 jl 1.12.2.2: #i37225# 2004/11/24 12:21:49 jl 1.12.2.1: #i37225# jfw_plugin_getJavaInfoByPath has new parameter vendor
2004-12-16INTEGRATION: CWS jl15 (1.11.2); FILE MERGEDKurt Zenker1-16/+19
2004/11/26 10:07:39 jl 1.11.2.1: #i37828# removed support of bootstrap parameters UNO_JAVA_JFW_DISABLE and UNO_JAVA_JFW_PLUGIN
2004-11-09INTEGRATION: CWS jl13 (1.10.10); FILE MERGEDJens-Heiner Rechtien1-3/+7
2004/09/29 14:10:46 jl 1.10.10.1: #i29390#
2004-11-09INTEGRATION: CWS jl13 (1.9.22); FILE MERGEDJens-Heiner Rechtien1-95/+174
2004/10/21 08:42:23 jl 1.9.22.11: #i29390# 2004/10/20 14:23:40 jl 1.9.22.10: #i29390# 2004/10/20 13:30:37 jl 1.9.22.9: #i29390# 2004/10/08 17:31:01 jl 1.9.22.8: #29930# 2004/10/05 15:22:10 jl 1.9.22.7: #i29390# 2004/10/04 07:50:48 jl 1.9.22.6: #i29390# 2004/10/01 12:59:22 jl 1.9.22.5: #i29390# 2004/10/01 10:57:58 jl 1.9.22.4: #29390# 2004/10/01 09:16:43 jl 1.9.22.3: #i29390# 2004/09/30 14:39:31 jl 1.9.22.2: #i29390# 2004/09/29 14:10:46 jl 1.9.22.1: #i29390#
2004-11-09INTEGRATION: CWS nojava1 (1.9.8); FILE MERGEDJens-Heiner Rechtien1-2/+4
2004/09/24 14:21:57 haggai 1.9.8.3: RESYNC: (1.9-1.10); FILE MERGED 2004/08/16 15:22:50 cmc 1.9.8.2: #i33045# use normal -DSOLAR_JAVA 2004/08/16 14:13:54 cmc 1.9.8.1: #i33045# build jvmfwk even without java, just default to failure on javarelated stuff
2004-11-09INTEGRATION: CWS nojava1 (1.9.20); FILE MERGEDJens-Heiner Rechtien1-2/+8
2004/08/16 15:22:50 cmc 1.9.20.2: #i33045# use normal -DSOLAR_JAVA 2004/08/16 14:13:54 cmc 1.9.20.1: #i33045# build jvmfwk even without java, just default to failure on javarelated stuff
2004-07-23INTEGRATION: CWS jl8 (1.9.4); FILE MERGEDJens-Heiner Rechtien1-3/+5
2004/06/18 15:02:15 jl 1.9.4.1: #i30342# plugin supports multiple vendors
2004-05-21#i20052#Joachim Lingner2-39/+151
2004-05-18#i20052#Joachim Lingner1-12/+39