INTEGRATION: CWS jl13 (1.18.8); FILE MERGED

2004/10/26 12:54:03 jl 1.18.8.9: #i29390#
2004/10/25 10:37:40 jl 1.18.8.8: #29390#
2004/10/21 13:17:43 jl 1.18.8.7: RESYNC: (1.18-1.19); FILE MERGED
2004/10/20 13:30:38 jl 1.18.8.6: #i29390#
2004/10/08 17:31:03 jl 1.18.8.5: #29930#
2004/10/05 11:53:18 jl 1.18.8.4: #i29390# better diagnostic
2004/09/30 08:16:01 jl 1.18.8.3: #i29390#
2004/09/29 13:41:34 jl 1.18.8.2: #i29390#
2004/09/10 13:25:23 jl 1.18.8.1: #i33040# encoding of vendor data was buggy when asien glyphs were used (> 128)

1 files changed, 138 insertions, 751 deletions

diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index ded3a6fd95a8..9572dcfd7b1d 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fwkutil.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: rt $ $Date: 2004-09-08 16:03:51 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 14:01:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,35 +63,28 @@
 #include <windows.h>
 #endif
 
-#include "libxmlutil.hxx"
+#include <string>
 #include "osl/mutex.hxx"
 #include "osl/module.hxx"
+#include "osl/thread.hxx"
 #include "rtl/ustring.hxx"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/bootstrap.hxx"
 #include "osl/file.hxx"
-#include "osl/thread.hxx"
 #include "osl/process.h"
 #include "rtl/instance.hxx"
 #include "rtl/uri.hxx"
-#include "rtl/process.h"
 #include "osl/getglobalmutex.hxx"
-#include "libxml/xpathInternals.h"
 
 #include "framework.hxx"
-#include "elements.hxx"
 #include "fwkutil.hxx"
 
+using namespace rtl;
+using namespace osl;
 
-#define JAVASETTINGS "javasettings"
-#define VENDORSETTINGS "javavendors.xml"
-/** The vector contains on return file urls to the plugins.
- */
 namespace jfw
 {
 
-bool  g_bJavaSet = false;
-
 struct Init
 {
     osl::Mutex * operator()()
@@ -107,436 +100,6 @@ osl::Mutex * getFwkMutex()
             Init(), ::osl::GetGlobalMutex());
 }
 
-const rtl::Bootstrap & getBootstrapHandle()
-{
-    static rtl::Bootstrap *pBootstrap = 0;
-    if( !pBootstrap )
-    {
-        rtl::OUString exe;
-        osl_getExecutableFile( &(exe.pData) );
-
-        sal_Int32 nIndex = exe.lastIndexOf( '/' );
-        rtl::OUString ret;
-        if( exe.getLength() && nIndex != -1 )
-        {
-            rtl::OUStringBuffer buf( exe.getLength() + 10 );
-            buf.append( exe.getStr() , nIndex +1 ).appendAscii( SAL_CONFIGFILE("uno") );
-            ret = buf.makeStringAndClear();
-        }
-#if OSL_DEBUG_LEVEL > 1
-        rtl::OString o = rtl::OUStringToOString( ret , RTL_TEXTENCODING_ASCII_US );
-        printf( "JavaVM: Used ininame %s\n" , o.getStr() );
-#endif
-        static rtl::Bootstrap  bootstrap( ret );
-        pBootstrap = &bootstrap;
-    }
-    return *pBootstrap;
-}
-rtl::OUString retrieveClassPath( ::rtl::OUString const & macro )
-{
-    ::rtl::OUString classpath( macro );
-    getBootstrapHandle().expandMacrosFrom( classpath );
-    ::rtl::OUStringBuffer buf;
-    sal_Int32 index = 0;
-    char szClassPathSep[] = {SAL_PATHSEPARATOR,0};
-    do
-    {
-        ::rtl::OUString token( classpath.getToken( 0, ' ', index ).trim() );
-        if (token.getLength())
-        {
-            if (token.matchIgnoreAsciiCaseAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.expand:") ))
-            {
-                token = ::rtl::Uri::decode(
-                    token.copy( sizeof ("vnd.sun.star.expand:") -1 ),
-                    rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
-                getBootstrapHandle().expandMacrosFrom( token );
-            }
-
-            ::rtl::OUString systemPathElement;
-            oslFileError rc = osl_getSystemPathFromFileURL(
-                token.pData, &systemPathElement.pData );
-            OSL_ASSERT( rc == osl_File_E_None );
-            if (rc == osl_File_E_None && systemPathElement.getLength() > 0)
-            {
-                if (buf.getLength() > 0)
-                    buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
-                                         szClassPathSep) );
-                buf.append( systemPathElement );
-            }
-        }
-    }
-    while (index >= 0);
-    return buf.makeStringAndClear();
-}
-
-rtl::OUString getPlatform()
-{
-    rtl::OUStringBuffer buf(256);
-    buf.appendAscii("_");
-
-    rtl::OUString sOS;
-    rtl::Bootstrap::get(
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_OS")),
-        sOS);
-    OSL_ASSERT(sOS.getLength() > 0);
-    buf.append(sOS);
-    buf.appendAscii("_");
-    rtl::OUString sArch;
-    rtl::Bootstrap::get(
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_ARCH")),
-        sArch);
-    OSL_ASSERT(sArch.getLength() > 0);
-    buf.append(sArch);
-    return buf.makeStringAndClear();
-}
-
-javaFrameworkError getPluginLibrary(
-    const rtl::OUString& sVendor, rtl::OUString & sLibUrl)
-{
-    javaFrameworkError errcode = JFW_E_NONE;
-
-    rtl::OString sVendorsPath = getVendorSettingsPath();
-    CXmlDocPtr docVendor;
-    CXPathContextPtr contextVendor;
-    docVendor = xmlParseFile(sVendorsPath.getStr());
-    if (docVendor == NULL)
-        return JFW_E_CONFIG_READWRITE;
-
-    contextVendor = xmlXPathNewContext(docVendor);
-    if (xmlXPathRegisterNs(contextVendor, (xmlChar*) "jf",
-        (xmlChar*) NS_JAVA_FRAMEWORK) == -1)
-        return JFW_E_CONFIG_READWRITE;
-
-    rtl::OUStringBuffer usBuffer(256);
-    usBuffer.appendAscii("/jf:javaSelection/jf:plugins/jf:library[@vendor=\"");
-    usBuffer.append(sVendor);
-    usBuffer.appendAscii("\"]/text()");
-    rtl::OUString ouExpr = usBuffer.makeStringAndClear();
-    rtl::OString sExpression =
-        rtl::OUStringToOString(ouExpr, osl_getThreadTextEncoding());
-    CXPathObjectPtr pathObjVendor;
-    pathObjVendor = xmlXPathEvalExpression(
-        (xmlChar*) sExpression.getStr(), contextVendor);
-    if (xmlXPathNodeSetIsEmpty(pathObjVendor->nodesetval))
-        return JFW_E_FORMAT_STORE;
-    CXmlCharPtr xmlCharPlugin;
-    xmlCharPlugin =
-        xmlNodeListGetString(
-            docVendor,pathObjVendor->nodesetval->nodeTab[0], 1);
-
-
-
-    JFW_MODE mode = getMode();
-    if (mode == JFW_MODE_OFFICE)
-    {
-        //make an absolute file url from the relativ plugin URL
-        sLibUrl = getBaseInstallation()  +
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + xmlCharPlugin;
-    }
-    else if (mode == JFW_MODE_ENV_SIMPLE)
-    {
-        rtl::OUString sPlugin = getFileFromURL(xmlCharPlugin);
-        //search next to this library
-        rtl::OUString sLib = searchFileNextToThisLib(sPlugin);
-        if (sLib.getLength() == 0)
-            errcode = JFW_E_ERROR;
-        else
-            sLibUrl = sLib;
-    }
-    else
-    {
-        OSL_ASSERT(0);
-        errcode = JFW_E_ERROR;
-    }
-
-
-    return errcode;
-}
-
-
-javaFrameworkError getVendorPluginURLs(
-    const xmlDocPtr doc,
-    const xmlXPathContextPtr  context,
-    std::vector<PluginLibrary> * vecPlugins)
-{
-    OSL_ASSERT(vecPlugins && doc && context);
-
-    //get the nodeset for the library elements
-    jfw::CXPathObjectPtr result;
-    result = xmlXPathEvalExpression(
-        (xmlChar*)"/jf:javaSelection/jf:plugins/jf:library", context);
-    if (xmlXPathNodeSetIsEmpty(result->nodesetval))
-    {
-        return JFW_E_ERROR;
-    }
-    vecPlugins->clear();
-
-    //get the values of the library elements + vendor attribute
-    xmlNode* cur = result->nodesetval->nodeTab[0];
-    JFW_MODE mode = getMode();
-    while (cur != NULL)
-    {
-        //between library elements are also text elements
-        if (cur->type == XML_ELEMENT_NODE)
-        {
-            jfw::CXmlCharPtr sAttrVendor(xmlGetProp(cur, (xmlChar*) "vendor"));
-            jfw::CXmlCharPtr sTextLibrary(
-                xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
-            PluginLibrary plugin;
-            rtl::OString osVendor((sal_Char*)(xmlChar*) sAttrVendor);
-            plugin.sVendor = rtl::OStringToOUString(osVendor, RTL_TEXTENCODING_UTF8);
-
-            if (mode == JFW_MODE_OFFICE)
-            {
-                //create the file URL to the library
-                rtl::OUString sBase = getBaseInstallation();
-                plugin.sPath = sBase +
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sTextLibrary;
-            }
-            else if (mode == JFW_MODE_ENV_SIMPLE)
-            {
-                rtl::OUString sPlugin = getFileFromURL(sTextLibrary);
-                //search next to this library
-                plugin.sPath = searchFileNextToThisLib(sPlugin);
-                OSL_ASSERT(plugin.sPath.getLength() > 0);
-            }
-            else
-            {
-                OSL_ASSERT(0);
-                return JFW_E_ERROR;
-            }
-
-            vecPlugins->push_back(plugin);
-        }
-        cur = cur->next;
-    }
-    return JFW_E_NONE;
-}
-
-javaFrameworkError getSupportedVendors(
-    const xmlDocPtr doc,
-    const xmlXPathContextPtr  context,
-    std::vector<rtl::OUString> * vecVendors)
-{
-    OSL_ASSERT(vecVendors && doc && context);
-
-    //get the nodeset for the library elements
-    jfw::CXPathObjectPtr result;
-    result = xmlXPathEvalExpression(
-        (xmlChar*)"/jf:javaSelection/jf:plugins/jf:library", context);
-    if (xmlXPathNodeSetIsEmpty(result->nodesetval))
-    {
-        return JFW_E_ERROR;
-    }
-    vecVendors->clear();
-
-    //get the values of the library elements + vendor attribute
-    xmlNode* cur = result->nodesetval->nodeTab[0];
-    JFW_MODE mode = getMode();
-    while (cur != NULL)
-    {
-        //between library elements are also text elements
-        if (cur->type == XML_ELEMENT_NODE)
-        {
-            jfw::CXmlCharPtr sAttrVendor(xmlGetProp(cur, (xmlChar*) "vendor"));
-            vecVendors->push_back(sAttrVendor);
-        }
-        cur = cur->next;
-    }
-    return JFW_E_NONE;
-}
-
-
-/** Get the file URL to the javasettings.xml
- */
-rtl::OUString getUserSettingsURL()
-{
-    //get the system path to the javasettings.xml file
-    rtl::OUString sUserDir;
-    rtl::Bootstrap::get(
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserInstallation")),
-        sUserDir,
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("${$SYSBINDIR/"
-             SAL_CONFIGFILE("bootstrap") ":UserInstallation}")));
-
-    if (sUserDir.getLength() == 0)
-        return rtl::OUString();
-    rtl::OUStringBuffer sSettingsBuffer(512);
-    sSettingsBuffer.append(sUserDir);
-    sSettingsBuffer.appendAscii("/user/config/");
-    sSettingsBuffer.appendAscii(JAVASETTINGS);
-    sSettingsBuffer.append(getPlatform());
-    sSettingsBuffer.appendAscii(".xml");
-    return sSettingsBuffer.makeStringAndClear();
-}
-
-rtl::OString getUserSettingsPath()
-{
-    rtl::OUString sURL = getUserSettingsURL();
-    rtl::OUString sSystemPathSettings;
-    if (osl_getSystemPathFromFileURL(sURL.pData,
-        & sSystemPathSettings.pData) != osl_File_E_None)
-        return rtl::OString();
-
-    rtl::OString osSystemPathSettings =
-        rtl::OUStringToOString(sSystemPathSettings,osl_getThreadTextEncoding());
-    return osSystemPathSettings;
-}
-rtl::OUString getSharedSettingsURL()
-{
-    rtl::OUString sBase = getBaseInstallation();
-    if (sBase.getLength() == 0)
-        return sBase;
-    rtl::OUStringBuffer sBufSettings(256);
-    sBufSettings.append(sBase);
-    sBufSettings.appendAscii("/share/config/");
-    sBufSettings.appendAscii(JAVASETTINGS);
-    sBufSettings.append(getPlatform());
-    sBufSettings.appendAscii(".xml");
-    return sBufSettings.makeStringAndClear();
-}
-
-rtl::OUString getSharedSettingsURLNoPlatformSuffix()
-{
-    rtl::OUString sBase = getBaseInstallation();
-    if (sBase.getLength() == 0)
-        return sBase;
-    rtl::OUStringBuffer sBufSettings(256);
-    sBufSettings.append(sBase);
-    sBufSettings.appendAscii("/share/config/");
-    sBufSettings.appendAscii(JAVASETTINGS);
-    sBufSettings.appendAscii(".xml");
-    return sBufSettings.makeStringAndClear();
-}
-
-rtl::OString getSharedSettingsPath()
-{
-    rtl::OUString sURL = getSharedSettingsURL();
-    rtl::OUString sSystemPathSettings;
-    if (osl_getSystemPathFromFileURL(sURL.pData,
-        & sSystemPathSettings.pData) != osl_File_E_None)
-        return rtl::OString();
-
-    rtl::OString osSystemPathSettings =
-        rtl::OUStringToOString(sSystemPathSettings,osl_getThreadTextEncoding());
-    return osSystemPathSettings;
-}
-rtl::OString getSharedSettingsPathNoPlatformSuffix()
-{
-    rtl::OUString sURL = getSharedSettingsURLNoPlatformSuffix();
-    rtl::OUString sSystemPathSettings;
-    if (osl_getSystemPathFromFileURL(sURL.pData,
-        & sSystemPathSettings.pData) != osl_File_E_None)
-        return rtl::OString();
-
-    rtl::OString osSystemPathSettings =
-        rtl::OUStringToOString(sSystemPathSettings,osl_getThreadTextEncoding());
-    return osSystemPathSettings;
-}
-
-rtl::OUString getBaseInstallation()
-{
-    rtl::OUString sBaseDir;
-    rtl::Bootstrap::get(
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseInstallation")),
-        sBaseDir,
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "${$SYSBINDIR/"SAL_CONFIGFILE("bootstrap") ":BaseInstallation}")));
-    return sBaseDir;
-
-}
-rtl::OUString getVendorSettingsURL()
-{
-    //get the system path to the javavendors.xml file
-    //First try in an office installation
-    JFW_MODE mode = getMode();
-    if (mode == JFW_MODE_OFFICE)
-    {
-        rtl::OUString sBaseDir = getBaseInstallation();
-        if (sBaseDir.getLength() != 0)
-        {
-            //We are run within office installation
-            rtl::OUStringBuffer sSettings(256);
-            sSettings.append(sBaseDir);
-            sSettings.appendAscii("/share/config/");
-            sSettings.appendAscii(VENDORSETTINGS);
-            return sSettings.makeStringAndClear();
-        }
-    }
-    else if(mode == JFW_MODE_ENV_SIMPLE)
-    {
-
-        //try next to the executable
-        rtl_uString* sExe = NULL;
-        if (osl_getExecutableFile( & sExe) == osl_Process_E_None)
-        {
-            rtl::OUString ouExe(sExe, SAL_NO_ACQUIRE);
-            rtl::OUString sVendor = getDirFromFile(ouExe);
-            rtl::OUStringBuffer sBufVendor(256);
-            sBufVendor.append(sVendor);
-            sBufVendor.appendAscii("/");
-            sBufVendor.appendAscii(VENDORSETTINGS);
-            sVendor = sBufVendor.makeStringAndClear();
-
-            //check if the file exists
-            osl::DirectoryItem vendorItem;
-            osl::File::RC fileError = osl::DirectoryItem::get(sVendor, vendorItem);
-            if (fileError == osl::FileBase::E_None)
-                return sVendor;
-            //Hack. try the so sub dir of the executable dir. Necessery for build process
-            //where javavendors.xml is delivered to ../bin/so for StarOffice
-            sVendor = getDirFromFile(ouExe);
-            sBufVendor.append(sVendor);
-            sBufVendor.appendAscii("/so/");
-            sBufVendor.appendAscii(VENDORSETTINGS);
-            sVendor = sBufVendor.makeStringAndClear();
-            //check if the file exists
-            fileError = osl::DirectoryItem::get(sVendor, vendorItem);
-            if (fileError == osl::FileBase::E_None)
-                return sVendor;
-        }
-        else
-            OSL_ASSERT(0);
-
-        //try next to the jvmfwk.dll
-        rtl::OUString sLib = searchFileNextToThisLib(
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(VENDORSETTINGS)));
-        if (sLib.getLength() > 0)
-            return sLib;
-
-        //try the paths from the PATH environment variable
-        rtl::OUString sVendorsFile(
-            RTL_CONSTASCII_USTRINGPARAM(VENDORSETTINGS));
-        rtl::OUString sVendorsUrl;
-
-        rtl::OUString sPathName(RTL_CONSTASCII_USTRINGPARAM("PATH"));
-        rtl::OUString sPathValue;
-        if (osl_getEnvironment(sPathName.pData, & sPathValue.pData)
-            == osl_Process_E_None)
-        {
-            if (osl_searchFileURL(sVendorsFile.pData, sPathValue.pData ,
-                                  & sVendorsUrl.pData)
-                == osl_File_E_None)
-                return sVendorsUrl;
-        }
-    }
-
-    return rtl::OUString();
-}
-
-rtl::OString getVendorSettingsPath()
-{
-    rtl::OUString sURL = getVendorSettingsURL();
-    rtl::OUString sSystemPathSettings;
-    if (osl_getSystemPathFromFileURL(sURL.pData,
-        & sSystemPathSettings.pData) != osl_File_E_None)
-        return rtl::OString();
-
-    rtl::OString osSystemPathSettings =
-        rtl::OUStringToOString(sSystemPathSettings,osl_getThreadTextEncoding());
-    return osSystemPathSettings;
-}
 
 bool isAccessibilitySupportDesired()
 {
@@ -600,86 +163,6 @@ bool isAccessibilitySupportDesired()
 }
 
 
-javaFrameworkError getVersionInformation(
-    const xmlDocPtr doc,
-    const xmlXPathContextPtr context,
-    const rtl::OUString & sVendor,
-    VersionInfo *pVersionInfo)
-{
-    OSL_ASSERT(doc && context && sVendor.getLength() && pVersionInfo);
-
-    rtl::OString osVendor = rtl::OUStringToOString(sVendor, RTL_TEXTENCODING_UTF8);
-    //Get minVersion
-    rtl::OString sExpresion= rtl::OString(
-        "/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
-        osVendor + rtl::OString("\"]/jf:minVersion");
-
-    jfw::CXPathObjectPtr xPathObjectMin;
-    xPathObjectMin =
-        xmlXPathEvalExpression((xmlChar*) sExpresion.getStr(), context);
-    if (xmlXPathNodeSetIsEmpty(xPathObjectMin->nodesetval))
-    {
-        pVersionInfo->sMinVersion = rtl::OUString();
-    }
-    else
-    {
-        jfw::CXmlCharPtr sVersion;
-        sVersion = xmlNodeListGetString(
-            doc, xPathObjectMin->nodesetval->nodeTab[0]->xmlChildrenNode, 1);
-        rtl::OString osVersion((sal_Char*)(xmlChar*) sVersion);
-        pVersionInfo->sMinVersion = rtl::OStringToOUString(
-            osVersion, RTL_TEXTENCODING_UTF8);
-    }
-
-    //Get maxVersion
-    sExpresion = rtl::OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
-        osVendor + rtl::OString("\"]/jf:maxVersion");
-    jfw::CXPathObjectPtr xPathObjectMax;
-    xPathObjectMax = xmlXPathEvalExpression(
-        (xmlChar*) sExpresion.getStr(), context);
-    if (xmlXPathNodeSetIsEmpty(xPathObjectMax->nodesetval))
-    {
-        pVersionInfo->sMaxVersion = rtl::OUString();
-    }
-    else
-    {
-        jfw::CXmlCharPtr sVersion;
-        sVersion = xmlNodeListGetString(
-            doc,xPathObjectMax->nodesetval->nodeTab[0]->xmlChildrenNode, 1);
-        rtl::OString osVersion((sal_Char*) (xmlChar*) sVersion);
-        pVersionInfo->sMaxVersion = rtl::OStringToOUString(
-            osVersion, RTL_TEXTENCODING_UTF8);
-    }
-
-    //Get excludeVersions
-    sExpresion = rtl::OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
-        osVendor + rtl::OString("\"]/jf:excludeVersions/jf:version");
-    jfw::CXPathObjectPtr xPathObjectVersions;
-    xPathObjectVersions =
-        xmlXPathEvalExpression((xmlChar*) sExpresion.getStr(), context);
-    if (!xmlXPathNodeSetIsEmpty(xPathObjectVersions->nodesetval))
-    {
-        xmlNode* cur = xPathObjectVersions->nodesetval->nodeTab[0];
-        while (cur != NULL)
-        {
-            if (cur->type == XML_ELEMENT_NODE )
-            {
-                if (xmlStrcmp(cur->name, (xmlChar*) "version") == 0)
-                {
-                    jfw::CXmlCharPtr sVersion;
-                    sVersion = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
-                    rtl::OString osVersion((sal_Char*)(xmlChar*) sVersion);
-                    rtl::OUString usVersion = rtl::OStringToOUString(
-                        osVersion, RTL_TEXTENCODING_UTF8);
-                    pVersionInfo->addExcludeVersion(usVersion);
-                }
-            }
-            cur = cur->next;
-        }
-    }
-    return JFW_E_NONE;
-}
-
 rtl::ByteSequence encodeBase16(const rtl::ByteSequence& rawData)
 {
     static char EncodingTable[] =
@@ -691,7 +174,7 @@ rtl::ByteSequence encodeBase16(const rtl::ByteSequence& rawData)
     char* pCurBuf = pBuf;
     for (int i = 0; i < lenRaw; i++)
     {
-        char curChar = arRaw[i];
+        unsigned char curChar = arRaw[i];
         curChar >>= 4;
 
         *pCurBuf = EncodingTable[curChar];
@@ -755,133 +238,90 @@ rtl::ByteSequence decodeBase16(const rtl::ByteSequence& data)
     return ret;
 }
 
-
-
-javaFrameworkError buildClassPathFromDirectory(const rtl::OUString & relPath,
-                             rtl::OUString & sClassPath)
+rtl::OUString getDirFromFile(const rtl::OUString& usFilePath)
 {
-    rtl::OUStringBuffer sBufRel(512);
-    sBufRel.append(getBaseInstallation());
-    sBufRel.appendAscii("/");
-    sBufRel.append(relPath);
-    rtl::OUString sClassesDir = sBufRel.makeStringAndClear();
+    sal_Int32 index= usFilePath.lastIndexOf('/');
+    return rtl::OUString(usFilePath.getStr(), index);
+}
 
-    osl::Directory dir(sClassesDir);
-    osl::FileBase::RC fileErrorCode;
-    if ((fileErrorCode = dir.open()) != osl::FileBase::E_None)
-    {
-        return JFW_E_ERROR;
-    }
+rtl::OUString getFileFromURL(const rtl::OUString& sFileURL)
+{
+    sal_Int32 index= sFileURL.lastIndexOf('/');
+    if (index == -1)
+        return sFileURL;
+    return sFileURL.copy(index + 1);
+}
 
-    osl::DirectoryItem dirItem;
-    rtl::OUStringBuffer sBuffer(2048);
-    char szSep[] = {SAL_PATHSEPARATOR,0};
+rtl::OUString getExecutableDirectory()
+{
+    rtl_uString* sExe = NULL;
+    if (osl_getExecutableFile( & sExe) != osl_Process_E_None)
+        throw FrameworkException(
+            JFW_E_ERROR,
+            "[Java framework] Error in function getApplicationBase (fwkutil.cxx)");
 
-    //insert the path to the directory, so that .class files can be found
-    rtl::OUString sDirPath;
-    if ((fileErrorCode = osl::FileBase::getSystemPathFromFileURL(
-             sClassesDir, sDirPath))
-        != osl::FileBase::E_None)
-    {
-        return JFW_E_ERROR;
-    }
-    sBuffer.append(sDirPath);
+    rtl::OUString ouExe(sExe, SAL_NO_ACQUIRE);
+    return getDirFromFile(ouExe);
+}
 
-    rtl::OUString sJarExtension(RTL_CONSTASCII_USTRINGPARAM(".jar"));
-    sal_Int32 nJarExtensionLength = sJarExtension.getLength();
-    for(;;)
+rtl::OUString findPlugin(const rtl::OUString & plugin)
+{
+    rtl::OUString retVal;
+    rtl::OUString sProgDir = getExecutableDirectory();
+    rtl::OUString sUrl = sProgDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"))
+        + plugin;
+    jfw::FileStatus s = checkFileURL(sUrl);
+    if (s == jfw::FILE_INVALID || s == jfw::FILE_DOES_NOT_EXIST)
     {
-        fileErrorCode = dir.getNextItem(dirItem);
-        if (fileErrorCode == osl::FileBase::E_None)
-        {
-            osl::FileStatus stat(FileStatusMask_All);
-            if ((fileErrorCode = dirItem.getFileStatus(stat)) !=
-                osl::FileBase::E_None)
-            {
-                return JFW_E_ERROR;
-            }
-            // check if the item is a file.
-            switch (stat.getFileType())
-            {
-            case osl::FileStatus::Regular:
-                break;
-            case osl::FileStatus::Link:
-            {
-                rtl::OUString sLinkURL = stat.getLinkTargetURL();
-                osl::DirectoryItem itemLink;
-                if (osl::DirectoryItem::get(sLinkURL, itemLink)
-                    != osl::FileBase::E_None)
-                {
-                   return JFW_E_ERROR;
-                }
-                osl::FileStatus statLink(FileStatusMask_All);
-                if (statLink.getFileType() != osl::FileStatus::Regular)
-                    continue;
-                break;
-            }
-            default:
-                continue;
-            }
-
-            //check if the file is a .jar, class files are ignored
-            rtl::OUString sFileName = stat.getFileName();
-            sal_Int32 len = sFileName.getLength();
-            sal_Int32 nIndex = sFileName.lastIndexOf(sJarExtension);
-            if ((nIndex == -1)
-                || (nIndex + nJarExtensionLength != len))
-                continue;
-
-            rtl::OUString sFileURL = stat.getFileURL();
-            rtl::OUString sFilePath;
-            if ((fileErrorCode = osl::FileBase::getSystemPathFromFileURL(
-                     sFileURL, sFilePath))
-                != osl::FileBase::E_None)
-            {
-                return JFW_E_ERROR;
-            }
-            sBuffer.appendAscii(szSep);
-            sBuffer.append(sFilePath);
-        }
-        else if (fileErrorCode == osl::FileBase::E_NOENT)
+        //If only the name of the library is given, then
+        //use PATH, LD_LIBRARY_PATH etc. to locate the plugin
+        if (plugin.indexOf('/') == -1)
         {
-            break;
-        }
-        else
-        {
-            return JFW_E_ERROR;
+            rtl::OUString url;
+#ifdef UNX
+            rtl::OUString path = rtl::OUString::createFromAscii("LD_LIBRARY_PATH");
+            rtl::OUString env_path;
+            oslProcessError err = osl_getEnvironment(path.pData, &env_path.pData);
+            if (err != osl_Process_E_None && err != osl_Process_E_NotFound)
+                throw FrameworkException(
+                    JFW_E_ERROR,
+                    "[Java framework] Error in function findPlugin (fwkutil.cxx).");
+            if (err == osl_Process_E_NotFound)
+                return retVal;
+            if (osl_searchFileURL(plugin.pData, env_path.pData, &url.pData)
+                                == osl_File_E_None)
+#else
+            if (osl_searchFileURL(plugin.pData, NULL, &url.pData)
+                == osl_File_E_None)
+#endif
+                retVal = url;
+            else
+                throw FrameworkException(
+                    JFW_E_ERROR,
+                    "[Java framework] Error in function findPlugin (fwkutil.cxx).");
         }
     }
-    sClassPath = sBuffer.makeStringAndClear();
-    return JFW_E_NONE;
-}
-
-void setJavaSelected()
-{
-    g_bJavaSet = true;
+    else
+    {
+        retVal = sUrl;
+    }
+    return retVal;
 }
 
-bool wasJavaSelectedInSameProcess()
+rtl::OUString getLibraryLocation()
 {
-    //g_setJavaProcId not set means no Java selected
-    if (g_bJavaSet == true)
-        return true;
-    return false;
-}
+    rtl::OString sExcMsg("[Java framework] Error in function getLibraryLocation "
+                         "(fwkutil.cxx).");
+    rtl::OUString libraryFileUrl;
 
-rtl::OUString getDirFromFile(const rtl::OUString& usFilePath)
-{
-    sal_Int32 index= usFilePath.lastIndexOf('/');
-    return rtl::OUString(usFilePath.getStr(), index);
-}
+    if (osl::Module::getUrlFromAddress((void *) getLibraryLocation, libraryFileUrl)
+        == sal_False)
+        throw FrameworkException(JFW_E_ERROR, sExcMsg);
 
-rtl::OUString getFileFromURL(const rtl::OUString& sFileURL)
-{
-    sal_Int32 index= sFileURL.lastIndexOf('/');
-    if (index == -1)
-        return sFileURL;
-    return sFileURL.copy(index + 1);
+    return getDirFromFile(libraryFileUrl);
 }
 
+//Todo is this still needed?
 rtl::OUString searchFileNextToThisLib(const rtl::OUString & sFile)
 {
     rtl::OUString ret;
@@ -904,132 +344,79 @@ rtl::OUString searchFileNextToThisLib(const rtl::OUString & sFile)
     return ret;
 }
 
-//todo !!!
-rtl::OUString getJavaSettingsDirectory()
+jfw::FileStatus checkFileURL(const rtl::OUString & path)
 {
-    //test if we are running within an office
-    return rtl::OUString();
-}
-
-JFW_MODE getMode()
-{
-    //Determine if we run in an office process:
-    rtl_uString* sExe = NULL;
-    if (osl_getExecutableFile( & sExe) != osl_Process_E_None)
-        return JFW_MODE_INDETERMINED;
-    rtl::OUString ouExe(sExe, SAL_NO_ACQUIRE);
-
-    //create the name of the executable
-    rtl::OUStringBuffer buff(128);
-    buff.appendAscii("soffice");
-    buff.appendAscii(SAL_PRGEXTENSION);
-    rtl::OUString sOffice = buff.makeStringAndClear();
-
-    sal_Int32 index = 0;
-    //are we in the soffice process?
-    if ((index = ouExe.lastIndexOf(sOffice)) != 1
-        && index + sOffice.getLength() == ouExe.getLength())
-        return JFW_MODE_OFFICE;
-    //we may have been started from javaldx etc.
-    //is there an soffice in the same directory?
-    rtl::OUString sOfficeURL = searchFileNextToThisLib(sOffice);
-
-    //is there <office>/share/config/javavendors.xml?
-    rtl::OUString sBaseDir = getBaseInstallation();
-    rtl::OUString sVendors;
-    if (sBaseDir.getLength() != 0)
+    rtl::OString sExcMsg("[Java framework] Error in function "
+                         "resolveFileURL (fwkutil.cxx).");
+    OUString sResolved = path;
+    jfw::FileStatus ret = jfw::FILE_OK;
+    while (1)
     {
-        //We are run within office installation
-        rtl::OUStringBuffer sSettings(256);
-        sSettings.append(sBaseDir);
-        sSettings.appendAscii("/share/config/");
-        sSettings.appendAscii(VENDORSETTINGS);
-        rtl::OUString sVend = sSettings.makeStringAndClear();
-
-        //check if the file exists
-        osl::DirectoryItem item;
-        osl::File::RC fileError = osl::DirectoryItem::get(sVend, item);
-        if (fileError == osl::FileBase::E_None)
-            sVendors = sVend;
-    }
-    if (sOfficeURL.getLength() > 0 && sVendors.getLength() > 0)
-        return JFW_MODE_OFFICE;
-
-
-    //FWK_MODE_ENV_SIMPLE ?
-    rtl::OUString sOO_USE_JRE(RTL_CONSTASCII_USTRINGPARAM(ENVIRONMENT_VAR_JRE_PATH));
-
-    rtl_uString * psOO_USE_JRE = 0;
-    if (osl_getEnvironment(sOO_USE_JRE.pData, & psOO_USE_JRE) != osl_Process_E_None)
-        return JFW_MODE_INDETERMINED;
-
-    rtl::OUString sOO_USE_JRE_VALUE(psOO_USE_JRE, SAL_NO_ACQUIRE);
-    if (sOO_USE_JRE_VALUE.getLength() > 0)
-        return JFW_MODE_ENV_SIMPLE;
-
-    return JFW_MODE_INDETERMINED;
-
-
-}
+        DirectoryItem item;
+        File::RC fileErr =
+            DirectoryItem::get(sResolved, item);
+        if (fileErr == File::E_None)
+        {
+            osl::FileStatus status(FileStatusMask_Type |
+                              FileStatusMask_LinkTargetURL |
+                              FileStatusMask_FileURL);
 
-javaFrameworkError makeClassPathOption(
-    JFW_MODE mode, CNodeJava & javaSettings, rtl::OString & sOption)
-{
-    //Compose the class path
-    rtl::OUStringBuffer sBufCP(4096);
-    char szSep[] = {SAL_PATHSEPARATOR,0};
-    if (mode == JFW_MODE_OFFICE)
-    {
-        //build the class path from the classes directory
-        rtl::OUString sClassPath;
-        javaFrameworkError errcode = jfw::buildClassPathFromDirectory(
-            javaSettings.m_sClassesDirectory, sClassPath);
-        if (errcode != JFW_E_NONE)
-            return JFW_E_ERROR;
-        sBufCP.append(sClassPath);
-        // append all user selected jars to the classpath
-        if (javaSettings.getUserClassPath().getLength() != 0)
+            if (item.getFileStatus(status) == File::E_None)
+            {
+                osl::FileStatus::Type t = status.getFileType();
+                if (t == osl::FileStatus::Regular)
+                {
+                    ret = jfw::FILE_OK;
+                    break;
+                }
+                else if ( t == osl::FileStatus::Link )
+                {
+                    sResolved = status.getLinkTargetURL();
+                }
+                else
+                {
+                    ret = FILE_INVALID;
+                    break;
+                }
+            }
+            else
+            {
+                throw FrameworkException(JFW_E_ERROR, sExcMsg);
+            }
+        }
+        else if(fileErr == File::E_NOENT)
+        {
+            ret = FILE_DOES_NOT_EXIST;
+            break;
+        }
+        else
         {
-            sBufCP.appendAscii(szSep);
-            sBufCP.append(javaSettings.getUserClassPath());
+            ret = FILE_INVALID;
+            break;
         }
     }
-    else if (mode == JFW_MODE_ENV_SIMPLE)
+    return ret;
+}
+const rtl::Bootstrap& getBootstrap()
+{
+    static rtl::Bootstrap *pBootstrap = 0;
+    rtl::OUString sIni;
+    if( !pBootstrap )
     {
-        //We use the CLASSPATH environment variable
-        rtl::OUString sCP(
-            RTL_CONSTASCII_USTRINGPARAM("CLASSPATH"));
-
-        rtl_uString * psCPVal = 0;
-        if (osl_getEnvironment(sCP.pData, & psCPVal) != osl_Process_E_None)
-            return JFW_E_ERROR;
-
-        rtl::OUString sCPVal(psCPVal, SAL_NO_ACQUIRE);
-        sBufCP.append(sCPVal);
+        rtl::OUStringBuffer buf( 255);
+        buf.append( getLibraryLocation());
+        buf.appendAscii( SAL_CONFIGFILE("/jvmfwk3") );
+        sIni = buf.makeStringAndClear();
+        static rtl::Bootstrap  bootstrap(sIni);
+        pBootstrap = &bootstrap;
+#if OSL_DEBUG_LEVEL >=2
+        rtl::OString o = rtl::OUStringToOString( sIni , osl_getThreadTextEncoding() );
+        fprintf(stderr, "[Java framework] Using configuration file %s\n" , o.getStr() );
+#endif
     }
-    else
-        OSL_ASSERT(0);
-
-    //add the path of the UNO components
-    sBufCP.appendAscii(szSep);
-    rtl::OUString sComponents =
-        jfw::retrieveClassPath(
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                              "${$PKG_SharedUnoFile:UNO_JAVA_CLASSPATH}")));
-    sBufCP.appendAscii(szSep);
-    sBufCP.append(sComponents);
-    sComponents = jfw::retrieveClassPath(
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "${$PKG_UserUnoFile:UNO_JAVA_CLASSPATH}")));
 
-    sBufCP.append(sComponents);
-    rtl::OString sOptionClassPath("-Djava.class.path=");
-    sOptionClassPath += rtl::OUStringToOString(
-        sBufCP.makeStringAndClear(), osl_getThreadTextEncoding());
+    return *pBootstrap;
 
-    sOption = sOptionClassPath;
-    return JFW_E_NONE;
 }
 
-
 }