Author: adietish Date: 2010-12-25 10:27:49 -0500 (Sat, 25 Dec 2010) New Revision: 27739 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileFactory.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/DeltaCloudInstance.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudKey.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/InstanceFilter.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AbstractDeltaCloudObject.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Key.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 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/views/cloud/property/InstancePropertySource.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysWizard.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java Log: [JBIDE-7763] revamped the whole manage keys page to deal with keys on the server (list, refresh, create, delete) 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-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -422,11 +422,13 @@ } } - public void createKey(String keyname, String keystoreLocation) throws DeltaCloudException { + public DeltaCloudKey getKey(String keyId) throws DeltaCloudException { try { - client.createKey(keyname, keystoreLocation); + Key key = client.listKey(keyId); + return new DeltaCloudKey(key, this); } catch (DeltaCloudClientException e) { - throw new DeltaCloudException(e); + // TODO: internationalize strings + throw new DeltaCloudException(MessageFormat.format("Could not get key \"{0}\" from cloud \"{1}\"", keyId, getName()), e); } } @@ -547,11 +549,11 @@ } public DeltaCloudInstance createInstance(String name, String imageId, String realmId, String profileId, - String keyname, String memory, String storage) throws DeltaCloudException { + String keyId, String memory, String storage) throws DeltaCloudException { try { Instance instance = null; - if (keyname != null) { - instance = client.createInstance(imageId, profileId, realmId, name, keyname, memory, storage); + if (keyId != null) { + instance = client.createInstance(imageId, profileId, realmId, name, keyId, memory, storage); } else { instance = client.createInstance(imageId, profileId, realmId, name, memory, storage); } 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-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -105,10 +105,16 @@ return State.valueOf(instance.getState().name()); } - public String getKey() { - return instance.getKey(); + public DeltaCloudKey getKey() throws DeltaCloudException { + // TODO: cache keys locally + DeltaCloud cloud = getDeltaCloud(); + return cloud.getKey(instance.getKeyId()); } + public String getKeyId() { + return instance.getKeyId(); + } + public List<Action> getActions() { List<Action> actions = new ArrayList<Action>(); for (InstanceAction action : instance.getActions()) { @@ -189,7 +195,7 @@ .append("name: ").append(getName()) .append("hostName: ").append(getHostName()) .append("imageId: ").append(getImageId()) - .append("key: ").append(getKey()) + .append("key: ").append(getKeyId()) .append("ownerId: ").append(getOwnerId()) .append("profileId: ").append(getProfileId()) .append("realmId: ").append(getRealmId()) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudKey.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudKey.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudKey.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -41,4 +41,10 @@ public String getPem() { return key.getPem(); } + + @Override + public String toString() { + return "DeltaCloudKey [key=" + key + "]"; + } + } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/InstanceFilter.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/InstanceFilter.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/InstanceFilter.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -23,22 +23,22 @@ */ public class InstanceFilter extends AbstractCloudElementFilter<DeltaCloudInstance> implements IInstanceFilter { - public InstanceFilter(DeltaCloud cloud) { - super(cloud); - } - private IFieldMatcher imageIdRule; private IFieldMatcher realmRule; private IFieldMatcher profileRule; private IFieldMatcher ownerIdRule; private IFieldMatcher keyNameRule; + + public InstanceFilter(DeltaCloud cloud) { + super(cloud); + } @Override public boolean matches(DeltaCloudInstance instance) { return super.matches(instance) && imageIdRule.matches(instance.getImageId()) && ownerIdRule.matches(instance.getOwnerId()) && - keyNameRule.matches(instance.getKey()) && + keyNameRule.matches(instance.getKeyId()) && realmRule.matches(instance.getRealmId()) && profileRule.matches(instance.getProfileId()); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AbstractDeltaCloudObject.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AbstractDeltaCloudObject.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AbstractDeltaCloudObject.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -17,6 +17,7 @@ * @author André Dietisheim */ public abstract class AbstractDeltaCloudObject { + protected String id; public void setId(String id) { @@ -27,4 +28,10 @@ public String getId() { return id; } + + @Override + public String toString() { + return "AbstractDeltaCloudObject [id=" + id + "]"; + } + } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -125,20 +125,6 @@ String memory, String storage) throws DeltaCloudClientException; /** - * Creates a key for a given name on the deltacloud server and stores it in - * the file at the given path. The file gets created if the file path does - * not exist yet. - * - * @param keyname - * the name of the key to retrieve from the server - * @param keyStoreLocation - * the path to the file to store the key in - * @throws DeltaCloudClientException - * the delta cloud client exception - */ - public void createKey(String keyname, String keystoreLocation) throws DeltaCloudClientException; - - /** * Creates a key for a given name on the deltacloud server. * * @param keyname @@ -172,5 +158,5 @@ * Returns a key with the given name if it is available on the server. * Throws a DeltaCloudException if it is not available. */ - public Key listKey(String name) throws DeltaCloudClientException; + public Key listKey(String id) throws DeltaCloudClientException; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -11,8 +11,6 @@ package org.jboss.tools.deltacloud.core.client; import java.io.BufferedReader; -import java.io.File; -import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -46,7 +44,6 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.impl.client.DefaultHttpClient; -import org.eclipse.core.runtime.Path; import org.jboss.tools.deltacloud.core.client.request.AbstractListObjectsRequest; import org.jboss.tools.deltacloud.core.client.request.CreateInstanceRequest; import org.jboss.tools.deltacloud.core.client.request.CreateKeyRequest; @@ -78,7 +75,6 @@ */ public class DeltaCloudClientImpl implements InternalDeltaCloudClient { - private static final String PEM_FILE_SUFFIX = "pem"; private static final String DOCUMENT_ELEMENT_DRIVER = "driver"; private static final String DOCUMENT_ELEMENT_API = "api"; @@ -299,26 +295,28 @@ } @Override - public Instance createInstance(String imageId, String profileId, - String realmId, String name) throws DeltaCloudClientException { - return createInstance(imageId, profileId, realmId, name, null, null, - null); - } - - public Instance createInstance(String imageId, String profileId, - String realmId, String name, String memory, String storage) + public Instance createInstance(String imageId, String profileId, String realmId, String name) throws DeltaCloudClientException { - return createInstance(imageId, profileId, realmId, name, null, memory, - storage); + return createInstance(imageId, profileId, realmId, name, null, null, null); } - public Instance createInstance(String imageId, String profileId, - String realmId, String name, String keyname, String memory, + public Instance createInstance(String imageId, String profileId, String realmId, String name, String memory, String storage) throws DeltaCloudClientException { + return createInstance(imageId, profileId, realmId, name, null, memory, storage); + } + + public Instance createInstance(String imageId, String profileId, String realmId, String name, String keyId, + String memory, String storage) throws DeltaCloudClientException { try { String response = requestStringResponse( - new CreateInstanceRequest(baseUrl, imageId, profileId, realmId, name, keyname, memory, storage)); - return buildInstance(response); + new CreateInstanceRequest(baseUrl, imageId, profileId, realmId, name, keyId, memory, storage)); + Instance instance = buildInstance(response); + // TODO: WORKAROUND for https://issues.apache.org/jira/browse/DTACLOUD-11 + if (keyId != null) { + instance.setKeyId(keyId); + } + // TODO: WORKAROUND for https://issues.apache.org/jira/browse/DTACLOUD-11 + return instance; } catch (DeltaCloudClientException e) { throw e; } catch (Exception e) { @@ -403,36 +401,6 @@ } } - public void createKey(String keyname, String keyStoreLocation) - throws DeltaCloudClientException { - Key key = createKey(keyname); - try { - File keyFile = createKeyFile(keyname, keyStoreLocation); - storeKey(key.getPem(), keyFile); - } catch (Exception e) { - throw new DeltaCloudClientException(e); - } - } - - private void storeKey(String key, File keyFile) throws IOException { - FileWriter w = new FileWriter(keyFile); - w.write(key); - w.close(); - } - - private File createKeyFile(String keyname, String keyStoreLocation) - throws IOException { - File keyFile = Path.fromOSString(keyStoreLocation).append(keyname) - .append(".").append(PEM_FILE_SUFFIX).toFile(); //$NON-NLS-1$ - if (!keyFile.exists()) { - keyFile.createNewFile(); - } - keyFile.setReadable(false, false); - keyFile.setWritable(true, true); - keyFile.setReadable(true, true); - return keyFile; - } - public void deleteKey(String keyname) throws DeltaCloudClientException { requestStringResponse(new DeleteKeyRequest(baseUrl, keyname)); } @@ -444,8 +412,8 @@ return keys; } - public Key listKey(String name) throws DeltaCloudClientException { - InputStream inputStream = request(new ListKeyRequest(baseUrl, name)); + public Key listKey(String id) throws DeltaCloudClientException { + InputStream inputStream = request(new ListKeyRequest(baseUrl, id)); Key key = new KeyUnmarshaller().unmarshall(inputStream, new Key()); return key; } @@ -459,12 +427,12 @@ getPropertyNodes(document, "hardware_profile")); //$NON-NLS-1$ instance.setRealmId(getIdFromHref(getAttributeValues(document, "realm", "href").get(0))); //$NON-NLS-1$ //$NON-NLS-2$ instance.setState(getElementTextValues(document, "state").get(0)); //$NON-NLS-1$ - getAuthentication(document, instance); + updateKeyname(document, instance); instance.setActions(createInstanceActions(instance, document)); - instance.setPublicAddresses(new AddressList(getElementTextValues( - document, "public_addresses"))); - instance.setPrivateAddresses(new AddressList(getElementTextValues( - document, "private_addresses"))); + instance.setPublicAddresses( + new AddressList(getElementTextValues(document, "public_addresses"))); + instance.setPrivateAddresses( + new AddressList(getElementTextValues(document, "private_addresses"))); return instance; } @@ -621,7 +589,7 @@ return values; } - private void getAuthentication(Document document, Instance instance) { + private void updateKeyname(Document document, Instance instance) { NodeList elements = document.getElementsByTagName("authentication"); for (int i = 0; i < elements.getLength(); i++) { Node element = elements.item(i); @@ -636,7 +604,7 @@ for (int k = 0; k < loginChildren.getLength(); ++k) { Node loginChild = loginChildren.item(k); if (loginChild.getNodeName().equals("keyname")) { //$NON-NLS-1$ - instance.setKey(loginChild.getTextContent()); + instance.setKeyId(loginChild.getTextContent()); } } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -45,7 +45,7 @@ private String realmId; - private String keyname; + private String keyId; @XmlElement private InstanceState state; @@ -107,14 +107,14 @@ } } - public void setKey(String keyname) { - this.keyname = keyname; + protected void setKeyId(String keyId) { + this.keyId = keyId; } - - public String getKey() { - return keyname; + + public String getKeyId() { + return keyId; } - + protected void setPrivateAddresses(AddressList privateAddresses) { this.privateAddresses = privateAddresses; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Key.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Key.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Key.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -14,8 +14,6 @@ import java.net.URL; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; - /** * @author Andre Dietisheim */ @@ -75,4 +73,11 @@ public List<KeyAction> getActions() { return actions; } + + @Override + public String toString() { + return "Key [url=" + url + ", pem=" + pem + ", fingerprint=" + fingerprint + ", state=" + state + ", actions=" + + actions + ", toString()=" + super.toString() + "]"; + } + } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -36,6 +36,7 @@ private String name; private String[] data; private IHost host; + public CreateServerFromRSEJob(String type, String[] data, String name) { super("Create Server From RSE Host"); this.data = data; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -30,7 +30,9 @@ import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.server.ui.ServerUIUtil; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; +import org.jboss.tools.deltacloud.core.DeltaCloudException; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; +import org.jboss.tools.deltacloud.core.DeltaCloudKey; import org.jboss.tools.deltacloud.core.job.AbstractInstanceJob; import org.jboss.tools.deltacloud.integration.DeltaCloudIntegrationPlugin; import org.jboss.tools.deltacloud.ui.INewInstanceWizardPage; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-12-25 15:27:49 UTC (rev 27739) @@ -24,8 +24,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.jst.common.frameworks@default:default,org.hamcrest.core@default:default,org.eclipse.jdt.core@default:default,org.eclipse.rse.importexport@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.help.base@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.commands@default:default,org.eclipse.rse.subsystems.shells.dstore@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.browser@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.security.ui@default:default,javax.servlet.jsp@default:default,org.eclipse.core.jobs@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.wst.validation@default:default,org.ec! lipse.wst.server.ui.infopop@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.text@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.help.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.jst.j2ee@default:default,org.sat4j.core@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.jst.j2ee.web@default:default,org.eclipse.ui.intro@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.pde.build@default:default,org.eclipse.rse.ui@default:default,javax.xml@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.equinox.p2.updatesite@! default:default,org.eclipse.jem.beaninfo.vm@default:default,or! g.eclips e.emf.common.ui@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.help@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.dstore.core@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.ui@default:default,org.eclipse.wst.common.ui@default:default,org.apache.xerces@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.jst.common.annotations.controller@default:default,com.ibm.icu@default:default,org.eclipse.swt@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.jst.jee.ui@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.apache.commons.el@default:default,! org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.jem.beaninfo@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.search@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.wst.server.ui@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.wst.jsdt.ui@default:default,org.apache.commons.net@default:default,org.eclipse.rse.shells.ui@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf.ssl@default:false,org.mortbay.jetty.server@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.update.core@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.jst.j2ee.jca.ui@default:default,org.eclipse.jst.server.ui@default:default,org.eclipse.ui.views@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.ui.views.log@default:default,org.apache.jasper@default:default,org.eclipse.sdk@defaul! t:default,org.eclipse.rse.useractions@default:default,org.ecli! pse.rse. connectorservice.local@default:default,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.rse.terminals.ui@default:default,org.eclipse.emf.ecore.change@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.equinox.common@2:true,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.team.ui@default:default,org.eclipse.rse.efs.ui@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ant.core@default:default,org.eclipse.rse.subsystems.processes.local@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ui.forms@default:default,org.ec! lipse.jst.common.ui@default:default,org.eclipse.rse.subsystems.terminals.core@default:default,org.eclipse.jem.beaninfo.vm.common@default:default,org.eclipse.core.resources@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.rse.subsystems.processes.core@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.osgi.services@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.core.filebuffers@default:default,org.apache.xml.resolver@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.rse.doc.user@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.core.net@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.apache.lucene.analysis@def! ault:default,com.jcraft.jsch@default:default,org.eclipse.rse.s! ubsystem s.shells.telnet@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.emf.common@default:default,org.apache.lucene@default:default,org.mortbay.jetty.util@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.sat4j.pb@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.osgi.util@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.rse.subsystems.files.ftp@default:default,org.eclipse.equinox.app@default:default,org.eclipse.rse.subsystems.shells.local@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.debug.ui@default:default,org.eclipse.dstore.extra@default:default,org.eclipse.update.configurator@3:true,org.eclipse.jem.util@default:default,org.eclipse.rse.services@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.compare@default:default,org.eclipse.rse.servi! ces.local@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.tm.terminal@default:default,org.eclipse.rse.services.telnet@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.rse.services.ssh@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.rse.processes.ui@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jdt.launching@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.ui.ide@default:default,org.eclipse.rse.subsystems.processes.dstore@default:default,org.ecli! pse.rse.subsystems.files.local@default:default,org.eclipse.jst! .common. project.facet.core@default:default,org.eclipse.rse.subsystems.processes.shell.linux@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.variables@default:default,org.junit4@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.core.databinding.observable@default:default,javax.servlet@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.rse.services.dstore@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.jst.jee@default:default,org.eclipse.jst.server.core@default:default,org.eclipse.pde.cor! e@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.rse.connectorservice.telnet@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.rse.subsystems.files.dstore@default:default,org.apache.ant@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.rse.connectorservice.dstore@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.rse.efs@default:default,org.eclipse.jface@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.editors@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.rse.dstore.security@default:default,org.ec! lipse.wst.web@default:default,org.eclipse.core.runtime.compati! bility.a uth@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.wst.server.ui.doc.user@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.rse.core@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.expressions@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.core.runtime@default:true,org.eclipse.platform@default:default,org.eclipse.wst.web.ui@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.jem@default:default,org.eclipse.emf.codegen@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.tools.deltacloud.integration@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.wst.sse.core@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.rse.terminals.ui@default:default,org.eclipse.equinox.p2.operations@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.pde.core@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jdt.debug.ui@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jst.server.ui@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.runtime@default:true,org.eclipse.wst.common.modulecore@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.team.ui@default:default,org.ecl! ipse.team.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.ssl@default:false,org.apache.lucene@default:default,org.eclipse.rse.services.telnet@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.web.ui@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.jst.server.core@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.databinding.property@default:default,org.sat4j.core@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.jst.common.project.facet.core@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.codec*1.3.0.v20! 100518-1140@default:default,org.eclipse.rse.connectorservice.d! store@de fault:default,org.apache.jasper@default:default,org.eclipse.rse.subsystems.processes.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.wst.common.emf@default:default,org.apache.commons.net@default:default,org.eclipse.platform@default:default,org.eclipse.rse.subsystems.shells.local@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.jem.util@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.rse.subsystems.processes.shell.linux@default:default,org.eclipse.equinox.app@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.wst.common.ui@default:default,org.eclipse.emf.ecore@default:default,javax.xml@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.rse.shells.ui@default:default,org! .eclipse.rse.processes.ui@default:default,org.mortbay.jetty.server@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.apache.xml.serializer@default:default,org.eclipse.rse.importexport@default:default,org.eclipse.rse.subsystems.processes.local@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.commands@default:default,org.eclipse.rse.useractions@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.wst.server.ui.infopop@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.wst.web@default:default,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclip! se.ui.ide@default:default,org.eclipse.jdt.debug@default:defaul! t,org.ec lipse.update.configurator@3:true,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.pde.build@default:default,org.eclipse.rse.services.dstore@default:default,org.eclipse.ui.editors@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.wst.validation@default:default,org.eclipse.rse.subsystems.shells.telnet@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.osgi.util@default:default,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.rse.services.ssh@default:default,org.eclipse.jst.j2ee@default:default,javax.servlet@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.jem.beaninfo.vm@default:default,o! rg.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.rse.subsystems.files.ftp@default:default,org.eclipse.rse.connectorservice.telnet@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.rse.efs.ui@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.osgi.services@default:default,com.ibm.icu@default:default,org.apache.lucene.analysis@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.ui.forms@default:default,org.eclipse.wst.css.ui@default:default,org.apache.xml.resolver@default:default,org.eclipse.rse.subsystems.files.local@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.equinox.p2! .repository.tools@default:default,org.eclipse.equinox.p2.metad! ata@defa ult:default,org.eclipse.search@default:default,org.eclipse.rse.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.rse.connectorservice.local@default:default,javax.servlet.jsp@default:default,org.apache.ant@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.sdk@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.rse.subsystems.shells.core@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.hamcrest.core@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.jem.beaninfo@default:default,org.eclipse.core.expressions@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.ec! lipse.jem@default:default,org.eclipse.text@default:default,org.eclipse.jsch.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.osgi@-1:true,org.eclipse.jst.common.ui@default:default,org.eclipse.help.ui@default:default,org.eclipse.rse.core@default:default,org.apache.xerces@default:default,org.eclipse.core.resources@default:default,org.eclipse.jface.text@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.rse.subsystems.terminals.core@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.jdt@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jst.jee@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.console@default:default,org.eclipse.wst.common.uriresolver@d! efault:default,org.eclipse.rse.subsystems.files.dstore@default! :default ,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.jdt.launching@default:default,org.eclipse.ui@default:default,org.eclipse.rse.subsystems.processes.dstore@default:default,org.apache.commons.el@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.debug.ui@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.jface@default:default,org.eclipse.ui.views@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.emf.common@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse.help.base@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help@default:default,org.eclipse.rse.subsystems.shells.dstore@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.rse.dstore.security@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jst.j2ee.web@default:default,org.eclipse.wst.! server.ui.doc.user@default:default,org.sat4j.pb@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.compare@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.jem.beaninfo.vm.common@default:default,org.eclipse.rse.efs@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.dstore.extra@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.jst.jee.ui@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jst.common.frameworks@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.rse.services@default:default,org.eclipse.equinox.p2.director@d! efault:default,org.eclipse.update.core@default:default,org.ecl! ipse.swt @default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.junit4@default:default,org.eclipse.wst.server.ui@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.dstore.core@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.jst.j2ee.jca.ui@default:default,org.eclipse.rse.doc.user@default:default,org.eclipse.wst.common.project.facet.core@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.tools.common@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.wtp.ui@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/views/cloud/property/InstancePropertySource.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -15,11 +15,9 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.ui.views.properties.PropertyDescriptor; -import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; import org.jboss.tools.deltacloud.ui.views.CVMessages; import org.jboss.tools.deltacloud.ui.views.cloud.InstanceItem; -import org.jboss.tools.internal.deltacloud.ui.utils.CloudViewElementUtils; public class InstancePropertySource implements IPropertySource { @@ -44,10 +42,8 @@ private IPropertyDescriptor[] propertyDescriptors; private DeltaCloudInstance instance; - private DeltaCloud cloud; public InstancePropertySource(InstanceItem element, Object o) { - cloud = CloudViewElementUtils.getCloud(element); instance = (DeltaCloudInstance) o; } @@ -134,7 +130,7 @@ // a mock and then refresh the instance? investigate what are the // consequences of uncommenting this stuff here // try { - key = instance.getKey(); + key = instance.getKeyId(); // if (!cloud.getType().equals(DeltaCloud.MOCK_TYPE)) { // if (instance.getState().equals(DeltaCloudInstance.State.RUNNING) && // (key == null || key.length() == 0)) { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -269,7 +269,9 @@ private void createKey(final String keyId) { try { - model.createKey(keyId); + DeltaCloudKey key = model.createKey(keyId); +// I guess that the launch job stores the key in the appropriate place already +// PemFileFactory.create(key); } catch (Exception e) { // TODO: internationalize strings ErrorUtils.handleError( Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -61,12 +61,13 @@ setSelectedKey(index - 1); } - public void createKey(String keyId) throws DeltaCloudException { + public DeltaCloudKey createKey(String keyId) throws DeltaCloudException { DeltaCloudKey key = cloud.createKey(keyId); keys.add(key); int index = keys.indexOf(key); fireIndexedPropertyChange(PROP_KEYS, index, null, key); setSelectedKey(key); + return key; } public DeltaCloudKey getSelectedKey() { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysWizard.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysWizard.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -48,5 +48,4 @@ this.key = mainPage.getKey(); return true; } - } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -237,7 +237,7 @@ bindProfileCombo(hardwareCombo, dbc); bindProfilePages(hardwareCombo, profilePages, dbc); // key - bindText(keyText, NewInstancePageModel.PROPERTY_KEYNAME, WizardMessages.getString(MUST_ENTER_A_KEYNAME), dbc); + bindText(keyText, NewInstancePageModel.PROPERTY_KEYID, WizardMessages.getString(MUST_ENTER_A_KEYNAME), dbc); } private void bindArchLabel(IObservableValue imageObservable, DataBindingContext dbc) { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -31,7 +31,7 @@ public static final String PROPERTY_ARCH = "arch"; //$NON-NLS-1$ public static final String PROPERTY_REALMS = "realms"; //$NON-NLS-1$ public static final String PROPERTY_SELECTED_REALM_INDEX = "selectedRealmIndex"; //$NON-NLS-1$ - public static final String PROPERTY_KEYNAME = "keyname"; //$NON-NLS-1$ + public static final String PROPERTY_KEYID = "keyId"; //$NON-NLS-1$ public static final String PROP_PROFILE = "profile"; //$NON-NLS-1$ public static final String PROP_ALL_PROFILES = "allProfiles"; //$NON-NLS-1$ public static final String PROP_FILTERED_PROFILES = "filteredProfiles"; //$NON-NLS-1$ @@ -40,7 +40,7 @@ private String name; private DeltaCloudImage image; private String arch; - private String keyname; + private String keyId; private DeltaCloudRealm selectedRealm; private List<DeltaCloudRealm> realms = new ArrayList<DeltaCloudRealm>(); private DeltaCloudHardwareProfile selectedProfile; @@ -51,7 +51,7 @@ private String memory; protected NewInstancePageModel(String keyname, DeltaCloudImage image) { - this.keyname = keyname; + this.keyId = keyname; this.image = image; } @@ -169,12 +169,12 @@ return selectedProfile.getId(); } - public String getKeyname() { - return keyname; + public String getKeyId() { + return keyId; } public void setKeyname(String keyname) { - getPropertyChangeSupport().firePropertyChange(PROPERTY_KEYNAME, this.keyname, this.keyname = keyname); + getPropertyChangeSupport().firePropertyChange(PROPERTY_KEYID, this.keyId, this.keyId = keyname); } public String getArch() { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-12-25 10:51:17 UTC (rev 27738) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -87,12 +87,13 @@ String memory = model.getMemory(); String storage = model.getStorage(); - String keyname = model.getKeyname(); + String keyId = model.getKeyId(); + String name = utf8Encode(model.getName()); // Save persistent settings for this particular cloud cloud.setLastImageId(imageId); - cloud.setLastKeyname(keyname); + cloud.setLastKeyname(keyId); Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID); @@ -119,7 +120,7 @@ prefs.putBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE, true); } } - instance = cloud.createInstance(name, imageId, realmId, profileId, keyname, memory, storage); + instance = cloud.createInstance(name, imageId, realmId, profileId, keyId, memory, storage); if (instance != null) { result = true; } Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileFactory.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileFactory.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileFactory.java 2010-12-25 15:27:49 UTC (rev 27739) @@ -0,0 +1,78 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.internal.deltacloud.ui.wizards; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; + +import org.eclipse.core.runtime.Path; +import org.jboss.tools.deltacloud.core.DeltaCloudException; +import org.jboss.tools.deltacloud.core.DeltaCloudKey; + +/** + * @author André Dietisheim + */ +public class PemFileFactory { + + private static final String PEM_FILE_SUFFIX = "pem"; + + public static File create(DeltaCloudKey key) throws DeltaCloudException { + return create(key, getKeyStorePath()); + } + + private static String getKeyStorePath() throws DeltaCloudException { + // TODO: replace by code that queries the RSE preferences for its key + // location setting + String userHomePath = System.getProperty("user.home"); + if (userHomePath == null) { + throw new DeltaCloudException("Could not determine path to save pem file to"); + } + return new StringBuilder(userHomePath) + .append(File.separatorChar).append(".ssh").append(File.separatorChar) + .toString(); + } + + private static File create(DeltaCloudKey key, String keyStorePath) throws DeltaCloudException { + try { + File keyFile = createFile(key.getId(), keyStorePath); + save(key.getPem(), keyFile); + return keyFile; + } catch (Exception e) { + throw new DeltaCloudException(e); + } + } + + private static void save(String key, File keyFile) throws IOException { + if (key != null) { + FileWriter w = new FileWriter(keyFile); + w.write(key); + w.close(); + } + } + + private static File createFile(String keyname, String keyStoreLocation) + throws IOException { + File keyFile = + Path.fromOSString(keyStoreLocation) + .append(keyname) + .addFileExtension(PEM_FILE_SUFFIX) //$NON-NLS-1$ + .toFile(); + if (!keyFile.exists()) { + keyFile.createNewFile(); + } + keyFile.setReadable(false, false); + keyFile.setWritable(true, true); + keyFile.setReadable(true, true); + return keyFile; + } + +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain