Commit graph

156 commits

Author SHA1 Message Date
Rüdiger Timm
3ef6c43035 INTEGRATION: CWS ooo19126 (1.7.58); FILE MERGED
2005/09/05 17:10:54 rt 1.7.58.1: #i54170# Change license header: remove SISSL
2005-09-08 06:58:16 +00:00
Oliver Bolte
88651e02e0 INTEGRATION: CWS sb31 (1.5.24); FILE MERGED
2005/04/08 14:23:27 sb 1.5.24.2: #120220# Distinguish between errors creating a JVM and errors instantiating the UnoClassLoader.
2005/04/07 12:30:16 sb 1.5.24.1: #120220# Adapted to the new functionality of com.sun.star.java.XJavaVM.getJavaVM to return a jvmaccess::UnoVirtualMachine.
2005-06-17 09:07:15 +00:00
Oliver Bolte
5977d1497d INTEGRATION: CWS sb31 (1.67.6); FILE MERGED
2005/05/09 08:32:16 sb 1.67.6.4: #121392# Renamed URE use of UNO_[JAVA_]COMPONENT_PATH to URE_INTERNAL_LIB|JAVA_DIR.
2005/04/08 14:23:27 sb 1.67.6.3: #120220# Distinguish between errors creating a JVM and errors instantiating the UnoClassLoader.
2005/04/07 12:30:00 sb 1.67.6.2: #120220# Adapted to the new functionality of com.sun.star.java.XJavaVM.getJavaVM to return a jvmaccess::UnoVirtualMachine (TODO: initialize still needs to be adapted to also accept a jvmaccess::UnoVirtualMachine).
2005/03/31 09:10:42 sb 1.67.6.1: #120220# Cleaned up.
2005-06-17 09:06:59 +00:00
Kurt Zenker
307bd4b280 INTEGRATION: CWS systemboost (1.66.8); FILE MERGED
2005/01/13 16:28:05 cmc 1.66.8.1: #i36983# don't have external in include boost
2005-01-18 15:17:00 +00:00
Kurt Zenker
20ada4e0a0 INTEGRATION: CWS jl15 (1.65.2); FILE MERGED
2004/11/29 15:54:27 jl 1.65.2.1: #i37828# applet - netaccess settings did not match the values from officecfg/registry/schema/org/openoffice/Office/Java.xcs
2004-12-16 10:41:15 +00:00
Jens-Heiner Rechtien
4373980603 INTEGRATION: CWS jl13 (1.9.24); FILE MERGED
2004/09/30 15:34:59 jl 1.9.24.1: #i29390# some cleanup
2004-11-09 12:54:04 +00:00
Jens-Heiner Rechtien
abba18ccb4 INTEGRATION: CWS jl13 (1.14.24); FILE MERGED
2004/09/30 15:34:59 jl 1.14.24.1: #i29390# some cleanup
2004-11-09 12:53:51 +00:00
Jens-Heiner Rechtien
824996f4ee INTEGRATION: CWS jl13 (1.64.24); FILE MERGED
2004/09/30 15:34:58 jl 1.64.24.1: #i29390# some cleanup
2004-11-09 12:53:37 +00:00
Oliver Bolte
9824cb6f39 INTEGRATION: CWS unotlc (1.4.18); FILE MERGED
2004/07/14 13:11:58 dbo 1.4.18.1: unused variable
2004-08-12 11:17:37 +00:00
Oliver Bolte
960ceb5caf INTEGRATION: CWS jl6 (1.16.60); FILE MERGED
2004/05/03 10:39:18 jl 1.16.60.3: #i20052#
2004/04/28 10:59:27 jl 1.16.60.2: #i20052#
2004/02/19 09:47:18 jl 1.16.60.1: #1150008#
2004-06-01 08:04:58 +00:00
Oliver Bolte
1c13c37726 INTEGRATION: CWS jl6 (1.8.96); FILE MERGED
2004/04/28 10:59:27 jl 1.8.96.5: #i20052#
2004/02/20 09:19:07 jl 1.8.96.4: #115008#
2004/02/04 15:33:01 jl 1.8.96.3: #115008#
2004/02/04 15:07:15 jl 1.8.96.2: #115008#
2004/02/04 11:25:59 jl 1.8.96.1: #115008#
2004-06-01 08:04:40 +00:00
Oliver Bolte
814de01100 INTEGRATION: CWS jl6 (1.13.60); FILE MERGED
2004/04/28 10:59:27 jl 1.13.60.5: #i20052#
2004/02/20 09:19:07 jl 1.13.60.4: #115008#
2004/02/04 15:33:00 jl 1.13.60.3: #115008#
2004/02/04 15:07:15 jl 1.13.60.2: #115008#
2004/02/04 11:25:58 jl 1.13.60.1: #115008#
2004-06-01 08:04:23 +00:00
Oliver Bolte
321f43fe45 INTEGRATION: CWS jl6 (1.11.60); FILE MERGED
2004/05/07 15:03:25 jl 1.11.60.4: #i20052#
2004/04/30 08:34:42 jl 1.11.60.3: #i20052#
2004/02/19 09:47:18 jl 1.11.60.2: #1150008#
2004/02/02 15:25:56 jl 1.11.60.1: #115008# JVM service writes, and uses configuration data for the items which were formally in java.ini. Fixed use of environment variable OO_JAVA_PROPERTIES to initialize JVM service.
2004-06-01 08:04:06 +00:00
Oliver Bolte
eedeb11c40 INTEGRATION: CWS jl6 (1.3.96); FILE MERGED
2004/02/19 09:47:18 jl 1.3.96.1: #1150008#
2004-06-01 08:03:47 +00:00
Oliver Bolte
f6597d4606 INTEGRATION: CWS jl6 (1.60.14); FILE MERGED
2004/05/07 15:03:25 jl 1.60.14.13: #i20052#
2004/04/30 08:34:41 jl 1.60.14.12: #i20052#
2004/04/28 15:11:45 jl 1.60.14.11: RESYNC: (1.61-1.63); FILE MERGED
2004/04/28 10:59:26 jl 1.60.14.10: #i20052#
2004/03/16 16:15:36 jl 1.60.14.9: RESYNC: (1.60-1.61); FILE MERGED
2004/02/20 09:19:06 jl 1.60.14.8: #115008#
2004/02/19 09:47:18 jl 1.60.14.7: #1150008#
2004/02/04 16:52:42 jl 1.60.14.6: #115008#
2004/02/04 15:32:59 jl 1.60.14.5: #115008#
2004/02/04 15:07:14 jl 1.60.14.4: #115008#
2004/02/04 11:25:57 jl 1.60.14.3: #115008#
2004/02/03 15:57:36 jl 1.60.14.2: #115008# removed use of java.ini/javarc
2004/02/02 15:25:56 jl 1.60.14.1: #115008# JVM service writes, and uses configuration data for the items which were formally in java.ini. Fixed use of environment variable OO_JAVA_PROPERTIES to initialize JVM service.
2004-06-01 08:03:30 +00:00
Oliver Bolte
430aa3404d INTEGRATION: CWS jl6 (1.6.18); FILE MERGED
2004/05/07 15:03:24 jl 1.6.18.1: #i20052#
2004-06-01 08:03:13 +00:00
Jens-Heiner Rechtien
17d46f1d4f INTEGRATION: CWS unopkg1 (1.60.6); FILE MERGED
2004/03/05 20:16:27 dbo 1.60.6.3: #i20303# using vnd.sun.star.expand URLs
2004/03/02 12:56:42 dbo 1.60.6.2: RESYNC: (1.60-1.61); FILE MERGED
2004/03/02 10:06:28 dbo 1.60.6.1: #i20304# reading out CLASSPATH from ini files
2004-04-13 11:21:13 +00:00
Kurt Zenker
e65aea1fb4 INTEGRATION: CWS jl3 (1.60.4); FILE MERGED
2004/03/15 14:03:12 jl 1.60.4.5: RESYNC: (1.60-1.61); FILE MERGED
2003/11/21 10:20:30 jl 1.60.4.4: #110725# set propert user.country rather than user.region
2003/11/21 09:54:41 jl 1.60.4.3: #114029# infinite when reading a java.ini with no [java] section
2003/11/19 16:08:07 jl 1.60.4.2: #111018#
2003/11/19 14:48:34 jl 1.60.4.1: #112187# wrong use of getenv
2004-03-25 13:47:07 +00:00
Jens-Heiner Rechtien
b98e8f7337 INTEGRATION: CWS geordi2q14 (1.60.18); FILE MERGED
2004/01/30 12:39:18 hr 1.60.18.1: #111934#: merge CWS ooo111fix2
2004-02-02 18:27:34 +00:00
Jens-Heiner Rechtien
f7fe43f8b2 INTEGRATION: CWS geordi2q14 (1.5.50); FILE MERGED
2004/01/30 12:39:17 hr 1.5.50.1: #111934#: merge CWS ooo111fix2
2004-02-02 18:27:15 +00:00
Vladimir Glazounov
43cb0f4738 INTEGRATION: CWS sb8 (1.59.18); FILE MERGED
2003/10/06 08:37:02 sb 1.59.18.1: #112127# Set org.openoffice.native Java property in started JVM.
2003-10-09 09:23:47 +00:00
Vladimir Glazounov
abddba800f INTEGRATION: CWS mh11rc (1.58.2); FILE MERGED
2003/06/06 08:16:55 mh 1.58.2.1: join: from beta2
2003-06-12 10:08:36 +00:00
Vladimir Glazounov
af627f09c2 INTEGRATION: CWS mh11rc (1.4.50); FILE MERGED
2003/06/06 08:16:55 mh 1.4.50.1: join: from beta2
2003-06-12 10:08:24 +00:00
Vladimir Glazounov
9e71512de4 INTEGRATION: CWS fwk04 (1.57.10); FILE MERGED
2003/05/26 15:06:24 dbo 1.57.10.1: #109920# fixing wrong shared macro name
2003-05-28 12:30:15 +00:00
Rüdiger Timm
94e39aeb55 #100000# 2003-04-29 07:25:53 +00:00
Vladimir Glazounov
c9e108aac6 INTEGRATION: CWS uno3 (1.53.6); FILE MERGED
2003/04/22 14:26:40 jl 1.53.6.1: #108692# correct error message if office is not configured to run java
2003-04-24 13:10:05 +00:00
Rüdiger Timm
8c56289ba3 INTEGRATION: CWS uno2 (1.52.2.1.16); FILE MERGED
2003/04/10 11:39:47 jl 1.52.2.1.16.2: #108692# if the user has installed the offcie without java support and he wants to use a java component the a MessageBox comes up telling him about that. (java not configured)
2003/04/03 12:31:46 jl 1.52.2.1.16.1: #i12929# getJavaVM does not throw RuntimeExceptions (and derived). Instead void any is returned
2003-04-23 15:12:59 +00:00
Rüdiger Timm
27c9a40719 INTEGRATION: CWS uno2 (1.15.34); FILE MERGED
2003/04/08 13:56:14 dbo 1.15.34.1: #107991# UNO shared library component renaming
2003-04-23 15:10:41 +00:00
Rüdiger Timm
78234258b0 INTEGRATION: CWS uno2 (1.10.34); FILE MERGED
2003/04/08 13:56:14 dbo 1.10.34.1: #107991# UNO shared library component renaming
2003-04-23 15:10:29 +00:00
Vladimir Glazounov
2dc1175e4e INTEGRATION: CWS dbgmacros1 (1.12.36); FILE MERGED
2003/04/10 08:38:18 kso 1.12.36.1: #108413# - debug macro unification.
2003-04-15 16:13:20 +00:00
Vladimir Glazounov
3e9ce9f847 INTEGRATION: CWS dbgmacros1 (1.52.2.1.18); FILE MERGED
2003/04/10 08:38:17 kso 1.52.2.1.18.1: #108413# - debug macro unification.
2003-04-15 16:13:09 +00:00
Jens-Heiner Rechtien
414c097c65 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-27 11:01:26 +00:00
Kurt Zenker
c57e9a3a4f #101911# local variable for Forte 7 compiler 2002-12-10 16:05:19 +00:00
Stephan Bergmann
5a526d0957 #105077# Fixed typo. 2002-12-06 14:52:48 +00:00
Stephan Bergmann
63a62358c4 #105077# Base on new jvmaccess/virtualmachine, and cleanup. 2002-12-06 09:48:59 +00:00
Joachim Lingner
b65573b5c2 #105832# no applets 2002-12-03 10:39:07 +00:00
Joachim Lingner
ddf1bccaf8 #105832# no applets, remove -Xcheck:jni 2002-12-03 10:38:42 +00:00
Daniel Boelzle
cc6716249e #105140# added -Xcheck:jni for non-pro; fixing java_classpath file read-out assertion 2002-11-20 14:55:15 +00:00
Joachim Lingner
d1cc0edafe #105140# added -ea -Xcheck:jni in non pro office 2002-11-14 14:52:06 +00:00
Joachim Lingner
908798a484 #105085# -Xdebug, etc. entries in java.ini are not read 2002-11-13 15:04:59 +00:00
Joachim Lingner
f2e2383a8c #1005008# added docu 2002-11-12 15:07:33 +00:00
Joachim Lingner
927a21c5e6 #104575# the com.sun.star.config.INIManager was removed from office. Reading from java.ini is now done directly by the osl::File api 2002-10-31 16:01:38 +00:00
Joachim Lingner
291a8e7952 #103704# #103724# 2002-09-25 14:37:50 +00:00
Joachim Lingner
7e7e0865b2 #102990# interaction handler: when no jvm lib is found the messagbox contains the path to the java dir rather then to the libjvm.so 2002-09-16 13:19:51 +00:00
Joachim Lingner
baf2cbd97e #1003002# java error handling: on linux reboot necessary after jvmsetup, interaction handler only gets XInteractionAbort 2002-09-16 11:30:42 +00:00
Joachim Lingner
c4d5afe77a #102887# debugging of java components on linux 2002-09-06 06:28:57 +00:00
Joachim Lingner
dfa990baa5 #101225# 2002-08-15 12:26:07 +00:00
Jörg Budischewski
3fb1d119fc #101225# disabled code optimization for C52 to workaround CC code generation bug 2002-08-13 15:12:55 +00:00
Joachim Lingner
34bcf81a97 #101225# 2002-08-12 09:46:10 +00:00
Joachim Lingner
0c54f3a2fe #101225# typo fixed 2002-08-08 11:44:43 +00:00
Joachim Lingner
3bbad9330c #101225# a JavaNotConfiguredException is only thrown if there is no java.ini AND no environment variables set (OO_JAVA_PROPERTIES) 2002-08-08 09:39:54 +00:00
Joachim Lingner
39240e3ffa #102152# hotfix, do not throw exception if java.ini was not found 2002-08-08 07:12:02 +00:00
Joachim Lingner
bc5c7dd262 #91843# The VM service tries to get the share/config/javarc in the base installation (setup -n) of a network installation if there is no user/config/javarc in the workstation installation 2002-07-25 07:55:30 +00:00
Joachim Lingner
9abcd551a8 #101225# 2002-07-24 11:39:53 +00:00
Joachim Lingner
6bc1c82a6b #101225# support interaction handler now. This enables to start the jvmsetup when XJavaVM::getJavaVM was called and there is no Java configured 2002-07-23 13:07:24 +00:00
Joachim Lingner
a6acdd0bb0 added abort handler and fixed a thread problem which occured when creation of a VM failed and later XJavaVM::getJavaVM was called again 2002-07-12 09:37:46 +00:00
Jörg Budischewski
627f0491e9 #99361# changed the name from javai.dll to jvm.dll to have a sensible default on windows 2002-05-22 06:40:10 +00:00
Jörg Budischewski
2c6753590f #99011# UNO_SHARE/USER_PACAKGES_CACHE is now interpreted by the javavm service 2002-04-29 13:32:46 +00:00
Jörg Budischewski
69e376c01a #99011# UNO_SHARE/USER_PACAKGES_CACHE is now interpreted by the javavm service 2002-04-29 13:12:14 +00:00
Joachim Lingner
441ad15774 #97245# -enableassertions entry in java.ini is now passed on to the JVM correctly 2002-03-06 15:00:45 +00:00
Jens-Heiner Rechtien
d6e245a70d #65293#: include <string.h> 2002-02-21 11:16:53 +00:00
Christof Pintaske
71eafcb210 #96239# added support for JAVA_HOME 2002-01-20 19:11:04 +00:00
Joachim Lingner
c74d0bb1a2 #75148# Changes of NetAccess and Security are now set with a live VM (setProperty and SandboxSecurity.reset) javavm.cxx 2001-11-22 12:17:57 +00:00
Joachim Lingner
21d42ab495 #75148# check security and netaccess are set now 2001-11-19 11:00:15 +00:00
Joachim Lingner
3995bdba52 #75148# removed socks property, added support for none and manual proxy settings 2001-11-12 10:22:45 +00:00
Joachim Lingner
a070f92e94 #94460# removed unnecessary includes 2001-11-08 07:28:27 +00:00
Daniel Boelzle
c1be9e18cd #88337# removed makefile.rc 2001-11-07 11:51:18 +00:00
Joachim Lingner
81b1f6b1bd #75148# 2001-11-06 08:28:08 +00:00
Joachim Lingner
8f4dd18214 #75148# 2001-11-01 10:03:06 +00:00
Joachim Lingner
854d7538e8 #75148# 2001-10-31 15:03:47 +00:00
Martin Hollmichel
00278b5636 add: SOLAR_JAVA #90436 2001-10-18 11:08:40 +00:00
Joachim Lingner
ff1131d0ef #92175# 2001-10-17 14:52:51 +00:00
Joachim Lingner
d5478dcfb0 #92175# 2001-09-25 05:39:19 +00:00
Kay Ramme
46a8c3e00d ifdef makefile targets (#90436#) 2001-09-11 13:33:34 +00:00
Kay Ramme
8b35417446 renamed config. entrys (#88512#) 2001-07-19 06:44:04 +00:00
Jörg Budischewski
a242da96dc #67468# Added unloading and context support 2001-06-22 15:21:02 +00:00
Joachim Lingner
9dacb68004 #82073# under UNIX some signal handlers are restored to default before the Java VM 1.2 ( or higher ) is created 2001-06-11 14:31:34 +00:00
Jörg Budischewski
1ea21d6418 fileurl taskforce changes 2001-05-21 14:57:33 +00:00
Philipp Lohmann
83a4deb5c4 rtl string api changes 2001-05-11 10:37:39 +00:00
Daniel Boelzle
3c08d0ba1e need to generated XComponentContext for included headers 2001-05-10 13:38:48 +00:00
Kay Ramme
d92aa38ba4 enable vm default output 2001-05-09 08:35:40 +00:00
Oliver Bolte
5675e380b6 #65293# vos deleted 2001-05-07 13:03:43 +00:00
Joachim Lingner
ae789b49c9 #82073# 2001-04-25 10:31:24 +00:00
Juergen Schmidt
654f98c4e3 change project and build dependencies 2001-04-03 07:15:47 +00:00
Joachim Lingner
90574aaf3f replaced vos::Thread by osl::Thread 2001-03-16 15:24:27 +00:00
Joachim Lingner
2af2a0c812 using osl::Condition, osl::Module instead of vos::OCondition and vos::Condition 2001-03-16 15:01:05 +00:00
Joachim Lingner
4038b72427 OSL_ENSHURE replaced by OSL_ENSURE 2001-03-12 14:38:06 +00:00
Patrick Luby
8dcb68f686 Added Mac OS X JVM library name 2001-03-09 03:35:21 +00:00
Armin Theissen
40e1babc1c changed stl includes 2001-03-08 08:46:26 +00:00
Juergen Schmidt
79fae0b0fe changes for new module-description.dtd 2001-03-07 09:06:00 +00:00
Patrick Luby
a03ddd50b9 Removed compiling of staticmb*.cxx files for Mac OS X now that we have automated this process 2001-03-02 06:21:44 +00:00
Kay Ramme
4763e6e5bb abort when java dies 2001-01-31 15:43:39 +00:00
Oliver Bolte
7baa3c3aa8 SRC614 for maxosx static member 2000-12-21 12:24:08 +00:00
Kay Ramme
f9ef2a66c4 #81881# 2000-12-19 09:20:57 +00:00
Kay Ramme
9d2536a703 must change: soffice.ini obsolete; #78758# country and langue default 2000-11-14 13:07:06 +00:00
Rüdiger Timm
974d6ae261 #65293#DESCRIPTIONOBJ removed 2000-11-13 16:34:02 +00:00
Jens-Heiner Rechtien
4d7ce2ac0c #65293#: removed rules for jen.rdb 2000-11-13 15:51:12 +00:00
Juergen Schmidt
5a53f81e61 remove dependency to com.sun.star.frame.XConfigManager 2000-11-13 15:43:56 +00:00
Hans-Joachim Lankenau
80d5b18976 changes for library description 2000-10-30 13:20:44 +00:00
Patrick Luby
0a20754caa Added #ifdef for Mac OS X to replace tzname[0] used on other platforms. 2000-10-23 14:29:34 +00:00