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

5 files changed, 16 insertions, 42 deletions

diff --git a/ure/source/README b/ure/source/README
index bbc74693d732..2512d5681297 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -245,16 +245,12 @@ locations for types.rdb and services.rdb files:
 Linux x86, Solaris x86, and Solaris SPARC:
 
 - <URE installation>/share/misc/ types.rdb and services.rdb, respectively
-- /etc/opt/ure/ types.rdb and services.rdb, respectively
-- ~/.ure/ types.rdb and services.rdb, respectively
 - any URLs listed in the public deployment variables URE_MORE_TYPES and
   URE_MORE_SERVICES, respectively
 
 Windows:
 
 - <URE installation>\misc\ types.rdb and services.rdb, respectively
-- Documents and Settings\<User Name>\Application Data\URE\ types.rdb and
-  services.rdb, respectively
 - any URLs listed in the public deployment variables URE_MORE_TYPES and
   URE_MORE_SERVICES, respectively
 
@@ -297,36 +293,14 @@ relevant Java settings file for information on a suitable JDK/JRE version.
 NOTE: On any platform, you can delete the javasettings_${_OS}_${_ARCH}.xml file
 if the file contains problematic stale data.
 
-By default, the URE searches for a Java settings file in the following
-locations:
-
-Linux x86, Solaris x86, and Solaris SPARC:
-
-- /etc/opt/ure/javasettings_${_OS}_${_ARCH}.xml
-- ~/.ure/javasettings_${_OS}_${_ARCH}.xml
-
-NOTE: If these files do not contain information about a JDK/JRE, the URE
-searches for a suitable JDK/JRE installation and stores the relevant information
-in the ~/.ure/javasettings_${_OS}_${_ARCH}.xml file.  If you want all users to
-access the same JDK/JRE, log on as root and copy an existing
-~/.ure/javasettings_${_OS}_${_ARCH}.xml to
-/etc/opt/ure/javasettings_${_OS}_${_ARCH}.xml.
-
-Windows:
-
-- Documents and Settings\<User Name>\Application
-  Data\URE\javasettings_${_OS}_${_ARCH}.xml
-
-NOTE: If this file does not contain information about a JDK/JRE, the URE
-searches for a suitable JDK/JRE installation and stores the relevant information
-in the Documents and Settings\<User Name>\Application
-Data\URE\javasettings_${_OS}_${_ARCH}.xml file.  The URE on Windows does not
-by default support a system-wide deployment of the Java settings file.  That is,
-you cannot store the file in a Documents and Settings\All Users\Application
-Data\URE directory.
-
-You can override these paths by setting the URE_OVERRIDE_JAVA_JFW_SHARED_DATA
-and URE_OVERRIDE_JAVA_JFW_USER_DATA deployment variables.  You can also use the
+By default, the URE does not search for a Java settings file, but instead
+searches for a suitable JDK/JRE installation whenever necessary.  You can
+override this by setting the URE_OVERRIDE_JAVA_JFW_SHARED_DATA and
+URE_OVERRIDE_JAVA_JFW_USER_DATA deployment variables.  If
+URE_OVERRIDE_JAVA_JFW_USER_DATA is set, the URE will update the relevant
+information in
+${URE_OVERRIDE_JAVA_JFW_USER_DATA}/javasettings_${_OS}_${_ARCH}.xml when it
+searches for a suitable JDK/JRE installation.  You can also use the
 UNO_JAVA_JFW_JREHOME deployment variable to specify the location of a JDK/JRE
 installation.  For more information on this variable, see
 http://udk.openoffice.org/common/man/spec/javavendorextension.sxw.
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}
diff --git a/ure/source/jvmfwk3rc b/ure/source/jvmfwk3rc
index d1f79c539f8f..01b21ce0a23d 100644
--- a/ure/source/jvmfwk3rc
+++ b/ure/source/jvmfwk3rc
@@ -17,6 +17,6 @@
 #
 [Bootstrap]
 UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/../share/misc/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_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}
diff --git a/ure/source/uno.ini b/ure/source/uno.ini
index c28d5bab33de..6c04cae9a38c 100644
--- a/ure/source/uno.ini
+++ b/ure/source/uno.ini
@@ -19,5 +19,5 @@
 URE_INTERNAL_LIB_DIR=${ORIGIN}
 URE_INTERNAL_JAVA_DIR=${ORIGIN}/../java
 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}
+UNO_TYPES=${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES}
+UNO_SERVICES=${ORIGIN}/../misc/services.rdb ${URE_MORE_SERVICES}
diff --git a/ure/source/unorc b/ure/source/unorc
index 79364322d385..1efbfe206271 100644
--- a/ure/source/unorc
+++ b/ure/source/unorc
@@ -19,5 +19,5 @@
 URE_INTERNAL_LIB_DIR=${ORIGIN}
 URE_INTERNAL_JAVA_DIR=${ORIGIN}/../share/java
 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}
+UNO_TYPES=${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}
+UNO_SERVICES=${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}