INTEGRATION: CWS jl64 (1.5.80); FILE MERGED

2007/06/07 07:52:58 jl 1.5.80.2: #i76390# support of new bootstrap variable UNO_JAVA_JFW_INSTALL_DATA and UNO_JAVA_JFW_INSTALL_EXPIRE
2007/06/04 08:05:45 jl 1.5.80.1: #i76390 do not create user installation when installing java extensions during setup

1 files changed, 33 insertions, 38 deletions

diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/source/fwkbase.hxx
index 487a3dbdd7b7..348c33735004 100644
--- a/jvmfwk/source/fwkbase.hxx
+++ b/jvmfwk/source/fwkbase.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fwkbase.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 19:35:12 $
+ *  last change: $Author: obo $ $Date: 2007-06-13 07:58:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -41,7 +41,7 @@ namespace jfw
 
 class VendorSettings
 {
-    rtl::OUString m_xmlDocVendorSettingsFileUrl;
+    ::rtl::OUString m_xmlDocVendorSettingsFileUrl;
     CXmlDocPtr m_xmlDocVendorSettings;
     CXPathContextPtr m_xmlPathContextVendorSettings;
 
@@ -55,15 +55,15 @@ public:
     Is is verified that the plug-in exist. If a plug-in does not exist then an
     exception is thrown containing the error JFW_E_CONFIGURATION
     */
-    std::vector<PluginLibrary> getPluginData();
+    ::std::vector<PluginLibrary> getPluginData();
 
     /* returns the file URL to the plugin.
      */
-    rtl::OUString getPluginLibrary(const rtl::OUString& sVendor);
+    ::rtl::OUString getPluginLibrary(const ::rtl::OUString& sVendor);
 
-    VersionInfo getVersionInformation(const rtl::OUString & sVendor);
+    VersionInfo getVersionInformation(const ::rtl::OUString & sVendor);
 
-    std::vector<rtl::OUString> getSupportedVendors();
+    ::std::vector< ::rtl::OUString> getSupportedVendors();
 };
 
 /* The class offers functions to retrieve verified bootstrap parameters.
@@ -76,37 +76,33 @@ namespace  BootParams
 
    In direct mode either of them must be set. If not an exception is thrown.
 */
-rtl::OUString getJREHome();
+::rtl::OUString getJREHome();
 
-::std::vector<rtl::OString> getVMParameters();
+::std::vector< ::rtl::OString> getVMParameters();
 
-rtl::OUString getUserData();
-
-rtl::OUString getSharedData();
+::rtl::OUString getUserData();
 
+::rtl::OUString getSharedData();
 
+::rtl::OUString getInstallData();
 /* returns the file URL to the vendor settings xml file.
  */
-rtl::OUString getVendorSettings();
+::rtl::OUString getVendorSettings();
 
 /* User the parameter UNO_JAVA_JFW_CLASSPATH and UNO_JAVA_JFW_ENV_CLASSPATH
    to compose a classpath
  */
-rtl::OString getClasspath();
-
-rtl::OUString getClasspathUrls();
-
-} //end namespace
-
+::rtl::OString getClasspath();
 
-/** Get the file URL to the javasettings.xml
-        If the file does not exist yet, then an
-        empty string is returned.
+::rtl::OUString getClasspathUrls();
 
-        @throws FrameworkException
-    */
-//rtl::OUString getUserSettingsURL();
+/** returns the content of UNO_JAVA_JFW_INSTALL_EXPIRE or a pretermined
+    value. If the bootstrap variable contains a string that cannot be
+    converted by OUString then it returns the predetermined value.
+*/
+::sal_uInt32 getInstallDataExpiration();
 
+} //end namespace
 
 
 
@@ -119,10 +115,12 @@ enum JFW_MODE
 
 JFW_MODE getMode();
 
-/** creates the -Djava.class.path option with the complete classpath.
-    If param mode is JFW_MODE_ENV_SIMPLE then the param javaSettings is ignored.
+/** creates the -Djava.class.path option with the complete classpath, including
+    the paths which are set by UNO_JAVA_JFW_CLASSPATH_URLS.
  */
-rtl::OString makeClassPathOption(CNodeJava & javaSettings);
+::rtl::OString makeClassPathOption(::rtl::OUString const & sUserClassPath);
+
+::rtl::OString getSettingsPath( const ::rtl::OUString & sURL);
 
 /** Get the system path to the javasettings.xml
     Converts the URL returned from getUserSettingsURL to a
@@ -130,33 +128,30 @@ rtl::OString makeClassPathOption(CNodeJava & javaSettings);
     does not exist.
    @throws FrameworkException
  */
-rtl::OString getUserSettingsPath();
+::rtl::OString getUserSettingsPath();
 
-/* returns the system path to the file where the
-   user data is to be stored.
-*/
-rtl::OString getUserSettingsStoreLocation();
+::rtl::OString getInstallSettingsPath();
 
 /** Returns the system path of the share settings file.
     Returns a valid string or throws an exception.
    @throws FrameworkException
  */
-rtl::OString getSharedSettingsPath();
+::rtl::OString getSharedSettingsPath();
 
 /* Determines the application base which is either the BaseInstallation
    (see getBaseInstallation) or the directory where the executable is resides.
 
    This function always returns a URL or throws an exception.
 */
-rtl::OUString getApplicationBase();
+::rtl::OUString getApplicationBase();
 
 
 /* returns a valid string or throws an exception.
    @throws FrameworkException
  */
-rtl::OString getVendorSettingsPath();
+::rtl::OString getVendorSettingsPath();
 
-rtl::OUString buildClassPathFromDirectory(const rtl::OUString & relPath);
+::rtl::OUString buildClassPathFromDirectory(const ::rtl::OUString & relPath);
 
 /** Called from writeJavaInfoData. It sets the process identifier. When
 java is to be started, then the current id is compared to the one set by
@@ -173,7 +168,7 @@ void setJavaSelected();
 bool wasJavaSelectedInSameProcess();
 /* Only for application mode.
  */
-rtl::OUString getApplicationClassPath();
+::rtl::OUString getApplicationClassPath();
 }
 
 #endif