[Esbox-commits] r1105 - in branches/work_Ed: org.maemo.esbox.maemosdk.core/conf org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core org.maemo.esbox.vm/conf org.maemo.esbox.vm/src/org/maemo/esbox/vm/core org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware
eswartz at garage.maemo.org
eswartz at garage.maemo.org
Wed Dec 31 18:21:04 EET 2008
Author: eswartz
Date: 2008-12-31 18:21:02 +0200 (Wed, 31 Dec 2008)
New Revision: 1105
Modified:
branches/work_Ed/org.maemo.esbox.maemosdk.core/conf/maemo_prefs.xml
branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv/X11ExecutionEnvironmentHandler.java
branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java
branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java
branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwarePreferenceConstants.java
branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwarePreferenceConstantsPrivate.java
branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwarePreferenceMigrator.java
branches/work_Ed/org.maemo.esbox.vm/conf/vm_prefs.xml
branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/vm/core/VirtualMachinePreferenceMigrator.java
Log:
More OS X fixes, fix bug 3192, caching fixes, default project location fixes, launch in terminal fix
-- allow gdb mi2 to be used on OS X
-- bug 3192: retrieve default password properly
-- Make OS X variants of terminal and log path prefs
-- use OS default selector in more places
-- Properly fail a launch if X cannot be launched
-- Cache whether we tried to find sb1 or sb2 but failed so we don't check every time
-- search shared folders for viable project path
-- put C/C++ wizard on default New menu
-- don't launch a terminal w/scratchbox unless on the host
Modified: branches/work_Ed/org.maemo.esbox.maemosdk.core/conf/maemo_prefs.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.core/conf/maemo_prefs.xml 2008-12-30 21:44:37 UTC (rev 1104)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.core/conf/maemo_prefs.xml 2008-12-31 16:21:02 UTC (rev 1105)
@@ -13,9 +13,10 @@
<!-- others commands -->
<entry key="X_DISPLAY">:2</entry>
+
<entry key="X_PATH_WIN32">c:/cygwin/bin</entry>
- <entry key="X_PATH_OSX"></entry>
- <entry key="X_PATH_UNIX"></entry>
+ <entry key="X_PATH_OSX">/usr/X11/bin</entry>
+ <entry key="X_PATH_UNIX">/usr/X11R6/bin</entry>
<!-- this is initialized dynamically <entry key="X_PATH"></entry> -->
<entry key="MAEMO_COMMAND">af-sb-init.sh ${ACTIONS}</entry>
Modified: branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv/X11ExecutionEnvironmentHandler.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv/X11ExecutionEnvironmentHandler.java 2008-12-30 21:44:37 UTC (rev 1104)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/execEnv/X11ExecutionEnvironmentHandler.java 2008-12-31 16:21:02 UTC (rev 1105)
@@ -40,14 +40,21 @@
"Not an ESbox project: " + project, e1));
}
- try {
- if (!MaemoScriptLauncher.getInstance().isXServerStarted(sdkTarget)) {
+ boolean serverRunning;
+ try {
+ serverRunning = MaemoScriptLauncher.getInstance().isXServerStarted(sdkTarget);
+
+ try {
+ if (!serverRunning) {
- if (MessageDialog
- .openQuestion(shell, "Launch X Server?",
- "The X server is not running. Would you like to launch it now?")) {
- MaemoScriptLauncher.getInstance().startX();
+ if (MessageDialog
+ .openQuestion(shell, "Launch X Server?",
+ "The X server is not running. Would you like to launch it now?")) {
+ MaemoScriptLauncher.getInstance().startX();
+ }
}
+ } catch (MicaException e) {
+ throw new CoreException(Activator.createErrorStatus("Failed to launch X", e));
}
} catch (MicaException e) {
Activator.getErrorLogger().logAndShowError(
Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java 2008-12-30 21:44:37 UTC (rev 1104)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java 2008-12-31 16:21:02 UTC (rev 1105)
@@ -173,6 +173,9 @@
CacheUtils.getInstance().ensureCurrentMachine(SB1_MACHINE, machine);
String version = (String) CacheUtils.getInstance().getCachedValue(
SB1_VERSION);
+ // empty string cached if we didn't detect it
+ if ("".equals(version))
+ return null;
if (version != null)
return version;
@@ -184,12 +187,22 @@
GetVersionScratchboxCommand getVersionCommand = new GetVersionScratchboxCommand(
commandAbstractor);
- String currentVersion = getVersionCommand
+ String currentVersion;
+ MicaException exception = null;
+ try {
+ currentVersion = getVersionCommand
.performCommand(new ArrayList<String>());
-
+ } catch (MicaException e) {
+ currentVersion = "";
+ exception = e;
+ }
+
// remember cached value
CacheUtils.getInstance().setCachedValue(SB1_VERSION, currentVersion);
+ if (exception != null)
+ throw exception;
+
return currentVersion;
}
Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java 2008-12-30 21:44:37 UTC (rev 1104)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java 2008-12-31 16:21:02 UTC (rev 1105)
@@ -351,6 +351,7 @@
* @return map of resolved host paths to target paths
* @throws MicaException
*/
+ @SuppressWarnings("unchecked")
public static synchronized Map<IPath, IPath> getSb2PathMapping(
IScratchboxSDKTarget sdkTarget, List<IPath> hostPaths)
throws MicaException {
@@ -433,6 +434,9 @@
CacheUtils.getInstance().ensureCurrentMachine(SB2_MACHINE, machine);
String version = (String) CacheUtils.getInstance().getCachedValue(
SB2_VERSION);
+ // empty string cached if we didn't detect it
+ if ("".equals(version))
+ return null;
if (version != null)
return version;
@@ -444,11 +448,22 @@
GetVersionScratchboxCommand getVersionCommand = new GetVersionScratchboxCommand(
commandAbstractor);
- String currentVersion = getVersionCommand
+ String currentVersion;
+ MicaException exception = null;
+ try {
+ currentVersion = getVersionCommand
.performCommand(new ArrayList<String>());
+ } catch (MicaException e) {
+ currentVersion = "";
+ exception = e;
+ }
+
// remember cached value
CacheUtils.getInstance().setCachedValue(SB2_VERSION, currentVersion);
-
+
+ if (exception != null)
+ throw exception;
+
return currentVersion;
}
Modified: branches/work_Ed/org.maemo.esbox.vm/conf/vm_prefs.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm/conf/vm_prefs.xml 2008-12-30 21:44:37 UTC (rev 1104)
+++ branches/work_Ed/org.maemo.esbox.vm/conf/vm_prefs.xml 2008-12-31 16:21:02 UTC (rev 1105)
@@ -6,7 +6,7 @@
see the org.maemo.mica.common.core.preference_set_provider extension</comment>
<entry key="VM_USER_NAME">maemo</entry>
- <entry key="VM_USER_PASSWORD"></entry>
+ <entry key="VM_USER_PASSWORD">maemo</entry>
<entry key="VM_SSH_TARGET_ADDR">127.0.0.1</entry>
<entry key="VM_SSH_TARGET_PORT">2222</entry>
<entry key="VM_SSH_HOST_ADDR">10.0.2.2</entry>
Modified: branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/vm/core/VirtualMachinePreferenceMigrator.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/vm/core/VirtualMachinePreferenceMigrator.java 2008-12-30 21:44:37 UTC (rev 1104)
+++ branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/vm/core/VirtualMachinePreferenceMigrator.java 2008-12-31 16:21:02 UTC (rev 1105)
@@ -16,6 +16,7 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.maemo.mica.common.core.CorePreferenceManager;
import org.maemo.mica.common.core.IPreferenceMigrator;
+import org.maemo.mica.common.core.PasswordStorage;
/**
* @author eswartz
@@ -30,6 +31,15 @@
// adjust any environment-dependent defaults
CorePreferenceManager.selectDefaultForOS(newPropertyDefaults,
VirtualMachinePreferenceConstants.VM_SHARED_FOLDERS);
+
+ // encode the default password
+ String plaintext = newPropertyDefaults.getProperty(
+ VirtualMachinePreferenceConstants.VM_USER_PASSWORD);
+ String encoded = PasswordStorage.getInstance().encodePassword(
+ VirtualMachinePreferenceConstants.VM_USER_PASSWORD, plaintext);
+ newPropertyDefaults.setProperty(
+ VirtualMachinePreferenceConstants.VM_USER_PASSWORD, encoded);
+
}
/* (non-Javadoc)
Modified: branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwarePreferenceConstants.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwarePreferenceConstants.java 2008-12-30 21:44:37 UTC (rev 1104)
+++ branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwarePreferenceConstants.java 2008-12-31 16:21:02 UTC (rev 1105)
@@ -35,5 +35,5 @@
public static final String VMWARE_LAUNCH_PATTERN = "VMWARE_LAUNCH_PATTERN";
public static final String VMWARE_VMX_PATH = "VMWARE_VMX_PATH";
- static final Class privateKeysClass = VMwarePreferenceConstantsPrivate.class;
+ static final Class<?> privateKeysClass = VMwarePreferenceConstantsPrivate.class;
}
Modified: branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwarePreferenceConstantsPrivate.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwarePreferenceConstantsPrivate.java 2008-12-30 21:44:37 UTC (rev 1104)
+++ branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwarePreferenceConstantsPrivate.java 2008-12-31 16:21:02 UTC (rev 1105)
@@ -26,4 +26,5 @@
static final String VMWARE_EXE_NAME_UNIX = "VMWARE_EXE_NAME_UNIX";
static final String VMWARE_VMX_PATH_UNIX = "VMWARE_VMX_PATH_UNIX";
+ static final String VMWARE_VM_IMAGE = "VMWARE_VM_IMAGE";
}
Modified: branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwarePreferenceMigrator.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwarePreferenceMigrator.java 2008-12-30 21:44:37 UTC (rev 1104)
+++ branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwarePreferenceMigrator.java 2008-12-31 16:21:02 UTC (rev 1105)
@@ -12,7 +12,6 @@
package org.maemo.esbox.internal.vm.vmware;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.maemo.esbox.vm.core.VirtualMachinePreferenceConstantsPrivate;
import org.maemo.mica.common.core.CorePreferenceManager;
import org.maemo.mica.common.core.IPreferenceMigrator;
More information about the Esbox-commits
mailing list