[Esbox-commits] r1289 - in branches/work_Ed: org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-03-13 16:54:11 +0200 (Fri, 13 Mar 2009)
New Revision: 1289

Modified:
   branches/work_Ed/org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu/QemuMachine.java
   branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwareMachine.java
   branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineURIQueryDecoder.java
   branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/ManualVirtualMachineController.java
Log:
Remove "IP" from SSHConfiguration#[set|get][Host|Target]IPAddress()

Modified: branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineURIQueryDecoder.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineURIQueryDecoder.java	2009-03-12 22:04:17 UTC (rev 1288)
+++ branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineURIQueryDecoder.java	2009-03-13 14:54:11 UTC (rev 1289)
@@ -40,7 +40,7 @@
 	 */
 	public boolean decode(String key, String value) {
 		if (key.equals(SSH_HOST_ADDRESS)) {
-			config.sshConfiguration.setHostIPAddress(value);
+			config.sshConfiguration.setHostAddress(value);
 		} else if (key.equals(SSH_HOST_PORT)) {
 			config.sshConfiguration.setHostPort(Integer.parseInt(value));
 		} else if (key.equals(TIMEOUT)) {

Modified: branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/ManualVirtualMachineController.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/ManualVirtualMachineController.java	2009-03-12 22:04:17 UTC (rev 1288)
+++ branches/work_Ed/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/ManualVirtualMachineController.java	2009-03-13 14:54:11 UTC (rev 1289)
@@ -50,7 +50,7 @@
 			throws MachineException {
 		return Activator.createErrorStatus(
 				MessageFormat.format("Could not contact the build machine at {0}:{1}; it must be manually launched.",
-						getConfiguration().getTargetIPAddress(),
+						getConfiguration().getTargetAddress(),
 						""+getConfiguration().getTargetPort()), null);
 	}
 

Modified: branches/work_Ed/org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu/QemuMachine.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu/QemuMachine.java	2009-03-12 22:04:17 UTC (rev 1288)
+++ branches/work_Ed/org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu/QemuMachine.java	2009-03-13 14:54:11 UTC (rev 1289)
@@ -59,7 +59,7 @@
 	@Override
 	public URI getURI() {
 		return URI.create("qemu+ssh://" 
-				+ getSshConfiguration().getTargetIPAddress() 
+				+ getSshConfiguration().getTargetAddress() 
 				+ ":" 
 				+ getSshConfiguration().getTargetPort());
 	}

Modified: branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwareMachine.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwareMachine.java	2009-03-12 22:04:17 UTC (rev 1288)
+++ branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/VMwareMachine.java	2009-03-13 14:54:11 UTC (rev 1289)
@@ -61,7 +61,7 @@
 	@Override
 	public URI getURI() {
 		return URI.create("vmware+ssh://" 
-				+ getSshConfiguration().getTargetIPAddress() 
+				+ getSshConfiguration().getTargetAddress() 
 				+ ":" 
 				+ getSshConfiguration().getTargetPort());
 	}