summaryrefslogtreecommitdiff
path: root/ure
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-10-15 11:43:46 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-10-15 11:43:46 +0000
commitc66385c9c993b9a9dd664faf1a0d84604724d5ce (patch)
treed7b9967b9968a2db35511ba7ad1e39dcd808ec39 /ure
parent849fcecaffa0c7639bf1df6c877f278a16e1b645 (diff)
INTEGRATION: CWS sb71 (1.1.36); FILE MERGED
2007/04/27 14:13:46 sb 1.1.36.1: #i75466# Introduced URE_MORE_TYPES, URE_MORE_SERVICES, URE_MORE_JAVA_TYPES, URE_MORE_JAVA_CLASSPATH_URLS.
Diffstat (limited to 'ure')
-rw-r--r--ure/source/jvmfwk3rc1
-rw-r--r--ure/source/uno.ini5
-rw-r--r--ure/source/unorc5
3 files changed, 7 insertions, 4 deletions
diff --git a/ure/source/jvmfwk3rc b/ure/source/jvmfwk3rc
index 6d4a554c901e..11053329cc6b 100644
--- a/ure/source/jvmfwk3rc
+++ b/ure/source/jvmfwk3rc
@@ -2,3 +2,4 @@
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_CLASSPATH_URLS=${URE_MORE_JAVA_CLASSPATH_URLS}
diff --git a/ure/source/uno.ini b/ure/source/uno.ini
index e93e4af8fefd..590125f8193f 100644
--- a/ure/source/uno.ini
+++ b/ure/source/uno.ini
@@ -1,5 +1,6 @@
[Bootstrap]
URE_INTERNAL_LIB_DIR=${ORIGIN}
URE_INTERNAL_JAVA_DIR=${ORIGIN}/../java
-UNO_TYPES=${ORIGIN}/../misc/types.rdb ?${SYSUSERCONFIG}/URE/types.rdb
-UNO_SERVICES=${ORIGIN}/../misc/services.rdb ?${SYSUSERCONFIG}/URE/services.rdb
+URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES}
+UNO_TYPES=${ORIGIN}/../misc/types.rdb ?${SYSUSERCONFIG}/URE/types.rdb ${URE_MORE_TYPES}
+UNO_SERVICES=${ORIGIN}/../misc/services.rdb ?${SYSUSERCONFIG}/URE/services.rdb ${URE_MORE_SERVICES}
diff --git a/ure/source/unorc b/ure/source/unorc
index 3e6ce97c973c..50b8e8f1fe80 100644
--- a/ure/source/unorc
+++ b/ure/source/unorc
@@ -1,5 +1,6 @@
[Bootstrap]
URE_INTERNAL_LIB_DIR=${ORIGIN}
URE_INTERNAL_JAVA_DIR=${ORIGIN}/../share/java
-UNO_TYPES=${ORIGIN}/../share/misc/types.rdb ?file:///etc/opt/ure/types.rdb ?${SYSUSERHOME}/.ure/types.rdb
-UNO_SERVICES=${ORIGIN}/../share/misc/services.rdb ?file:///etc/opt/ure/services.rdb ?${SYSUSERHOME}/.ure/services.rdb
+URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES}
+UNO_TYPES=${ORIGIN}/../share/misc/types.rdb ?file:///etc/opt/ure/types.rdb ?${SYSUSERHOME}/.ure/types.rdb ${URE_MORE_TYPES}
+UNO_SERVICES=${ORIGIN}/../share/misc/services.rdb ?file:///etc/opt/ure/services.rdb ?${SYSUSERHOME}/.ure/services.rdb ${URE_MORE_SERVICES}