[Jsmooth-cvs] jsmooth/skeletons/commonjava FileUtils.cpp,1.5,1.6 JavaMachineManager.cpp,1.7,1.8 JVME
Status: Beta
Brought to you by:
reyes
Menu
▾
▴
[Jsmooth-cvs] jsmooth/skeletons/commonjava FileUtils.cpp,1.5,1.6 JavaMachineManager.cpp,1.7,1.8 JVMEnvVarLookup.cpp,1.1,1.2 JVMRegistryLookup.cpp,1.2,1.3 Properties.cpp,1.3,1.4 ResourceManager.cpp,1.9,1.10 SunJVMLauncher.cpp,1.9,1.10
Update of /cvsroot/jsmooth/jsmooth/skeletons/commonjava In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11985/skeletons/commonjava Modified Files: FileUtils.cpp JavaMachineManager.cpp JVMEnvVarLookup.cpp JVMRegistryLookup.cpp Properties.cpp ResourceManager.cpp SunJVMLauncher.cpp Log Message: improved debug messages Index: FileUtils.cpp =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/commonjava/FileUtils.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FileUtils.cpp 16 Nov 2003 09:05:49 -0000 1.5 --- FileUtils.cpp 4 Mar 2004 18:38:56 -0000 1.6 *************** *** 35,40 **** } while (GetFileAttributes(temp.c_str()) != 0xFFFFFFFF); - DEBUG("TEMPFILE: " + temp); - return temp; } --- 35,38 ---- *************** *** 53,66 **** string file = path + ((path[path.length()-1]=='\\')?"":"\\") + pattern; - DEBUG("scanning " + file); - HANDLE handle = FindFirstFile(file.c_str(), &data); if (handle != INVALID_HANDLE_VALUE) { - DEBUG(string("Found first file ") + data.cFileName); result.push_back(path + ((path[path.length()-1]=='\\')?"":"\\") + data.cFileName); for ( ; FindNextFile(handle, &data) == TRUE ; ) { - DEBUG(string("ADDED ") + data.cFileName); result.push_back(path + ((path[path.length()-1]=='\\')?"":"\\") + data.cFileName); } --- 51,60 ---- *************** *** 77,81 **** if ((foundpath != ".") && (foundpath != "..") && ((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0)) { - DEBUG(string("REC DIR FOUND ") + data.cFileName + " (attr: " + StringUtils::toString(data.dwFileAttributes) + ") / " + StringUtils::toString(FILE_ATTRIBUTE_DIRECTORY)); string npath = path + ((path[path.length()-1]=='\\')?"":"\\") + data.cFileName; vector<string> tres = FileUtils::recursiveSearch(npath, pattern); --- 71,74 ---- Index: JavaMachineManager.cpp =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/commonjava/JavaMachineManager.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JavaMachineManager.cpp 16 Nov 2003 09:05:49 -0000 1.7 --- JavaMachineManager.cpp 4 Mar 2004 18:38:56 -0000 1.8 *************** *** 23,42 **** JavaMachineManager::JavaMachineManager(ResourceManager& resman): m_resman(resman) { m_registryVms = JVMRegistryLookup::lookupJVM(); m_javahomeVm = JVMEnvVarLookup::lookupJVM("JAVA_HOME"); m_jrepathVm = JVMEnvVarLookup::lookupJVM("JRE_PATH"); m_jdkpathVm = JVMEnvVarLookup::lookupJVM("JDK_PATH"); if (resman.getProperty("bundledvm").length() > 0) { string bjvm = resman.getProperty("bundledvm"); ! DEBUG("Found bundled vm <" + bjvm + ">"); m_localVMenabled = true; m_localVM.JavaHome = FileUtils::concFile(resman.getCurrentDirectory(), bjvm); - DEBUG("Curdir is " + resman.getCurrentDirectory()); - DEBUG("Stored as " + m_localVM.JavaHome); } else { m_localVMenabled = false; } } --- 23,44 ---- JavaMachineManager::JavaMachineManager(ResourceManager& resman): m_resman(resman) { + DEBUG("Now searching the JVM installed on the system..."); + m_registryVms = JVMRegistryLookup::lookupJVM(); m_javahomeVm = JVMEnvVarLookup::lookupJVM("JAVA_HOME"); m_jrepathVm = JVMEnvVarLookup::lookupJVM("JRE_PATH"); m_jdkpathVm = JVMEnvVarLookup::lookupJVM("JDK_PATH"); + if (resman.getProperty("bundledvm").length() > 0) { string bjvm = resman.getProperty("bundledvm"); ! DEBUG("Found a vm bundled with the application: (" + bjvm + ")"); m_localVMenabled = true; m_localVM.JavaHome = FileUtils::concFile(resman.getCurrentDirectory(), bjvm); } else { m_localVMenabled = false; } + DEBUG("Current directory is " + resman.getCurrentDirectory()); } *************** *** 47,51 **** if (m_localVMenabled) { ! DEBUG("Trying bundled VM " + m_localVM.JavaHome); if (m_localVM.runProc(m_resman, dontUseConsole, "bundled")) return true; --- 49,53 ---- if (m_localVMenabled) { ! DEBUG("Trying to use bundled VM " + m_localVM.JavaHome); if (m_localVM.runProc(m_resman, dontUseConsole, "bundled")) return true; *************** *** 60,64 **** } ! DEBUG("VMORDER == " + vmorder); vector<string> jvmorder = StringUtils::split(vmorder, ";,", ""); --- 62,66 ---- } ! DEBUG("JSmooth will now try to use the VM in the following order: " + vmorder); vector<string> jvmorder = StringUtils::split(vmorder, ";,", ""); *************** *** 66,75 **** for (vector<string>::const_iterator i = jvmorder.begin(); i != jvmorder.end(); i++) { if (*i == "registry") { ! DEBUG("Lookup " + *i + " :: " + StringUtils::toString(m_registryVms.size())); for (int i=0; i<m_registryVms.size(); i++) { ! DEBUG("trying registry: " + m_registryVms[i].toString()); if (dontUseConsole) --- 68,80 ---- for (vector<string>::const_iterator i = jvmorder.begin(); i != jvmorder.end(); i++) { + DEBUG("------------------------------"); + if (*i == "registry") { ! DEBUG("Trying to use a JVM defined in the registry (" + StringUtils::toString(m_registryVms.size()) + " available)"); ! for (int i=0; i<m_registryVms.size(); i++) { ! DEBUG("- Trying registry: " + m_registryVms[i].toString()); if (dontUseConsole) *************** *** 83,97 **** if (preferSingleProcess) { if (m_registryVms[i].run(m_resman, "registry")) { return true; ! } else if (m_registryVms[i].runProc(m_resman, dontUseConsole, "registry")) ! { ! return true; ! } } else { - DEBUG("DONT USE CONSOLE == TRUE"); if (m_registryVms[i].runProc(m_resman, dontUseConsole, "registry")) { --- 88,105 ---- if (preferSingleProcess) { + DEBUG("Trying to run the JVM as a DLL call (executing in this process)..."); if (m_registryVms[i].run(m_resman, "registry")) { return true; ! } ! DEBUG("Well, couldn't use a DLL (see traces above), so falling back into normal process creation mode"); ! ! if (m_registryVms[i].runProc(m_resman, dontUseConsole, "registry")) ! { ! return true; ! } } else { if (m_registryVms[i].runProc(m_resman, dontUseConsole, "registry")) { *************** *** 116,123 **** } } } } else if (*i == "jview") { ! DEBUG("trying JVIEW"); if (m_jviewVm.runProc(m_resman, dontUseConsole)) { --- 124,132 ---- } } + DEBUG("Couldn't use this VM, now trying something else"); } } else if (*i == "jview") { ! DEBUG("- Trying to launch the application with JVIEW"); if (m_jviewVm.runProc(m_resman, dontUseConsole)) { *************** *** 127,131 **** } else if (*i == "javahome") { ! DEBUG("trying JAVAHOME"); if (m_javahomeVm.size()>0) { --- 136,140 ---- } else if (*i == "javahome") { ! DEBUG("- Trying to use JAVAHOME"); if (m_javahomeVm.size()>0) { *************** *** 137,153 **** } } - - // for (int i=0; i<m_registryVms.size(); i++) - // { - // DEBUG("trying registry PROC: " + m_registryVms[i].toString()); - // if (m_registryVms[i].runProc(m_resman, dontUseConsole, "javahome")) - // { - // return true; - // } - // } - } else if (*i == "jrepath") { ! DEBUG("trying JREPATH"); if (m_jrepathVm.size()>0) { --- 146,152 ---- } } } else if (*i == "jrepath") { ! DEBUG("- Trying to use JREPATH"); if (m_jrepathVm.size()>0) { *************** *** 159,163 **** } else if (*i == "jdkpath") { ! DEBUG("trying JDKPATH"); if (m_jdkpathVm.size()>0) { --- 158,162 ---- } else if (*i == "jdkpath") { ! DEBUG("- Trying to use JDKPATH"); if (m_jdkpathVm.size()>0) { Index: JVMEnvVarLookup.cpp =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/commonjava/JVMEnvVarLookup.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JVMEnvVarLookup.cpp 2 Sep 2003 05:48:01 -0000 1.1 --- JVMEnvVarLookup.cpp 4 Mar 2004 18:38:56 -0000 1.2 *************** *** 31,40 **** SunJVMLauncher jvm; jvm.JavaHome = buffer; ! DEBUG("ENVVAR " + envvar + " FOUND = " + buffer); result.push_back(jvm); } else { ! DEBUG("ENVVAR " + envvar + " NOT FOUND"); } --- 31,40 ---- SunJVMLauncher jvm; jvm.JavaHome = buffer; ! DEBUG("JVM Lookup: Env-Var " + envvar + " defined (" + buffer + ")!"); result.push_back(jvm); } else { ! DEBUG("JVM Lookup: Env-Var " + envvar + " not defined on this system."); } Index: JVMRegistryLookup.cpp =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/commonjava/JVMRegistryLookup.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JVMRegistryLookup.cpp 4 Mar 2004 08:21:08 -0000 1.2 --- JVMRegistryLookup.cpp 4 Mar 2004 18:38:56 -0000 1.3 *************** *** 93,97 **** char buffer[244]; sprintf(buffer, "V(%d)(%d)(%d)", vm.VmVersion.getMajor(), vm.VmVersion.getMinor(), vm.VmVersion.getSubMinor()); ! DEBUG(std::string("Found new VM: ") + vm.RuntimeLibPath + " : " + vm.JavaHome + " : "+ vm.VmVersion.Value + " :: " + buffer); } } --- 93,97 ---- char buffer[244]; sprintf(buffer, "V(%d)(%d)(%d)", vm.VmVersion.getMajor(), vm.VmVersion.getMinor(), vm.VmVersion.getSubMinor()); ! DEBUG(std::string("JVM Lookup: found VM (") + buffer + ") in registry."); } } Index: Properties.cpp =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/commonjava/Properties.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Properties.cpp 4 Mar 2004 08:19:46 -0000 1.3 --- Properties.cpp 4 Mar 2004 18:38:56 -0000 1.4 *************** *** 35,39 **** { int cursor = 0; ! DEBUG(string("Extracting properties from resource ") + data); while (cursor < datalen) --- 35,39 ---- { int cursor = 0; ! DEBUG("Extracting properties from resource:"); while (cursor < datalen) Index: ResourceManager.cpp =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/commonjava/ResourceManager.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ResourceManager.cpp 23 Nov 2003 18:35:11 -0000 1.9 --- ResourceManager.cpp 4 Mar 2004 18:38:56 -0000 1.10 *************** *** 90,99 **** string namekey = string("javaproperty_name_") + StringUtils::toString(i); string valuekey = string("javaproperty_value_") + StringUtils::toString(i); - string name = m_props.get(namekey); string value = m_props.get(valuekey); - DEBUG("JPROP: " + name + "=" + StringUtils::StringUtils::replaceEnvironmentVariable(value)); - value = StringUtils::replaceEnvironmentVariable(value); value = StringUtils::replace(value, "${EXECUTABLEPATH}", exepath); --- 90,96 ---- *************** *** 103,106 **** --- 100,105 ---- JavaProperty jprop(name, value); m_javaProperties.push_back(jprop); + + DEBUG("Setting up java properties: " + name + "=" + value); } *************** *** 116,143 **** for (std::vector<std::string>::iterator i=m_deleteOnFinalize.begin(); i != m_deleteOnFinalize.end(); i++) { - // MessageBox(NULL, i->c_str(), "ERASING", MB_OK); int res = DeleteFile(i->c_str()); - // MessageBox(NULL, ("DONE " + StringUtils::toString(res) + " / " + StringUtils::toString(GetLastError())).c_str(), "ERASING", MB_OK); - - // LPVOID lpMsgBuf; - // - //FormatMessage( - // FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - // NULL, - // GetLastError(), - // MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language - // (LPTSTR) &lpMsgBuf, - // 0, - // NULL - //); - // - //// Display the string. - //MessageBox( NULL, (const CHAR*)lpMsgBuf, "GetLastError", MB_OK|MB_ICONINFORMATION ); - // - //// Free the buffer. - //LocalFree( lpMsgBuf ); - } } void ResourceManager::setProperty(const std::string& key, const std::string& value) { --- 115,122 ---- for (std::vector<std::string>::iterator i=m_deleteOnFinalize.begin(); i != m_deleteOnFinalize.end(); i++) { int res = DeleteFile(i->c_str()); } } + void ResourceManager::setProperty(const std::string& key, const std::string& value) { *************** *** 185,189 **** std::string tempfilename = FileUtils::createTempFileName(".jar"); ! DEBUG("Created tempfilename " + tempfilename); saveTemp(tempfilename); return tempfilename; --- 164,168 ---- std::string tempfilename = FileUtils::createTempFileName(".jar"); ! DEBUG("Created temporary filename to hold the jar (" + tempfilename + ")"); saveTemp(tempfilename); return tempfilename; *************** *** 201,206 **** basepath = FileUtils::concFile(basepath, curdirmodifier); - DEBUG("basepath for classpath = " + basepath); - std::string cp = getProperty(string(ResourceManager::KEY_CLASSPATH)); vector<string>cps = StringUtils::split(cp, ";", "", false); --- 180,183 ---- *************** *** 209,213 **** string lib = cps[i]; cps[i] = FileUtils::concFile(basepath, cps[i]); ! DEBUG("FOUND " + basepath + " :: " + lib + " -> " + cps[i]); } --- 186,190 ---- string lib = cps[i]; cps[i] = FileUtils::concFile(basepath, cps[i]); ! DEBUG("ClassPath element " + StringUtils::toString(i)+ "=" + cps[i]); } Index: SunJVMLauncher.cpp =================================================================== RCS file: /cvsroot/jsmooth/jsmooth/skeletons/commonjava/SunJVMLauncher.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SunJVMLauncher.cpp 4 Mar 2004 08:23:03 -0000 1.9 --- SunJVMLauncher.cpp 4 Mar 2004 18:38:56 -0000 1.10 *************** *** 78,83 **** bool SunJVMLauncher::run(ResourceManager& resource, const string& origin) { - MessageBox(NULL, "Doing DLL call", "debug", MB_OKCANCEL|MB_ICONQUESTION|MB_APPLMODAL); - if ( ! VmVersion.isValid()) return false; --- 78,81 ---- *************** *** 94,99 **** DEBUG("Launching " + toString()); - MessageBox(NULL, "Launching", "debug", MB_OKCANCEL|MB_ICONQUESTION|MB_APPLMODAL); - if (Version("1.2") <= VmVersion) { --- 92,95 ---- |
