diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:12:57 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:12:57 +0000 |
| commit | 4a08e1de52ea4932af2495c677ee44c3e796a5cc (patch) | |
| tree | 4dbbe7b14b7fa5abb2cbd5568a9489c5d991cd9f /ure | |
| parent | b487c0bdc9c8c9a157fa4823b77ff78fcfe9f7f4 (diff) | |
INTEGRATION: CWS sb83 (1.2.4); FILE MERGED
2008/01/07 15:24:45 sb 1.2.4.1: #i84985# added URE_OVERRIDE_JAVA_JFW_SHARED|USER_DATA
Diffstat (limited to 'ure')
| -rw-r--r-- | ure/source/jvmfwk3.ini | 4 | ||||
| -rw-r--r-- | ure/source/jvmfwk3rc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ure/source/jvmfwk3.ini b/ure/source/jvmfwk3.ini index 540d7c4b55c9..55c029dd4021 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=${UNO_JAVA_JFW_USER_DATA} -UNO_JAVA_JFW_USER_DATA=${SYSUSERCONFIG}/URE/javasettings_${_OS}_${_ARCH}.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 11053329cc6b..d0b09f89058b 100644 --- a/ure/source/jvmfwk3rc +++ b/ure/source/jvmfwk3rc @@ -1,5 +1,5 @@ [Bootstrap] UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/../share/misc/javavendors.xml -UNO_JAVA_JFW_SHARED_DATA=file:///etc/opt/ure/javasettings_${_OS}_${_ARCH}.xml -UNO_JAVA_JFW_USER_DATA=${SYSUSERHOME}/.ure/javasettings_${_OS}_${_ARCH}.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} |