summaryrefslogtreecommitdiff
path: root/ure/source/jvmfwk3.ini
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-15 12:40:40 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-15 12:46:19 +0100
commitb69951996967a1c79e3a55dd13dd5609b19db6a1 (patch)
treef52f272d750678eee7468e2df846685a67a3ae17 /ure/source/jvmfwk3.ini
parent7a11b9cc6d8a4116771333445637bb5b251420c8 (diff)
Drop support for /etc/opt/ure and ~/.ure from LibreOffice 4
For one, /etc/opt/ure was probably never used by anyone anyway, so meant just needless file-stats during startup. For another, accidentally created ~/.ure/javasettings_*.xml that later became stale were noted to cause trouble, so that source is now closed. For this to work, jvmfwk needs to be silent now if it cannot read/write any shared/user javasettings_*.xml. Change-Id: I332b5ebb9549dc6ccf7c99c439d9a3b61aeb5829
Diffstat (limited to 'ure/source/jvmfwk3.ini')
-rw-r--r--ure/source/jvmfwk3.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/ure/source/jvmfwk3.ini b/ure/source/jvmfwk3.ini
index 55c029dd4021..18a2bb5f88e4 100644
--- a/ure/source/jvmfwk3.ini
+++ b/ure/source/jvmfwk3.ini
@@ -1,5 +1,5 @@
[Bootstrap]
UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/../misc/javavendors.xml
-UNO_JAVA_JFW_SHARED_DATA=${URE_OVERRIDE_JAVA_JFW_SHARED_DATA} ${SYSUSERCONFIG}/URE/javasettings_${_OS}_${_ARCH}.xml
-UNO_JAVA_JFW_USER_DATA=${URE_OVERRIDE_JAVA_JFW_USER_DATA} ${SYSUSERCONFIG}/URE/javasettings_${_OS}_${_ARCH}.xml
+UNO_JAVA_JFW_SHARED_DATA=${URE_OVERRIDE_JAVA_JFW_SHARED_DATA}
+UNO_JAVA_JFW_USER_DATA=${URE_OVERRIDE_JAVA_JFW_USER_DATA}
UNO_JAVA_JFW_CLASSPATH_URLS=${URE_MORE_JAVA_CLASSPATH_URLS}