summaryrefslogtreecommitdiff
path: root/ure
diff options
context:
space:
mode:
authorJürgen Schmidt <jsc@apache.org>2013-04-18 09:58:02 +0000
committerJürgen Schmidt <jsc@apache.org>2013-04-18 09:58:02 +0000
commit2af65172af2cfc768e4f44507a02e1b17a9806ba (patch)
treefd4c4c673a8a83bee9427170d8963559017474cf /ure
parent581c83c696bd850066d425427c10374b6587b45d (diff)
#121996# integrate first part to remove 3layer office
Notes
Notes: prefer: a66f9903bba9dc7eeff6683ebddcd34d4ad70068
Diffstat (limited to 'ure')
-rw-r--r--ure/source/jvmfwk3.ini2
-rw-r--r--ure/source/jvmfwk3rc2
2 files changed, 2 insertions, 2 deletions
diff --git a/ure/source/jvmfwk3.ini b/ure/source/jvmfwk3.ini
index 381866bdbe2b..6e2870bac886 100644
--- a/ure/source/jvmfwk3.ini
+++ b/ure/source/jvmfwk3.ini
@@ -19,7 +19,7 @@
#
# *************************************************************
[Bootstrap]
-UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/../misc/javavendors.xml
+UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/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_CLASSPATH_URLS=${URE_MORE_JAVA_CLASSPATH_URLS}
diff --git a/ure/source/jvmfwk3rc b/ure/source/jvmfwk3rc
index 11a117954bde..95dba9f03ab7 100644
--- a/ure/source/jvmfwk3rc
+++ b/ure/source/jvmfwk3rc
@@ -19,7 +19,7 @@
#
# *************************************************************
[Bootstrap]
-UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/../share/misc/javavendors.xml
+UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/javavendors.xml
UNO_JAVA_JFW_SHARED_DATA=${URE_OVERRIDE_JAVA_JFW_SHARED_DATA} file:///etc/opt/ure/javasettings_${_OS}_${_ARCH}.xml
UNO_JAVA_JFW_USER_DATA=${URE_OVERRIDE_JAVA_JFW_USER_DATA} ${SYSUSERHOME}/.ure/javasettings_${_OS}_${_ARCH}.xml
UNO_JAVA_JFW_CLASSPATH_URLS=${URE_MORE_JAVA_CLASSPATH_URLS}