Author: adietish Date: 2010-11-18 06:41:54 -0500 (Thu, 18 Nov 2010) New Revision: 26703 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java Log: [JBIDE-7625] [JBIDE-7627] create new client when cloud was edited, reinitialize list of clouds when loading clouds (and not add loaded ones to the existing ones, etc. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-18 11:20:02 UTC (rev 26702) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-18 11:41:54 UTC (rev 26703) @@ -1,3 +1,14 @@ +2010-11-18 André Dietisheim <adietish(a)redhat.com&gt; + + * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud): + [JBIDE-7625] store password in the constructor + (editCloud): + [JBIDE-7625] have to create new client when cloud was edited + * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (removeCloud): + [JBIDE-7625] removed check for pw on identical url any more since we now save the pw with the name of the cloud + (loadCloud): + [JBIDE-7627] reinitialize cloud list when loading clouds (otherwise clouds loaded will simply get added to the existing ones) + 2010-11-17 André Dietisheim <adietish(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-18 11:20:02 UTC (rev 26702) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-18 11:41:54 UTC (rev 26703) @@ -43,12 +43,11 @@ private String name; private String username; - private String password; private String url; private String type; private String lastKeyname = ""; private String lastImageId = ""; - private DeltaCloudClientImpl client; + private InternalDeltaCloudClient client; private ArrayList<DeltaCloudInstance> instances; private ArrayList<DeltaCloudImage> images; private IImageFilter imageFilter; @@ -65,25 +64,27 @@ public boolean matchesState(DeltaCloudInstance instance, String instanceState); } - public DeltaCloud(String name, String url, String username, String passwd) { + public DeltaCloud(String name, String url, String username, String passwd) throws DeltaCloudException { this(name, url, username, passwd, null); } - public DeltaCloud(String name, String url, String username, String password, String type) { + public DeltaCloud(String name, String url, String username, String password, String type) throws DeltaCloudException { this(name, url, username, password, type, IImageFilter.ALL_STRING, IInstanceFilter.ALL_STRING); } public DeltaCloud(String name, String url, String username, String type, String imageFilterRules, - String instanceFilterRules) { + String instanceFilterRules) throws DeltaCloudException { this(name, url, username, null, type, imageFilterRules, instanceFilterRules); } - public DeltaCloud(String name, String url, String username, String passwd, - String type, String imageFilterRules, String instanceFilterRules) { + public DeltaCloud(String name, String url, String username, String password, + String type, String imageFilterRules, String instanceFilterRules) throws DeltaCloudException { this.url = url; this.name = name; this.username = username; this.type = type; + storePassword(name, username, password); + this.client = createClient(name, url, username, password); imageFilter = createImageFilter(imageFilterRules); instanceFilter = createInstanceFilter(instanceFilterRules); } @@ -93,19 +94,19 @@ this.url = url; this.name = name; this.username = username; - this.password = password; this.type = type; - storePassword(url, username, password); - // save(); + removePassword(name, username); + storePassword(name, username, password); + client = createClient(name, url, username, password); loadChildren(); } - private InternalDeltaCloudClient getClient() throws DeltaCloudException { + private InternalDeltaCloudClient createClient(String name, String url, String username, String password) throws DeltaCloudException { try { - if (client == null) { - this.client = new DeltaCloudClientImpl(url, username, getPassword(url, username)); + if (password == null) { + password = getPasswordFromPreferences(name, username); } - return client; + return new DeltaCloudClientImpl(url, username, password); } catch (MalformedURLException e) { throw new DeltaCloudException(MessageFormat.format("Could not access cloud at {0}", url), e); } catch (StorageException e) { @@ -114,27 +115,18 @@ } } - private String getPassword(String url, String username) throws StorageException { - if (password != null) { - return password; - } else { - this.password = getPasswordFromPreferences(url, username); - return this.password; - } - } - - private String getPasswordFromPreferences(String url, String username) throws StorageException { - String key = DeltaCloud.getPreferencesKey(url, username); // $NON-NLS-1$ + private String getPasswordFromPreferences(String cloudName, String username) throws StorageException { + String key = getPreferencesKey(cloudName, username); // $NON-NLS-1$ ISecurePreferences root = SecurePreferencesFactory.getDefault(); ISecurePreferences node = root.node(key); String password = node.get("password", null); //$NON-NLS-1$ return password; } - private void storePassword(String url, String username, String passwd) throws DeltaCloudException { + private void storePassword(String cloudName, String username, String passwd) throws DeltaCloudException { if (passwd != null) { ISecurePreferences root = SecurePreferencesFactory.getDefault(); - String key = DeltaCloud.getPreferencesKey(url, username); + String key = getPreferencesKey(cloudName, username); ISecurePreferences node = root.node(key); try { node.put("password", passwd, true /* encrypt */); //$NON-NLS-1$ @@ -145,9 +137,23 @@ } } - public static String getPreferencesKey(String url, String username) { - String key = "/org/jboss/tools/deltacloud/core/"; //$NON-NLS-1$ - key += url + "/" + username; //$NON-NLS-1$ + public void removePassword(String cloudName, String userName) throws DeltaCloudException { + String key = getPreferencesKey(cloudName, userName); + ISecurePreferences root = SecurePreferencesFactory.getDefault(); + ISecurePreferences node = root.node(key); + if (node == null) { + throw new DeltaCloudException(MessageFormat.format( + "Could not remove password for cloud {0} from secure preferences store", cloudName)); + } + node.clear(); + } + + public static String getPreferencesKey(String cloudName, String username) { + String key = new StringBuilder("/org/jboss/tools/deltacloud/core/") //$NON-NLS-1$ + .append(cloudName) + .append('/') //$NON-NLS-1$ + .append(username) + .toString(); return EncodingUtils.encodeSlashes(key); } @@ -290,7 +296,7 @@ imageListeners.remove(listener); } - public DeltaCloudImage[] notifyImageListListeners() { + public DeltaCloudImage[] notifyImageListeners() { DeltaCloudImage[] images = cloneImagesArray(); notifyImageListListeners(images); return images; @@ -394,7 +400,7 @@ synchronized (instanceLock) { clearInstances(); try { - List<Instance> list = getClient().listInstances(); + List<Instance> list = client.listInstances(); for (Iterator<Instance> i = list.iterator(); i.hasNext();) { DeltaCloudInstance instance = new DeltaCloudInstance(this, i.next()); instances.add(instance); @@ -440,7 +446,7 @@ public void createKey(String keyname, String keystoreLocation) throws DeltaCloudException { try { - getClient().createKey(keyname, keystoreLocation); + client.createKey(keyname, keystoreLocation); } catch (DeltaCloudClientException e) { throw new DeltaCloudException(e); } @@ -448,7 +454,7 @@ public void deleteKey(String keyname) throws DeltaCloudException { try { - getClient().deleteKey(keyname); + client.deleteKey(keyname); } catch (DeltaCloudClientException e) { throw new DeltaCloudException(e); } @@ -477,7 +483,7 @@ public DeltaCloudInstance refreshInstance(String instanceId) throws DeltaCloudException { DeltaCloudInstance retVal = null; try { - Instance instance = getClient().listInstances(instanceId); + Instance instance = client.listInstances(instanceId); retVal = new DeltaCloudInstance(this, instance); for (int i = 0; i < instances.size(); ++i) { DeltaCloudInstance inst = instances.get(i); @@ -534,7 +540,7 @@ public DeltaCloudHardwareProfile[] getProfiles() throws DeltaCloudException { ArrayList<DeltaCloudHardwareProfile> profiles = new ArrayList<DeltaCloudHardwareProfile>(); try { - List<HardwareProfile> list = getClient().listProfiles(); + List<HardwareProfile> list = client.listProfiles(); for (Iterator<HardwareProfile> i = list.iterator(); i.hasNext();) { DeltaCloudHardwareProfile profile = new DeltaCloudHardwareProfile(i.next()); profiles.add(profile); @@ -549,7 +555,7 @@ public DeltaCloudImage loadImage(String imageId) throws DeltaCloudException { try { - Image image = getClient().listImages(imageId); + Image image = client.listImages(imageId); DeltaCloudImage deltaCloudImage = addImage(image); return deltaCloudImage; } catch (DeltaCloudClientException e) { @@ -570,11 +576,11 @@ synchronized (imageLock) { try { clearImages(); - List<Image> list = getClient().listImages(); + List<Image> list = client.listImages(); for (Iterator<Image> i = list.iterator(); i.hasNext();) { addImage(i.next()); } - return notifyImageListListeners(); + return notifyImageListeners(); } catch (DeltaCloudClientException e) { throw new DeltaCloudException(MessageFormat.format("Could not load images of cloud {0}: {1}", getName(), e.getMessage()), e); @@ -585,7 +591,7 @@ private void clearImages() { synchronized (imageLock) { images = new ArrayList<DeltaCloudImage>(); - notifyImageListListeners(); + notifyImageListeners(); } } @@ -607,7 +613,7 @@ public DeltaCloudImage getImage(String imageId) { DeltaCloudImage retVal = null; try { - Image image = getClient().listImages(imageId); + Image image = client.listImages(imageId); retVal = new DeltaCloudImage(image, this); } catch (Exception e) { e.printStackTrace(); @@ -619,7 +625,7 @@ public boolean testConnection() throws DeltaCloudException { String instanceId = "nonexistingInstance"; //$NON-NLS-1$ try { - getClient().listInstances(instanceId); + client.listInstances(instanceId); return true; } catch (DeltaCloudNotFoundClientException e) { return true; @@ -633,7 +639,7 @@ public DeltaCloudRealm[] getRealms() throws DeltaCloudException { ArrayList<DeltaCloudRealm> realms = new ArrayList<DeltaCloudRealm>(); try { - List<Realm> list = getClient().listRealms(); + List<Realm> list = client.listRealms(); for (Iterator<Realm> i = list.iterator(); i.hasNext();) { DeltaCloudRealm realm = new DeltaCloudRealm(i.next()); realms.add(realm); @@ -649,9 +655,9 @@ try { Instance instance = null; if (keyname != null) { - instance = getClient().createInstance(imageId, profileId, realmId, name, keyname, memory, storage); + instance = client.createInstance(imageId, profileId, realmId, name, keyname, memory, storage); } else { - instance = getClient().createInstance(imageId, profileId, realmId, name, memory, storage); + instance = client.createInstance(imageId, profileId, realmId, name, memory, storage); } if (instance != null) { DeltaCloudInstance newInstance = new DeltaCloudInstance(this, instance); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-18 11:20:02 UTC (rev 26702) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-18 11:41:54 UTC (rev 26703) @@ -13,10 +13,10 @@ import java.util.List; import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException; -import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl; import org.jboss.tools.deltacloud.core.client.Instance; import org.jboss.tools.deltacloud.core.client.Instance.State; import org.jboss.tools.deltacloud.core.client.InstanceAction; +import org.jboss.tools.deltacloud.core.client.InternalDeltaCloudClient; public class DeltaCloudInstance { @@ -120,7 +120,7 @@ return cloud; } - protected boolean performInstanceAction(String actionId, DeltaCloudClientImpl client) + protected boolean performInstanceAction(String actionId, InternalDeltaCloudClient client) throws DeltaCloudClientException { InstanceAction action = instance.getAction(actionId); if (action == null) { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-11-18 11:20:02 UTC (rev 26702) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-11-18 11:41:54 UTC (rev 26703) @@ -17,14 +17,13 @@ import java.io.PrintWriter; import java.text.MessageFormat; import java.util.ArrayList; +import java.util.List; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.ListenerList; -import org.eclipse.equinox.security.storage.ISecurePreferences; -import org.eclipse.equinox.security.storage.SecurePreferencesFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -36,13 +35,14 @@ private static final DeltaCloudManager INSTANCE = new DeltaCloudManager(); public final static String CLOUDFILE_NAME = "clouds.xml"; //$NON-NLS-1$ - private ArrayList<DeltaCloud> clouds = new ArrayList<DeltaCloud>(); + private List<DeltaCloud> clouds = new ArrayList<DeltaCloud>(); private ListenerList cloudManagerListeners; private DeltaCloudManager() { } public void loadClouds() throws DeltaCloudException { + clouds = new ArrayList<DeltaCloud>(); // clear present clouds DeltaCloudMultiException connectionException = new DeltaCloudMultiException("Errors occurred while loading clouds from the preferences"); IPath stateLocation = Activator.getDefault().getStateLocation(); File cloudFile = stateLocation.append(CLOUDFILE_NAME).toFile(); @@ -182,43 +182,13 @@ notifyListeners(ICloudManagerListener.ADD_EVENT); } - public void removeCloud(DeltaCloud d) { + public void removeCloud(DeltaCloud d) throws DeltaCloudException { clouds.remove(d); - String url = d.getURL(); - String userName = d.getUsername(); - // check if we have a duplicate cloud connection using the same - // url/username combo. - // if we have removed a cloud and no other cloud shares the - // url/username combo, then we should clear the node out which - // includes the password. - if (!isHasAnyCloud(url, userName)) { - ISecurePreferences root = SecurePreferencesFactory.getDefault(); - String key = DeltaCloud.getPreferencesKey(url, userName); - ISecurePreferences node = root.node(key); - node.clear(); - } + d.removePassword(d.getName(), d.getName()); saveClouds(); notifyListeners(ICloudManagerListener.REMOVE_EVENT); } - /** - * Checks if any cloud uses the given url and username - * - * @param url - * the url - * @param userName - * the user name - * @return true, if is checks for any cloud - */ - private boolean isHasAnyCloud(String url, String userName) { - for (DeltaCloud cloud : clouds) { - if (cloud.getURL().equals(url) && cloud.getUsername().equals(userName)) { - return true; - } - } - return false; - } - public void notifyCloudRename() { saveClouds(); notifyListeners(ICloudManagerListener.RENAME_EVENT); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-18 11:20:02 UTC (rev 26702) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-18 11:41:54 UTC (rev 26703) @@ -1,3 +1,10 @@ +2010-11-18 André Dietisheim <adietish(a)redhat.com&gt; + + * src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java (execute): + [JBIDE-7625] added error reporting + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java (performTest): + [JBIDE-7625] corrected where name is fetched (was UI, should be model) + 2010-11-17 André Dietisheim <adietish(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java (removeWithDialog): Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-18 11:20:02 UTC (rev 26702) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-18 11:41:54 UTC (rev 26703) @@ -13,7 +13,7 @@ <booleanAttribute key="default" value="false"/> <stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.deltacloud.test,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests,org.jruby.jruby"/> <booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration"/> +<stringAttribute key="location" value="${workspace_loc}/../runtime-deltacloud"/> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> <listEntry value="org.eclipse.debug.ui.launchGroup.run"/> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> @@ -23,8 +23,8 @@ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.sdk.ide"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.tm.terminal@default:default,org.eclipse.core.expressions@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.core.resources@default:default,org.eclipse.rse@default:default,org.junit4@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ui@default:default,javax.xml.rpc@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.rse.connectorservice.telnet@default:default,org.eclipse.compare@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jdt@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.cdt.core@default:default,org.eclipse.emf.edit@default:default,org.apache.commons.el@default:default,org.apache.xml.resolver@defaul! t:default,org.jboss.tools.xulrunner.initializer@default:false,org.jboss.tools.jmx.ui@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,javax.wsdl*1.6.2.v201005080631@default:default,org.eclipse.dstore.extra@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.wst.validation@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.osgi.services@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jdt.debug.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jface.databinding@default:default,org.apache.xerces@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.equinox.p2.artifact.reposit! ory@default:default,org.apache.commons.httpclient*3.1.0.v20100! 5080502@ default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.ui.workbench@default:default,org.mortbay.jetty.util@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.eclipse.rse.doc.user@default:default,javax.activation@default:default,org.apache.axis@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.rse.dstore.security@default:default,org.eclipse.rse.services.ssh@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.rse.subsystems.shells.telnet@default:default,org.eclipse.core.databinding.property@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.help.base@default:default,org.eclipse.equinox.frameworkadmin@default:default,com.jcraft.jsch@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.update.configurator@3:true,org.eclip! se.core.filesystem@default:default,org.eclipse.update.core@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.eclipse.rse.subsystems.processes.core@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.rse.efs@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.app@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.dstore.core@default:default,org.eclipse.rse.efs.ui@default:default,javax.mail@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.rse.connectorservice.local@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.ant.core@default:default,org.eclipse.ecf@default:default,org.eclipse.rse.subsystems.files.dstore@default:default,org.eclips! e.rse.subsystems.terminals.ssh@default:default,org.eclipse.cor! e.variab les@default:default,org.eclipse.text@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.rse.subsystems.files.ftp@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.rse.processes.ui@default:default,org.sat4j.pb@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.apache.jasper@default:default,org.apache.lucene@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.rse.subsystems.terminals.core@default:default,org.jboss.tools.jmx.core@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.pde.core@default:default,org.eclipse.jdt.compiler.apt@default! :false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.compare.core@default:default,org.eclipse.ui.views@default:default,org.mortbay.jetty.server@default:default,org.eclipse.osgi@-1:true,org.eclipse.jface.text@default:default,org.eclipse.rse.services.telnet@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.search@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.rse.subsystems.processes.dstore@default:default,org.eclipse.rse.services@default:default,org.eclipse.rse.subsystems.processes.local@default:default,org.eclipse.cdt.ui@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.core.runtime@default:true,org.eclipse.wst.common.uriresolver@default:default,com.ibm.icu@default:default,org.eclipse.jsch.core@default:default,jav! ax.xml.soap@default:default,org.eclipse.core.net.linux.x86_64@! default: false,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.ui.cheatsheets@default:default,javax.xml@default:default,org.eclipse.ui.forms@default:default,org.uddi4j@default:default,org.eclipse.cdt.core.linux@default:false,org.eclipse.rse.connectorservice.dstore@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,javax.servlet@default:default,org.eclipse.jface@default:default,org.eclipse.debug.ui@default:default,org.eclipse.rse.shells.ui@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.ide@default:default,org.eclipse.rse.services.files.ftp@default:default,org.apache.commons.discovery@default:default,org.eclipse.osgi.util@default:default,org.eclipse.rse.subsystems.shells.dstore@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.junit@defau! lt:default,org.eclipse.wst.sse.core@default:default,org.eclipse.rse.subsystems.files.local@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.rse.subsystems.shells.local@default:default,org.eclipse.rse.terminals.ui@default:default,org.apache.ant@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.rse.core@default:default,org.eclipse.core.jobs@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.http.servlet@default:default,org.apache.xml.serializer@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.debug.cor! e@default:default,org.eclipse.team.ui@default:default,org.ecli! pse.ltk. ui.refactoring@default:default,org.eclipse.rse.importexport@default:default,org.eclipse.rse.services.dstore@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.rse.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.help.ui@default:default,org.sat4j.core@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.commons.net@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ui.console@default:default,org.eclipse.swt@default:default,org.eclipse.rse.useractions@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.emf.common@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.rse.subsystems.processes.shell.linux@default:default,org.eclipse.ecf.provi! der.filetransfer@default:default,org.eclipse.xsd@default:default,org.eclipse.ecf.identity@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.jem.util@default:default,org.eclipse.sdk@default:default,org.eclipse.pde.build@default:default,org.eclipse.ui.browser@default:default,org.apache.lucene.analysis@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.help@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.ui@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.http.jetty@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.rse.services.telnet@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.app@default:default,org.eclipse.rse.efs.ui@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,javax.xml@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.rse.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.rse.connectorservice.dstore@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.cdt.ui@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.emf.common@default:default,org.eclipse.swtbot.ant.optional.ju! nit4@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.pde.core@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.jmx.ui@default:default,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.jem.util@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.dstore.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.ui.intro@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.cdt.core.linux@default:false,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.ui.forms@default:default,org.ecl! ipse.help@default:default,org.eclipse.core.filebuffers@default! :default ,org.eclipse.team.ui@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.rse.subsystems.terminals.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.help.base@default:default,javax.servlet.jsp@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,com.ibm.icu@default:default,javax.servlet@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.rse.subsystems.processes.shell.linux@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.rse.dstore.security@default:default,org.eclipse.rs! e.services.ssh@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.rse.useractions@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.net@default:default,javax.wsdl*1.6.2.v201005080631@default:default,org.eclipse.rse.services.dstore@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.common.core@default:default,javax.xml.rpc@default:default,org.eclipse.emf.ecore@default:default,org.sat4j.core@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.xsd@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.text@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.jdt@default:default,org.eclipse.rse.terminals.ui@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.rse.subsystems.file! s.ftp@default:default,org.eclipse.equinox.p2.jarprocessor@defa! ult:defa ult,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.update.configurator@3:true,org.apache.commons.net@default:default,org.eclipse.rse.subsystems.processes.core@default:default,org.jboss.tools.jmx.core@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.debug.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.team.core@default:default,org.eclipse.dstore.extra@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui@default:default,org.eclipse.core.net.linux.x86_64@default:false,com.jcraft.jsch@default:default,org.eclipse.ant.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.expressions@default:default,org.eclipse.wst.validation@default:default,org.eclipse.jface.text@default:default,org.eclipse.wst.common.emf! @default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.equinox.p2.publisher@default:default,javax.activation@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.emf.edit@default:default,org.eclipse.rse@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.pde.build@default:default,org.eclipse.compare@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.editors@default:default,org.eclipse.rse.subsystems.files.dstore@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.rse.ui@default:default,org.eclipse.rse.subsystems.shells.dstore@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.core.jobs@default:default,org.apache.lucene@default:default,org.eclipse.emf.ecore.xmi@default:defau! lt,org.eclipse.jface@default:default,org.eclipse.jdt.ui@defaul! t:defaul t,org.eclipse.ui.cheatsheets@default:default,org.apache.commons.el@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.ide.application@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.common@2:true,org.eclipse.rse.processes.ui@default:default,org.eclipse.osgi.services@default:default,org.eclipse.rse.importexport@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.rse.services@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.rse.subsystems.shells.local@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.apache.commons.discovery@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.ui.! workbench.texteditor@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.update.core@default:default,org.eclipse.rse.shells.ui@default:default,org.eclipse.sdk@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.rse.subsystems.processes.local@default:default,org.apache.axis@default:default,org.hamcrest.core@default:default,org.eclipse.rse.connectorservice.telnet@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,javax.mail@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.rse.subsystems.files.local@default:default,org.eclipse.equinox.http.servlet@default:default,org.apache.xerces@default:default,org.eclipse.ecf.identity@default:default,org.sat4j.pb@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.rse.subsystems.processes.dstore@default:default,org.junit4@default:default,org.eclipse.rse.connectorservice.ssh@defa! ult:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:! default, org.eclipse.wst.common.uriresolver@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.browser@default:default,org.apache.xml.serializer@default:default,org.apache.xml.resolver@default:default,org.eclipse.cdt.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.ide@default:default,org.uddi4j@default:default,org.apache.jasper@default:default,org.eclipse.wst.sse.core@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.emf.common.ui@default:default,org.apache.ant@default:default,org.eclipse.rse.doc.user@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.rse.connectorservice.local@default:de! fault,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.security@default:default,org.eclipse.swt@default:default,org.eclipse.rse.subsystems.shells.telnet@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.rse.efs@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.ui.console@default:default,javax.xml.soap@default:default,org.eclipse.equinox.security.ui@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> <booleanAttribute key="tracing" value="false"/> Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java 2010-11-18 11:20:02 UTC (rev 26702) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java 2010-11-18 11:41:54 UTC (rev 26703) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.ui.commands; +import java.text.MessageFormat; import java.util.Collection; import java.util.HashSet; import java.util.List; @@ -32,7 +33,9 @@ import org.eclipse.ui.dialogs.ListSelectionDialog; import org.eclipse.ui.handlers.HandlerUtil; import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.deltacloud.core.DeltaCloudException; import org.jboss.tools.deltacloud.core.DeltaCloudManager; +import org.jboss.tools.deltacloud.ui.ErrorUtils; import org.jboss.tools.deltacloud.ui.views.CVCloudElement; import org.jboss.tools.deltacloud.ui.views.CVMessages; import org.jboss.tools.deltacloud.ui.views.CloudViewElement; @@ -80,7 +83,7 @@ setTitle(CVMessages.getString(CONFIRM_CLOUD_DELETE_TITLE)); } } - + @Override public Object execute(ExecutionEvent event) throws ExecutionException { Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); @@ -88,17 +91,25 @@ if (selection instanceof IStructuredSelection) { List<?> selectedElements = ((IStructuredSelection) selection).toList(); DeltaCloud deltaCloud = getFirstSelectedCloud(selectedElements); - if (selectedElements.size() == 1 && deltaCloud != null) { - removeDeltaCloud(deltaCloud); - } else { - removeWithDialog(shell, selectedElements); + try { + if (selectedElements != null + && selectedElements.size() == 1 + && deltaCloud != null) { + removeDeltaCloud(deltaCloud); + } else { + removeWithDialog(shell, selectedElements); + } + } catch (DeltaCloudException e) { + // TODO internationalize strings + ErrorUtils.openErrorDialog("Error", + MessageFormat.format("Could not disconnect cloud {0}", deltaCloud.getName()), e, shell); } } return Status.OK_STATUS; } - private void removeWithDialog(Shell shell, List<?> selectedElements) { + private void removeWithDialog(Shell shell, List<?> selectedElements) throws DeltaCloudException { Collection<?> clouds = getSelectedClouds(selectedElements); DisconnectCloudsDialog dialog = new DisconnectCloudsDialog( shell @@ -108,7 +119,7 @@ removeDeltaClouds(dialog.getResult()); } } - + private DeltaCloud getFirstSelectedCloud(List<?> selectedElements) { DeltaCloud deltaCloud = null; if (selectedElements.size() > 0) { @@ -159,13 +170,13 @@ return getDeltaCloud((CloudViewElement) element.getParent()); } - private void removeDeltaClouds(Object[] deltaClouds) { + private void removeDeltaClouds(Object[] deltaClouds) throws DeltaCloudException { for (Object deltaCloud : deltaClouds) { removeDeltaCloud((DeltaCloud) deltaCloud); } } - - private void removeDeltaCloud(DeltaCloud deltaCloud) { + + private void removeDeltaCloud(DeltaCloud deltaCloud) throws DeltaCloudException { DeltaCloudManager.getDefault().removeCloud((DeltaCloud) deltaCloud); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-11-18 11:20:02 UTC (rev 26702) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-11-18 11:41:54 UTC (rev 26703) @@ -88,10 +88,12 @@ try { instances = filter(cloud.getCurrInstances()); } catch (Exception e) { + if (instances == null) { + instances = new DeltaCloudInstance[]{}; + } // TODO internationalize strings ErrorUtils.openErrorDialog("Instance View Error", "Could not display instances for cloud " + cloud.getName(), e, Display.getDefault().getActiveShell()); - instances = new DeltaCloudInstance[]{}; } } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2010-11-18 11:20:02 UTC (rev 26702) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2010-11-18 11:41:54 UTC (rev 26703) @@ -105,8 +105,9 @@ String oldName = cloud.getName(); cloud.editCloud(name, url, username, password, type); DeltaCloudManager.getDefault().saveClouds(); - if (!name.equals(oldName)) + if (!name.equals(oldName)) { DeltaCloudManager.getDefault().notifyCloudRename(); + } } catch (Exception e) { } return true; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-11-18 11:20:02 UTC (rev 26702) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-11-18 11:41:54 UTC (rev 26703) @@ -46,7 +46,7 @@ } public boolean performTest() { - String name = mainPage.getName(); + String name = mainPage.getModel().getName(); String url = mainPage.getModel().getUrl(); String username = mainPage.getModel().getUsername(); String password = mainPage.getModel().getPassword();