[jbosstools-commits] JBoss Tools SVN: r27956 - in trunk/deltacloud: plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client and 5 other directories.

Author: adietish Date: 2011-01-06 16:23:48 -0500 (Thu, 06 Jan 2011) New Revision: 27956 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AbstractDeltaCloudActionAwareObject.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractActionUnmarshaller.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMActionAwareUnmarshaller.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceActionUnmarshaller.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceDomUnmarshallingTest.launch trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceDomUnmarshallingTest.java trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerInstanceResponseFakes.java trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerResponseFakes.java Removed: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/IKeyAction.java 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/client/AbstractDeltaCloudResourceAction.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AddressList.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/IDeltaCloudResourceAction.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/IInstanceAction.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/InstanceAction.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.core/src/org/jboss/tools/deltacloud/core/client/KeyAction.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/KeyActionUnmarshaller.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/KeyUnmarshaller.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/KeyDomUnmarshallingTest.launch trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/KeyJAXBUnmarshallingTest.launch trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/KeyDomUnmarshallingTest.java trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerKeyResponseFakes.java Log: [JBIDE-7935] moved instance unmarshalling to its own class, removed from client, added tests 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 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -46,6 +46,7 @@ public final static String CLOUDFILE_NAME = "clouds.xml"; //$NON-NLS-1$ private List<DeltaCloud> clouds; private ListenerList cloudManagerListeners; + private boolean loaded = false; private DeltaCloudManager() { } @@ -75,6 +76,8 @@ connectionException.addError(e); } + loaded = true; + if (!connectionException.isEmpty()) { throw connectionException; } @@ -168,6 +171,10 @@ // TODO: move to marshaler component protected void saveClouds() throws DeltaCloudException { + if (!loaded) { + return; + } + try { File cloudFile = getOrCreateCloudFile(); PrintWriter p = new PrintWriter(new BufferedWriter(new FileWriter(cloudFile))); Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AbstractDeltaCloudActionAwareObject.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AbstractDeltaCloudActionAwareObject.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AbstractDeltaCloudActionAwareObject.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat Inc.. + * All rights reserved. This program and the accompanying materials + * are 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 Incorporated - initial API and implementation + *******************************************************************************/ +package org.jboss.tools.deltacloud.core.client; + +import java.util.List; + +/** + * @author Martyn Taylor + * @author André Dietisheim + */ +public abstract class AbstractDeltaCloudActionAwareObject<ACTION> extends AbstractDeltaCloudObject { + + private List<ACTION> actions; + + public void setActions(List<ACTION> actions) { + this.actions = actions; + } + + public List<ACTION> getActions() { + return actions; + } + +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AbstractDeltaCloudActionAwareObject.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AbstractDeltaCloudResourceAction.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AbstractDeltaCloudResourceAction.java 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AbstractDeltaCloudResourceAction.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -16,11 +16,12 @@ * * @author André Dietisheim */ -public abstract class AbstractDeltaCloudResourceAction implements IDeltaCloudResourceAction { +public abstract class AbstractDeltaCloudResourceAction<OWNER> implements IDeltaCloudResourceAction<OWNER> { private String name; private String url; private HttpMethod method; + private OWNER owner; protected AbstractDeltaCloudResourceAction() { } @@ -59,4 +60,12 @@ public String getUrl() { return url; } + + public void setOwner(OWNER owner) { + this.owner = owner; + } + + public OWNER getOwner() { + return owner; + } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AddressList.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AddressList.java 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/AddressList.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -28,11 +28,11 @@ @XmlList private List<String> addresses; - protected AddressList() + public AddressList() { } - protected AddressList(List<String> addresses) + public AddressList(List<String> addresses) { setAddress(addresses); } 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 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -10,7 +10,9 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.core.client; +import java.io.BufferedInputStream; import java.io.BufferedReader; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -21,10 +23,7 @@ import java.net.UnknownHostException; import java.text.MessageFormat; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import javax.xml.bind.JAXB; import javax.xml.parsers.DocumentBuilder; @@ -63,11 +62,11 @@ import org.jboss.tools.deltacloud.core.client.request.ListRealmsRequest; import org.jboss.tools.deltacloud.core.client.request.PerformInstanceActionRequest; import org.jboss.tools.deltacloud.core.client.request.TypeRequest; +import org.jboss.tools.deltacloud.core.client.unmarshal.InstanceUnmarshaller; import org.jboss.tools.deltacloud.core.client.unmarshal.KeyUnmarshaller; import org.jboss.tools.deltacloud.core.client.unmarshal.KeysUnmarshaller; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; @@ -81,9 +80,6 @@ private static final String DOCUMENT_ELEMENT_DRIVER = "driver"; private static final String DOCUMENT_ELEMENT_API = "api"; - private static final Pattern ELEMENT_TEXTVALUE_REGEX = - Pattern.compile("[^\n\t ]+[^\n]+"); - public static enum DeltaCloudServerType { UNKNOWN, MOCK, EC2 } @@ -281,7 +277,7 @@ @Override public Instance createInstance(String imageId) throws DeltaCloudClientException { try { - return buildInstance(requestStringResponse(new CreateInstanceRequest(baseUrl, imageId))); + return buildInstance(request(new CreateInstanceRequest(baseUrl, imageId))); } catch (DeltaCloudClientException e) { throw e; } catch (Exception e) { @@ -298,9 +294,9 @@ public Instance createInstance(String name, String imageId, String profileId, String realmId, String keyId, String memory, String storage) throws DeltaCloudClientException { try { - String response = requestStringResponse( + InputStream inputStream = request( new CreateInstanceRequest(baseUrl, name, imageId, profileId, realmId, keyId, memory, storage)); - Instance instance = buildInstance(response); + Instance instance = buildInstance(inputStream); // TODO: WORKAROUND for // https://issues.jboss.org/browse/JBIDE-8005 if (keyId != null) { @@ -434,7 +430,7 @@ @Override public Instance listInstances(String instanceId) throws DeltaCloudClientException { try { - return buildInstance(requestStringResponse(new ListInstanceRequest(baseUrl, instanceId))); + return buildInstance(request(new ListInstanceRequest(baseUrl, instanceId))); } catch (DeltaCloudClientException e) { throw e; } catch (Exception e) { @@ -521,107 +517,19 @@ return key; } - private Instance updateInstance(String xml, Instance instance) throws Exception { - Document document = getDocument(xml); - instance.setId(getAttributeValues(document, "instance", "id").get(0)); - instance.setName(getElementTextValues(document, "name").get(0)); - updateOwnerId(instance, document); - instance.setImageId(getIdFromHref(getAttributeValues(document, "image", "href").get(0))); //$NON-NLS-1$ //$NON-NLS-2$ - instance.setProfileId(getIdFromHref(getAttributeValues(document, "hardware_profile", "href").get(0))); //$NON-NLS-1$ //$NON-NLS-2$ - updateProfileProperties(instance, 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$ - updateKeyname(document, instance); - instance.setActions(createInstanceActions(instance, document)); - instance.setPublicAddresses( - new AddressList(getElementTextValues(document, "public_addresses"))); - instance.setPrivateAddresses( - new AddressList(getElementTextValues(document, "private_addresses"))); - return instance; + private Instance updateInstance(InputStream inputStream, Instance instance) throws Exception { + return new InstanceUnmarshaller().unmarshall(inputStream, instance); } - private void updateOwnerId(Instance instance, Document document) { - List<String> values = getElementTextValues(document, "owner_id"); - if (values.size() > 0) { - instance.setOwnerId(values.get(0)); - } + private Instance buildInstance(InputStream inputStream) throws Exception { + return updateInstance(inputStream, new Instance()); } - private void updateProfileProperties(Instance instance, - List<Node> propertyNodes) { - if (propertyNodes != null) { - for (Iterator<Node> i = propertyNodes.iterator(); i.hasNext();) { - Node n = i.next(); - NamedNodeMap attrs = n.getAttributes(); - String name = attrs.getNamedItem("name").getNodeValue(); //$NON-NLS-1$ - if (name.equals("memory")) { //$NON-NLS-1$ - String memory = attrs.getNamedItem("value").getNodeValue(); //$NON-NLS-1$ - if (attrs.getNamedItem("unit") != null) { //$NON-NLS-1$ - memory += " " + attrs.getNamedItem("unit").getNodeValue(); //$NON-NLS-1$ - } - instance.setMemory(memory); - } else if (name.equals("storage")) { //$NON-NLS-1$ - String storage = attrs.getNamedItem("value").getNodeValue(); //$NON-NLS-1$ - if (attrs.getNamedItem("unit") != null) { //$NON-NLS-1$ - storage += " " + attrs.getNamedItem("unit").getNodeValue(); //$NON-NLS-1$ - } - instance.setStorage(storage); - } else if (name.equals("cpu")) { //$NON-NLS-1$ - String cpu = attrs.getNamedItem("value").getNodeValue(); //$NON-NLS-1$ - instance.setCPU(cpu); - } - } - } + private Instance buildInstance(String response) throws Exception { + InputStream inputStream = new BufferedInputStream(new ByteArrayInputStream(response.getBytes())); + return buildInstance(inputStream); } - private Instance buildInstance(String xml) throws Exception { - // Instance instance = JAXB.unmarshal(new - // StringReader(xml),Instance.class); - Instance instance = new Instance(); - return updateInstance(xml, instance); - } - - private List<InstanceAction> createInstanceActions(final Instance instance, - Document document) throws Exception { - final List<InstanceAction> actions = new ArrayList<InstanceAction>(); - forEachNode(document, "link", new INodeVisitor() { - - @Override - public void visit(Node node) throws Exception { - InstanceAction action = new InstanceAction(); - setActionProperties(action, node); - action.setInstance(instance); - actions.add(action); - } - }); - return actions; - } - - private void setActionProperties( - final AbstractDeltaCloudResourceAction action, Node node) - throws DeltaCloudClientException { - NamedNodeMap attributes = node.getAttributes(); - String name = getAttributeTextContent("rel", attributes, node); - action.setName(name); - String url = getAttributeTextContent("href", attributes, node); - action.setUrl(url); - String method = getAttributeTextContent("method", attributes, node); - action.setMethod(method); - } - - private String getAttributeTextContent(String attributeName, - NamedNodeMap namedNodeMap, Node node) - throws DeltaCloudClientException { - Node attributeNode = namedNodeMap.getNamedItem(attributeName); - if (attributeNode == null) { - throw new DeltaCloudClientException(MessageFormat.format( - "Could not find attribute {0} in node {1}", attributeName, - node.getNodeName())); - } - - return attributeNode.getTextContent(); - } - private HardwareProfile buildHardwareProfile(String xml) throws DeltaCloudClientException { try { @@ -679,40 +587,6 @@ return null; } - private void forEachNode(Document document, String tagName, - INodeVisitor visitor) throws Exception { - NodeList elements = document.getElementsByTagName(tagName); - for (int i = 0; i < elements.getLength(); i++) { - visitor.visit(elements.item(i)); - } - } - - private List<String> getAttributeValues(Document document, - String elementName, String attributeName) { - NodeList elements = document.getElementsByTagName(elementName); - ArrayList<String> values = new ArrayList<String>(); - for (int i = 0; i < elements.getLength(); i++) { - values.add(elements.item(i).getAttributes() - .getNamedItem(attributeName).getTextContent()); - } - return values; - } - - private List<String> getElementTextValues(Document document, - String elementName) { - NodeList elements = document.getElementsByTagName(elementName); - ArrayList<String> values = new ArrayList<String>(); - for (int i = 0; i < elements.getLength(); i++) { - String textValue = elements.item(i).getTextContent(); - Matcher matcher = ELEMENT_TEXTVALUE_REGEX.matcher(textValue); - if (matcher.find()) { - String group = matcher.group(); - values.add(group); - } - } - return values; - } - private List<Node> getPropertyNodes(Document document, String elementName) { NodeList elements = document.getElementsByTagName(elementName); ArrayList<Node> values = new ArrayList<Node>(); @@ -728,34 +602,6 @@ return values; } - 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); - NamedNodeMap attrs = element.getAttributes(); - Node type = attrs.getNamedItem("type"); //$NON-NLS-1$ - if (type.getNodeValue().equals("key")) { //$NON-NLS-1$ - NodeList children = element.getChildNodes(); - for (int j = 0; j < children.getLength(); ++j) { - Node child = children.item(j); - if (child.getNodeName().equals("login")) { //$NON-NLS-1$ - NodeList loginChildren = child.getChildNodes(); - for (int k = 0; k < loginChildren.getLength(); ++k) { - Node loginChild = loginChildren.item(k); - if (loginChild.getNodeName().equals("keyname")) { //$NON-NLS-1$ - instance.setKeyId(loginChild.getTextContent()); - } - } - } - } - } - } - } - - private String getIdFromHref(String href) { - return href.substring(href.lastIndexOf("/") + 1, href.length()); - } - private <T extends AbstractDeltaCloudObject> List<T> listDeltaCloudObjects(Class<T> clazz, AbstractListObjectsRequest request, String elementName) throws DeltaCloudClientException { try { @@ -795,15 +641,15 @@ public boolean performInstanceAction(InstanceAction action) throws DeltaCloudClientException { if (action != null) { try { - String response = requestStringResponse(new PerformInstanceActionRequest( + InputStream inputStream = request(new PerformInstanceActionRequest( new URL(action.getUrl()), action.getMethod())); if (!InstanceAction.DESTROY.equals(action.getName())) { - updateInstance(response, action.getInstance()); + updateInstance(inputStream, action.getOwner()); } } catch (MalformedURLException e) { throw new DeltaCloudClientException( MessageFormat.format("Could not perform action {0} on instance {1}", action.getName(), action - .getInstance().getName()), e); + .getOwner().getName()), e); } catch (DeltaCloudClientException e) { throw e; } catch (Exception e) { @@ -824,8 +670,4 @@ throw new DeltaCloudClientException("Error transforming node to string", e); } } - - private interface INodeVisitor { - public void visit(Node node) throws Exception; - } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/IDeltaCloudResourceAction.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/IDeltaCloudResourceAction.java 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/IDeltaCloudResourceAction.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -14,7 +14,7 @@ /** * @author André Dietisheim */ -public interface IDeltaCloudResourceAction { +public interface IDeltaCloudResourceAction<OWNER> { public static final String DESTROY = "destroy"; @@ -23,5 +23,7 @@ public String getUrl(); public HttpMethod getMethod(); + + public OWNER getOwner(); } \ No newline at end of file Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/IInstanceAction.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/IInstanceAction.java 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/IInstanceAction.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -10,12 +10,10 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core.client; -public interface IInstanceAction extends IDeltaCloudResourceAction { +public interface IInstanceAction extends IDeltaCloudResourceAction<Instance> { public static final String START = "start"; public static final String STOP = "stop"; public static final String REBOOT = "reboot"; - public Instance getInstance(); - } \ No newline at end of file Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/IKeyAction.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/IKeyAction.java 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/IKeyAction.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -1,20 +0,0 @@ -/******************************************************************************* - * 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.deltacloud.core.client; - -/** - * @author André Dietisheim - */ -public interface IKeyAction extends IDeltaCloudResourceAction { - - public Key getKey(); - -} \ No newline at end of file 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 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -19,7 +19,7 @@ * @author Martyn Taylor * @author Andre Dietisheim */ -public class Instance extends AbstractDeltaCloudObject { +public class Instance extends AbstractDeltaCloudActionAwareObject<InstanceAction> { private static final long serialVersionUID = 1L; @@ -50,8 +50,6 @@ @XmlElement private InstanceState state; - private List<InstanceAction> actions; - @XmlElement(name = "public_addresses") private AddressList publicAddresses; @@ -61,19 +59,19 @@ public Instance() { } - protected void setOwnerId(String ownerId) { + public void setOwnerId(String ownerId) { this.ownerId = ownerId; } - protected void setName(String name) { + public void setName(String name) { this.name = name; } - protected void setImageId(String imageId) { + public void setImageId(String imageId) { this.imageId = imageId; } - protected void setProfileId(String profileId) { + public void setProfileId(String profileId) { this.profileId = profileId; } @@ -89,15 +87,11 @@ this.cpu = cpu; } - protected void setRealmId(String realmId) { + public void setRealmId(String realmId) { this.realmId = realmId; } - protected void setActions(List<InstanceAction> actions) { - this.actions = actions; - } - - protected void setState(String state) { + public void setState(String state) { try { this.state = InstanceState.valueOf(state); } catch (Exception e) { @@ -105,19 +99,19 @@ } } - protected void setKeyId(String keyId) { + public void setKeyId(String keyId) { this.keyId = keyId; } - + public String getKeyId() { return keyId; } - - protected void setPrivateAddresses(AddressList privateAddresses) { + + public void setPrivateAddresses(AddressList privateAddresses) { this.privateAddresses = privateAddresses; } - protected void setPublicAddresses(AddressList publicAddresses) { + public void setPublicAddresses(AddressList publicAddresses) { this.publicAddresses = publicAddresses; } @@ -157,13 +151,9 @@ return state; } - public List<InstanceAction> getActions() { - return actions; - } - public List<String> getActionNames() { ArrayList<String> names = new ArrayList<String>(); - for (InstanceAction action : actions) { + for (InstanceAction action : getActions()) { names.add(action.getName()); } return names; @@ -174,7 +164,7 @@ return null; } - for (InstanceAction action : actions) { + for (InstanceAction action : getActions()) { if (name.equals(action.getName())) { return action; } @@ -185,7 +175,7 @@ public boolean canStart() { return getAction(IInstanceAction.START) != null; } - + public boolean canStop() { return getAction(IInstanceAction.STOP) != null; } @@ -244,11 +234,14 @@ } s += "State:\t\t" + getState() + "\n"; - for (int i = 0; i < actions.size(); i++) { - if (i == 0) { - s += "Actions:\t" + actions.get(i) + "\n"; - } else { - s += "\t\t" + actions.get(i) + "\n"; + List<InstanceAction> actions = getActions(); + if (actions != null) { + for (int i = 0; i < actions.size(); i++) { + if (i == 0) { + s += "Actions:\t" + actions.get(i) + "\n"; + } else { + s += "\t\t" + actions.get(i) + "\n"; + } } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/InstanceAction.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/InstanceAction.java 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/InstanceAction.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -20,24 +20,12 @@ * @see DeltaCloudClient#performInstanceAction(String, String); * */ -public class InstanceAction extends AbstractDeltaCloudResourceAction implements IInstanceAction { +public class InstanceAction extends AbstractDeltaCloudResourceAction<Instance> implements IInstanceAction { - private Instance instance; - - protected InstanceAction() { - super(); + public InstanceAction() { } - public void setInstance(Instance instance) { - this.instance = instance; - } - @Override - public Instance getInstance() { - return instance; - } - - @Override public String toString() { return "InstanceAction [name=" + getName() + ", url=" + getUrl() + ", method=" + getMethod() + "]"; } 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 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Key.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -12,12 +12,11 @@ import java.net.MalformedURLException; import java.net.URL; -import java.util.List; /** * @author Andre Dietisheim */ -public class Key extends AbstractDeltaCloudObject { +public class Key extends AbstractDeltaCloudActionAwareObject<KeyAction> { private static final long serialVersionUID = 1L; @@ -25,7 +24,6 @@ private String pem; private String fingerprint; private String state; - private List<KeyAction> actions; public Key() { } @@ -50,10 +48,6 @@ this.state = state; } - public void setActions(List<KeyAction> actions) { - this.actions = actions; - } - public URL getUrl() { return url; } @@ -70,14 +64,10 @@ return state; } - 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() + "]"; + + getActions() + ", toString()=" + super.toString() + "]"; } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/KeyAction.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/KeyAction.java 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/KeyAction.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -17,20 +17,9 @@ * * @author André Dietisheim */ -public class KeyAction extends AbstractDeltaCloudResourceAction implements IKeyAction { +public class KeyAction extends AbstractDeltaCloudResourceAction<Key> { - private Key key; - public KeyAction() { super(); } - - public void setKey(Key key) { - this.key = key; - } - - @Override - public Key getKey() { - return key; - } } Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractActionUnmarshaller.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractActionUnmarshaller.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractActionUnmarshaller.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -0,0 +1,35 @@ +/******************************************************************************* + * 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.deltacloud.core.client.unmarshal; + +import org.jboss.tools.deltacloud.core.client.AbstractDeltaCloudResourceAction; +import org.w3c.dom.Element; + +/** + * @author André Dietisheim + */ +public class AbstractActionUnmarshaller +<ACTION extends AbstractDeltaCloudResourceAction> extends AbstractDOMUnmarshaller<ACTION> { + + public AbstractActionUnmarshaller(Class<ACTION> actionClass) { + super("link", actionClass); + } + + @Override + protected ACTION doUnmarshall(Element element, ACTION action) throws Exception { + if (element != null) { + action.setMethod(getAttributeText("method", element)); + action.setName(getAttributeText("rel", element)); + action.setUrl(getAttributeText("href", element)); + } + return action; + } +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractActionUnmarshaller.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMActionAwareUnmarshaller.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMActionAwareUnmarshaller.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMActionAwareUnmarshaller.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -0,0 +1,61 @@ +/******************************************************************************* + * 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.deltacloud.core.client.unmarshal; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.deltacloud.core.client.AbstractDeltaCloudResourceAction; +import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * @author André Dietisheim + * + * @param <DELTACLOUDOBJECT> + */ +public abstract class AbstractDOMActionAwareUnmarshaller<DELTACLOUDOBJECT, ACTION extends AbstractDeltaCloudResourceAction<DELTACLOUDOBJECT>> extends AbstractDOMUnmarshaller<DELTACLOUDOBJECT>{ + + private String actionElementName; + public AbstractDOMActionAwareUnmarshaller(String tagName, Class<DELTACLOUDOBJECT> type, String actionElementName) { + super(tagName, type); + this.actionElementName = actionElementName; + } + + protected List<ACTION> getActions(Element element, DELTACLOUDOBJECT owner) throws DeltaCloudClientException { + if (element == null) { + return null; + } + List<ACTION> actions = new ArrayList<ACTION>(); + NodeList nodeList = element.getElementsByTagName(actionElementName); + for (int i = 0; i < nodeList.getLength(); i++) { + Node linkNode = nodeList.item(i); + ACTION action = createAction(linkNode); + if (action != null) { + action.setOwner(owner); + actions.add(action); + } + } + return actions; + } + + protected ACTION createAction(Node node) throws DeltaCloudClientException { + if (!(node instanceof Element)) { + return null; + } + return unmarshallAction((Element) node); + } + + protected abstract ACTION unmarshallAction(Element element) throws DeltaCloudClientException; +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMActionAwareUnmarshaller.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/AbstractDOMUnmarshaller.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -71,6 +71,14 @@ protected abstract DELTACLOUDOBJECT doUnmarshall(Element element, DELTACLOUDOBJECT resource) throws Exception; + protected String getFirstElementAttributeText(String elementName, String attributeId, Element element) { + Element firstElement = getFirstElement(elementName, element); + if (firstElement == null) { + return null; + } + return firstElement.getAttribute(attributeId); + } + protected String getFirstElementText(String elementName, Element element) { Element firstElement = getFirstElement(elementName, element); if (firstElement == null) { Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceActionUnmarshaller.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceActionUnmarshaller.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceActionUnmarshaller.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -0,0 +1,23 @@ +/******************************************************************************* + * 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.deltacloud.core.client.unmarshal; + +import org.jboss.tools.deltacloud.core.client.InstanceAction; + +/** + * @author André Dietisheim + */ +public class InstanceActionUnmarshaller extends AbstractActionUnmarshaller<InstanceAction> { + + public InstanceActionUnmarshaller() { + super(InstanceAction.class); + } +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceActionUnmarshaller.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -0,0 +1,84 @@ +/******************************************************************************* + * 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.deltacloud.core.client.unmarshal; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.deltacloud.core.client.AddressList; +import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException; +import org.jboss.tools.deltacloud.core.client.Instance; +import org.jboss.tools.deltacloud.core.client.InstanceAction; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * @author André Dietisheim + */ +public class InstanceUnmarshaller extends AbstractDOMActionAwareUnmarshaller<Instance, InstanceAction> { + + public InstanceUnmarshaller() { + super("instance", Instance.class, "link"); + } + + protected Instance doUnmarshall(Element element, Instance instance) throws Exception { + instance.setId(getAttributeText("id", element)); + instance.setName(getFirstElementText("name", element)); + instance.setOwnerId(getFirstElementText("owner_id", element)); + instance.setOwnerId(getFirstElementText("owner_id", element)); + instance.setImageId(getFirstElementAttributeText("image", "id", element)); + instance.setProfileId(getFirstElementAttributeText("hardware_profile", "id", element)); + instance.setRealmId(getFirstElementAttributeText("realm", "id", element)); + instance.setState(getFirstElementText("state", element)); + setKeyname(instance, element); + instance.setActions(getActions(element, instance)); + instance.setPublicAddresses(getAddressList("public_addresses", element)); + instance.setPrivateAddresses(getAddressList("private_addresses", element)); + return instance; + } + + private AddressList getAddressList(String elementName, Element element) { + Element addressElement = getFirstElement(elementName, element); + if (addressElement != null) { + NodeList addressList = addressElement.getChildNodes(); + if (addressList != null) { + List<String> addresses = new ArrayList<String>(); + for (int i = 0; i < addressList.getLength(); i++) { + Node addressNode = addressList.item(i); + if (addressNode != null) { + addresses.add(addressNode.getTextContent()); + } + } + return new AddressList(addresses); + } + } + return new AddressList(); + } + + private void setKeyname(Instance instance, Element element) { + Element authenticationElement = getFirstElement("authentication", element); + if (authenticationElement != null) { + Element loginElement = getFirstElement("login", authenticationElement); + if (loginElement != null) { + String keyname = getFirstElementText("keyname", loginElement); + instance.setKeyId(keyname); + } + } + } + + @Override + protected InstanceAction unmarshallAction(Element element) throws DeltaCloudClientException { + InstanceAction action = new InstanceAction(); + new InstanceActionUnmarshaller().unmarshall(element, action); + return action; + } +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/InstanceUnmarshaller.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/KeyActionUnmarshaller.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/KeyActionUnmarshaller.java 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/KeyActionUnmarshaller.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -11,24 +11,13 @@ package org.jboss.tools.deltacloud.core.client.unmarshal; import org.jboss.tools.deltacloud.core.client.KeyAction; -import org.w3c.dom.Element; /** * @author André Dietisheim */ -public class KeyActionUnmarshaller extends AbstractDOMUnmarshaller<KeyAction> { +public class KeyActionUnmarshaller extends AbstractActionUnmarshaller<KeyAction> { public KeyActionUnmarshaller() { - super("link", KeyAction.class); + super(KeyAction.class); } - - @Override - protected KeyAction doUnmarshall(Element element, KeyAction keyAction) throws Exception { - if (element != null) { - keyAction.setMethod(getAttributeText("method", element)); - keyAction.setName(getAttributeText("rel", element)); - keyAction.setUrl(getAttributeText("href", element)); - } - return keyAction; - } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/KeyUnmarshaller.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/KeyUnmarshaller.java 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/KeyUnmarshaller.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -13,23 +13,19 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; -import java.util.ArrayList; -import java.util.List; import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException; import org.jboss.tools.deltacloud.core.client.Key; import org.jboss.tools.deltacloud.core.client.KeyAction; import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * @author André Dietisheim */ -public class KeyUnmarshaller extends AbstractDOMUnmarshaller<Key> { +public class KeyUnmarshaller extends AbstractDOMActionAwareUnmarshaller<Key, KeyAction> { public KeyUnmarshaller() { - super("key", Key.class); + super("key", Key.class, "link"); } protected Key doUnmarshall(Element element, Key key) throws Exception { @@ -39,7 +35,7 @@ key.setState(getFirstElementText("state", element)); key.setFingerprint(getFirstElementText("fingerprint", element)); key.setPem(trimPem(getPem(element))); //$NON-NLS-1$ - key.setActions(getKeyActions(element, key)); + key.setActions(getActions(element, key)); } return key; } @@ -50,7 +46,6 @@ return getFirstElementText("pem", pemElement); } return null; - } private String trimPem(String pem) throws IOException { @@ -72,31 +67,10 @@ return sb.toString(); } - - private List<KeyAction> getKeyActions(Element keyElement, Key key) throws DeltaCloudClientException { - if (keyElement == null) { - return null; - } - List<KeyAction> actions = new ArrayList<KeyAction>(); - NodeList nodeList = keyElement.getElementsByTagName("link"); - for (int i = 0; i < nodeList.getLength(); i++) { - Node linkNode = nodeList.item(i); - KeyAction keyAction = createKeyAction(linkNode); - if (keyAction != null) { - keyAction.setKey(key); - actions.add(keyAction); - } - } - return actions; - } - - private KeyAction createKeyAction(Node node) throws DeltaCloudClientException { - if (!(node instanceof Element)) { - return null; - } + @Override + protected KeyAction unmarshallAction(Element element) throws DeltaCloudClientException { KeyAction keyAction = new KeyAction(); - new KeyActionUnmarshaller().unmarshall((Element) node, keyAction); + new KeyActionUnmarshaller().unmarshall(element, keyAction); return keyAction; } - } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2011-01-06 21:23:48 UTC (rev 27956) @@ -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.emf.ecore.xmi@default:default,org.eclipse.jst.j2ee.jca.ui@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui@default:default,org.eclipse.jst.jee.ui@default:default,org.eclipse.debug.ui@default:default,org.eclipse.jst.j2ee.web@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.swt@default:default,javax.servlet@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.emf.common@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.wst.validation@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.variables@default:default,org.eclipse.core.commands@default:default,org.eclipse.team.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.ht! tp.servlet@default:default,org.eclipse.ui.console@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.pde.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.rse.core@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.common@2:true,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.wst.web.ui@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.tm.terminal.telnet@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.wst.css.core@default:default,org.apache.commons.net@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.cor! e.net@default:default,org.eclipse.core.runtime.compatibility@d! efault:d efault,org.apache.xml.serializer@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jst.server.core@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.core.runtime@default:true,org.eclipse.update.configurator@3:true,org.hamcrest.core@default:default,com.jcraft.jsch@default:default,org.eclipse.ui.forms@default:default,org.apache.xerces@default:defaul! t,org.sat4j.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.help@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.debug.core@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,javax.xml@default:default,org.eclipse.rse.ui@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse.wst.server.ui@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.sat4j.pb@default:default,org.eclipse.core.resources@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.osgi.util@default:default,org.eclipse.ecf.identity@default:d! efault,org.eclipse.jdt.launching@default:default,org.eclipse.e! quinox.r egistry@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.text@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.jem.util@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.jst.server.ui@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.navigator@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ecf@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.wst.server.ui.doc.user@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.expressions@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.ui.intro@default:default,org.eclip! se.wst.common.project.facet.ui@default:default,org.eclipse.jem@default:default,org.eclipse.wst.common.ui@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui.browser@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jst.j2ee.ui@default:default,org.apache.xml.resolver@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.ui.editors@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.apache.lucene@default:default,org.eclipse.jface.text@default:default,org.eclipse.jdt.debug@default:default,org.apache.commons.el@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.html.ui@default:! default,org.eclipse.update.core@default:default,org.eclipse.ws! t.common .frameworks@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.junit4@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.jsch.core@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.p2.operations@default:default,org.eclipse.jst.common.project.facet.core@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.sdk@default:default,org.eclipse.rse.services@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.e! core.change@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.jst.common.frameworks@default:default,org.mortbay.jetty.util@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.pde.build@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jst.jee@default:default,org.eclipse.rse.services.ssh@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jsch.ui@default:default,org.eclipse.compare@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.apache.lucene.analysis@default:default,org.eclipse.tm.terminal.ssh@default:default,org.eclips! e.equinox.p2.metadata.repository@default:default,org.eclipse.e! mf.edit@ default:default,org.eclipse.core.databinding@default:default,org.eclipse.help.base@default:default,com.ibm.icu@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.apache.ant@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.net.linux.x86_64@default:false,javax.servlet.jsp@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.web@default:default,org.apache.jasper@default:default,org.eclipse.jface@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.tm.terminal.view@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.jst.j2ee@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.jdt@default:default,org.eclipse.rse.! services.files.ftp@default:default,org.eclipse.jst.common.ui@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.app@default:default,org.eclipse.rse.services.local@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.usage@default:default,org.jboss.ide.eclipse.archives.core@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.as.ui@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.tools.common@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.ide.eclipse.as.rse.ui@default:default,org.jboss.tools.jmx.core@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.update.core@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.resources@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.osgi.util@default:default,org.junit4@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.pde.core@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.help.base@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.tm.terminal.telnet@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.compare.core@default! :default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.apache.xml.serializer@default:default,org.eclipse.jst.servlet.ui@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.jst.j2ee.web@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.sdk@default:default,org.eclipse.wst.common.emf@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.editors@default:default,org.eclipse.jst.jee.ui@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.tm.terminal.ssh@default:default,org.eclipse.equinox.common@2:true,org.eclipse.jem@default:default,org.eclipse.jst.common.projec! t.facet.core@default:default,org.eclipse.debug.ui@default:defa! ult,org. eclipse.ecf.filetransfer@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.wst.common.modulecore@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.text@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.wst.validation@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jst.jee@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.wst.common.ui@default:default,org.apache.xml.resolver@default:default,org.eclipse.pde.build@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jface@default:default,org.eclipse.rse.files.ui@default:default,org.e! clipse.ui.intro@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt@default:default,org.eclipse.jst.j2ee.jca.ui@default:default,org.sat4j.core@default:default,org.eclipse.search@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.core.filesystem@default:default,javax.servlet.jsp@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jdt.junit@d! efault:default,org.eclipse.jem.util@default:default,org.eclips! e.jdt.de bug@default:default,org.apache.lucene@default:default,org.eclipse.ui.browser@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.xml.core@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ui.ide@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.tm.terminal.view@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ui.views@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.wst.server.core@default:default,org.apache.xerces@default:default,org.eclipse.jst.server.ui@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.core.databinding.property@default! :default,org.eclipse.wst.server.ui.doc.user@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.core.commands@default:default,org.eclipse.rse.core@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.sat4j.pb@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.rse.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui.ide.application@default:def! ault,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.ss! e.core@d efault:default,org.apache.commons.el@default:default,org.eclipse.core.expressions@default:default,org.eclipse.wst.web.ui@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.eclipse.core.runtime@default:true,org.eclipse.wst.jsdt.core@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.console@default:default,org.eclipse.jst.common.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.rse.services@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.jst.server.core@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.wst.co! mmon.emfworkbench.integration@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.rse.services.ssh@default:default,javax.xml@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.jface.text@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.jst.common.frameworks@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jst.j2ee@default:default,com.jcraft.jsch@default:default,org.apache.lucene.analysis@default:defa! ult,org.eclipse.jdt.core.manipulation@default:default,org.apac! he.ant@d efault:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.help.ui@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.ui@default:default,javax.servlet@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.compare@default:default,org.apache.commons.net@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.help@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.team.ui@default:default,org.eclipse.wst.server.ui@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.wst.web@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.equinox.app@default:default,org.eclipse.co! re.runtime.compatibility.registry@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.jsch.core@default:default,org.eclipse.ui.forms@default:default,org.apache.jasper@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.wst.jsdt.manipulation@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.ide.eclipse.as.rse.ui@default:default,org.jboss.tools.common@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.deltacloud.integration@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> <booleanAttribute key="tracing" value="false"/> Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceDomUnmarshallingTest.launch =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceDomUnmarshallingTest.launch (rev 0) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceDomUnmarshallingTest.launch 2011-01-06 21:23:48 UTC (rev 27956) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="append.args" value="true"/> +<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> +<booleanAttribute key="default" value="false"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.ide.eclipse.as.wtp.ui,org.jboss.tools.ui.bot.ext,org.jboss.ide.eclipse.as.core,org.jboss.tools.common.projecttemplates,org.jboss.ide.eclipse.as.rse.core,org.jboss.tools.tests.performance,org.jboss.tools.common.el.core,org.jboss.ide.eclipse.as.ui.mbeans,org.jboss.tools.common.gef,org.jboss.ide.eclipse.as.archives.integration.test,org.jboss.tools.common.verification.test,org.jboss.ide.eclipse.archives.core,org.jboss.tools.common.verification,org.jboss.ide.eclipse.archives.jdt.integration,org.jboss.tools.jmx.core.test,org.jboss.tools.common.model,org.jboss.ide.eclipse.as.classpath.core,org.jboss.ide.eclipse.archives.test,org.jboss.ide.eclipse.as.classpath.ui,org.jboss.tools.deltacloud.integration,org.jboss.tools.common.ui,org.jboss.tools.common.text.ext,org.jboss.tools.jmx.ui,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.tests,org.jbos! s.tools.common.text.xml,org.jboss.ide.eclipse.as.ui.test,org.jboss.tools.common.meta.ui,org.jboss.ide.eclipse.archives.webtools,org.jboss.tools.deltacloud.docs,org.jboss.tools.common.verification.ui.test,org.jboss.ide.eclipse.as.rse.ui,org.jboss.tools.common.verification.ui,org.jboss.ide.eclipse.as.wtp.core,org.jboss.tools.common.test,org.jboss.tools.deltacloud.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.eclipse.jsch.ui,org.jboss.ide.eclipse.archives.ui,org.jboss.ide.eclipse.as.test,org.jboss.tools.common.el.ui,org.jboss.tools.jmx.ui.test,org.jboss.ide.eclipse.as.ssh,org.jboss.tools.common.resref.ui,org.jboss.ide.eclipse.as.ui,org.jboss.ide.eclipse.archives.ui.test,org.jboss.ide.eclipse.as.doc.user,org.jboss.tools.jmx.core,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceDomUnmarshallingTest.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.internal.deltacloud.test.core.client.InstanceDomUnmarshallingTest"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.deltacloud.test"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<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"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.core@default:default,org.eclipse.core.resources@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.compare.core@default:default,org.apache.xml.serializer@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.emf.common@default:default,org.eclipse.wst.common.emf@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.common@2:true,org.eclipse.debug.ui@default:default,org.eclipse.ecf.filetransfer@default:default! ,org.eclipse.team.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.text@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.hamcrest.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.wst.validation@default:default,org.eclipse.jdt.compiler.apt@default:false,org.apache.xml.resolver@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jface@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.core@default:default,org.eclipse.search@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclips! e.equinox.concurrent@default:default,org.eclipse.wst.common.pr! oject.fa cet.core@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.wst.xml.core@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.views@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.security@default:default,org.apache.xerces@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.core.commands@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse! .wst.sse.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ecf@default:default,org.eclipse.ui.console@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,javax.xml@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.debug.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.jface.text@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.jobs@default:default,javax.servlet@default:default,org.eclipse.ui@default:default,org.eclipse.compare@default:default,org.eclipse.help@default:default! ,org.eclipse.core.filebuffers@default:default,org.eclipse.team! .ui@defa ult:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.ui.forms@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.gwt.ui@default:default,com.jboss.jbds.usage.branding@default:default,org.jboss.tools.gwt.core@default:default,org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="false"/> +<booleanAttribute key="useProduct" value="false"/> +</launchConfiguration> Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceDomUnmarshallingTest.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/KeyDomUnmarshallingTest.launch =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/KeyDomUnmarshallingTest.launch 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/KeyDomUnmarshallingTest.launch 2011-01-06 21:23:48 UTC (rev 27956) @@ -12,7 +12,7 @@ <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> <booleanAttribute key="default" value="false"/> -<stringAttribute key="deselected_workspace_plugins" value="org.jboss.ide.eclipse.as.wtp.ui,org.eclipse.rse.subsystems.shells.ssh,org.jboss.tools.ui.bot.ext,org.jboss.ide.eclipse.as.core,org.jboss.tools.common.projecttemplates,org.jboss.ide.eclipse.as.rse.core,org.jboss.tools.tests.performance,org.jboss.ide.eclipse.as.ui.mbeans,org.jboss.tools.common.el.core,org.jboss.tools.common.gef,org.jboss.ide.eclipse.as.archives.integration.test,org.jboss.tools.common.verification.test,org.jboss.ide.eclipse.archives.core,org.jboss.tools.common.verification,org.jboss.tools.jmx.core.test,org.jboss.ide.eclipse.archives.jdt.integration,org.jboss.tools.common.model,org.jboss.ide.eclipse.as.classpath.core,org.eclipse.ui.net,org.jboss.ide.eclipse.archives.test,org.jboss.ide.eclipse.as.classpath.ui,org.jboss.tools.deltacloud.integration,org.jboss.tools.common.ui,org.jboss.tools.common.text.ext,org.jboss.tools.jmx.ui,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.el.core.test,org.jboss.! tools.common.model.ui.test,org.jboss.tools.tests,org.jboss.tools.common.text.xml,org.jboss.ide.eclipse.as.ui.test,org.jboss.tools.common.meta.ui,org.jboss.ide.eclipse.archives.webtools,org.jboss.tools.deltacloud.docs,org.jboss.ide.eclipse.as.rse.ui,org.eclipse.jsch.core,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.verification.ui,org.jboss.ide.eclipse.as.wtp.core,org.jboss.tools.common.test,org.jboss.tools.deltacloud.ui,org.eclipse.rse.connectorservice.ssh,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.eclipse.jsch.ui,org.eclipse.rse.subsystems.files.ssh,org.jboss.ide.eclipse.archives.ui,org.jboss.ide.eclipse.as.test,org.jboss.tools.common.el.ui,org.jboss.tools.jmx.ui.test,org.jboss.ide.eclipse.as.ssh,org.eclipse.rse.services.ssh,org.jboss.tools.common.resref.ui,org.jboss.ide.eclipse.as.ui,org.jboss.ide.eclipse.as.doc.user,org.jboss.ide.eclipse.archives.ui.test,org.jboss.tools.jmx.core,org.jboss.tools.common.model.u! i,org.jboss.tools.common.model.test"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.ide.eclipse.as.wtp.ui,org.jboss.tools.ui.bot.ext,org.jboss.ide.eclipse.as.core,org.jboss.tools.common.projecttemplates,org.jboss.ide.eclipse.as.rse.core,org.jboss.tools.tests.performance,org.jboss.tools.common.el.core,org.jboss.ide.eclipse.as.ui.mbeans,org.jboss.tools.common.gef,org.jboss.ide.eclipse.as.archives.integration.test,org.jboss.tools.common.verification.test,org.jboss.ide.eclipse.archives.core,org.jboss.tools.common.verification,org.jboss.ide.eclipse.archives.jdt.integration,org.jboss.tools.jmx.core.test,org.jboss.tools.common.model,org.jboss.ide.eclipse.as.classpath.core,org.jboss.ide.eclipse.archives.test,org.jboss.ide.eclipse.as.classpath.ui,org.jboss.tools.deltacloud.integration,org.jboss.tools.common.ui,org.jboss.tools.common.text.ext,org.jboss.tools.jmx.ui,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.tests,org.jbos! s.tools.common.text.xml,org.jboss.ide.eclipse.as.ui.test,org.jboss.tools.common.meta.ui,org.jboss.ide.eclipse.archives.webtools,org.jboss.tools.deltacloud.docs,org.jboss.tools.common.verification.ui.test,org.jboss.ide.eclipse.as.rse.ui,org.jboss.tools.common.verification.ui,org.jboss.ide.eclipse.as.wtp.core,org.jboss.tools.common.test,org.jboss.tools.deltacloud.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.eclipse.jsch.ui,org.jboss.ide.eclipse.archives.ui,org.jboss.ide.eclipse.as.test,org.jboss.tools.common.el.ui,org.jboss.tools.jmx.ui.test,org.jboss.ide.eclipse.as.ssh,org.jboss.tools.common.resref.ui,org.jboss.ide.eclipse.as.ui,org.jboss.ide.eclipse.archives.ui.test,org.jboss.ide.eclipse.as.doc.user,org.jboss.tools.jmx.core,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -37,8 +37,8 @@ <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.sdk.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.text@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.swt@default:default,org.eclipse.ui@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.security@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.common@default:default,org.eclipse.jdt.ui@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.sse.core@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.metadata.! repository@default:default,org.eclipse.osgi,org.eclipse.team.ui@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.emf.ecore.xmi@default:default,javax.servlet@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.common@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.runtime@default:true,org.eclipse.wst.common.environment@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.e! clipse.ecf@default:default,org.eclipse.core.runtime.compatibil! ity.regi stry@default:false,org.eclipse.osgi.util@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.xml.serializer@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.jdt.core@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.resources@default:default,org.eclipse.search@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.wst.common.project.facet.core@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclip! se.jface.text@default:default,org.eclipse.ui.editors@default:default,org.eclipse.core.net@default:default,org.eclipse.jem.util@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ui.console@default:default,com.ibm.icu@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui.forms@default:default,org.hamcrest.core@default:default,org.eclipse.ecf.identity@default:default,javax.xml@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.emf.edit@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.apache.xerces@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.jface@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.p2.metadata@! default:default,org.eclipse.compare@default:default,org.eclips! e.jdt.co mpiler.tool@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.compare.core@default:default,org.eclipse.help@default:default,org.eclipse.core.variables@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.common@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.core@default:default,org.eclipse.core.resources@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.compare.core@default:default,org.apache.xml.serializer@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.emf.common@default:default,org.eclipse.wst.common.emf@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.common@2:true,org.eclipse.debug.ui@default:default,org.eclipse.ecf.filetransfer@default:default! ,org.eclipse.team.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.text@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.hamcrest.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.wst.validation@default:default,org.eclipse.jdt.compiler.apt@default:false,org.apache.xml.resolver@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jface@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.core@default:default,org.eclipse.search@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclips! e.equinox.concurrent@default:default,org.eclipse.wst.common.pr! oject.fa cet.core@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.wst.xml.core@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.views@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.security@default:default,org.apache.xerces@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.core.commands@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse! .wst.sse.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ecf@default:default,org.eclipse.ui.console@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,javax.xml@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.debug.core@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.jface.text@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.jobs@default:default,javax.servlet@default:default,org.eclipse.ui@default:default,org.eclipse.compare@default:default,org.eclipse.help@default:default! ,org.eclipse.core.filebuffers@default:default,org.eclipse.team! .ui@defa ult:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.ui.forms@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.gwt.ui@default:default,com.jboss.jbds.usage.branding@default:default,org.jboss.tools.gwt.core@default:default,org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/KeyJAXBUnmarshallingTest.launch =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/KeyJAXBUnmarshallingTest.launch 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/KeyJAXBUnmarshallingTest.launch 2011-01-06 21:23:48 UTC (rev 27956) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> <booleanAttribute key="append.args" value="true"/> -<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> <booleanAttribute key="askclear" value="false"/> <booleanAttribute key="automaticAdd" value="true"/> <booleanAttribute key="automaticValidate" value="false"/> @@ -12,7 +11,7 @@ <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> <booleanAttribute key="default" value="false"/> -<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.ui,org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.integration,org.jboss.tools.common.model.ui.capabilities,org.eclipse.epp.usagedata.gathering,org.jboss.tools.deltacloud.docs,org.jboss.tools.usage,org.jboss.tools.usage.test,com.jboss.jbds.usage.branding,org.jboss.tools.gwt.core,org.eclipse.epp.usagedata.ui,org.jboss.tools.tests,org.jboss.tools.common.model.ui,org.jboss.tools.deltacloud.ui,org.jboss.tools.common.model"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.model,org.jboss.tools.deltacloud.integration,org.jboss.tools.usage,org.jboss.tools.usage.test,org.jboss.tools.tests,org.jboss.tools.deltacloud.docs,com.jboss.jbds.usage.branding,org.jboss.tools.deltacloud.ui,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.gwt.core,org.jboss.tools.common.model.ui"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -22,8 +21,8 @@ <listEntry value="1"/> </listAttribute> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> -<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> </listAttribute> <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> @@ -37,8 +36,8 @@ <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.sdk.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.ecf.identity@default:default,org.eclipse.jface.databinding@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.equinox.concurrent@default:default,org.apache.xml.serializer@default:default,org.eclipse.equinox.common@2:true,org.eclipse.emf.edit@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.jface.text@default:default,org.eclipse.emf.common@default:default,org.apache.xml.resolver@default:default,org.eclipse.osgi@-1:true,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.core.expressions@default:default,org.eclipse.jem.util@default:default,org.eclipse.core.variables@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.datab! inding@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.jdt.core@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.update.configurator@3:true,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.team.ui@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.p2.core@default:default,com.ibm.icu@default:default,org.eclipse.ui.editors@default:default,org.eclipse.core.filebuffers@default:default,org.apache.lucene@default:default,or! g.hamcrest.core@default:default,org.eclipse.core.databinding.o! bservabl e@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.preferences@default:default,org.mortbay.jetty.util@default:default,org.eclipse.debug.ui@default:default,org.eclipse.equinox.p2.engine@default:default,javax.servlet@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.ui@default:default,javax.xml@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.jdt.core.manipulation@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.wst.common.framewo! rks@default:default,org.eclipse.help@default:default,org.junit4@default:default,org.eclipse.ui.views@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.security@default:default,org.eclipse.swt@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.help.base@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.runtime@default:true,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help.ui@default:default,org.eclipse.ecf@default:default,org.eclipse.team.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.tex! t@default:default,org.eclipse.ui.ide@default:default,org.eclip! se.jface @default:default,org.eclipse.jdt.compiler.tool@default:false,org.apache.ant@default:default,org.eclipse.search@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.jdt.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.apache.lucene.analysis@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.apache.jasper@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.core.resources@default:default,org.eclipse.osgi.util@default:default,org.apache.xerces@default:default,org.eclipse.sdk@default:default,org.eclipse.debug.core@default:default,javax.servlet.jsp@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.http.jetty@default:default,o! rg.apache.commons.el@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.compare.core@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.common@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.core@default:default,org.eclipse.core.resources@default:default,org.eclipse.osgi.util@default:default,org.junit4@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.help.base@default:default,org.eclipse.compare.core@default:default,org.apache.xml.serializer@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.emf.common@default:default,org.eclipse.sdk@default:default,org.eclipse.wst.common.emf@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.edi! tors@default:default,org.eclipse.equinox.common@2:true,org.eclipse.debug.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.text@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.hamcrest.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.wst.validation@default:default,org.eclipse.jdt.compiler.apt@default:false,org.apache.xml.resolver@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jface@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.core@default:default,org.e! clipse.search@default:default,org.eclipse.ui.views.properties.! tabbed@d efault:default,org.eclipse.core.filesystem@default:default,javax.servlet.jsp@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.debug@default:default,org.apache.lucene@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.wst.xml.core@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.views@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.security@default:default,org.apache.xerces@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.core.commands@default:default,org.eclipse.l! tk.ui.refactoring@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.wst.sse.core@default:default,org.apache.commons.el@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ecf@default:default,org.eclipse.ui.console@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,javax.xml@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.debug.core@default:default,org.eclipse.emf.ecore.chan! ge@default:default,org.eclipse.jface.text@default:default,org.! eclipse. wst.common.environment@default:default,org.eclipse.jdt.compiler.tool@default:false,org.apache.lucene.analysis@default:default,org.eclipse.jdt.core.manipulation@default:default,org.apache.ant@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.help.ui@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.jobs@default:default,javax.servlet@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.compare@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.help@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.team.ui@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.ui.forms@default:default,org.apache.jasper@defa! ult:default,org.eclipse.core.runtime.compatibility@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common.el.core.test@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.tools.ui.bot.ext.test@default:default,org.jboss.tools.ui.bot.ext@default:default,org.jboss.ide.eclipse.as.archives.integration.test@default:default,org.jboss.tools.common.test@default:default,org.jboss.ide.eclipse.archives.jdt.integration@default:default,org.jboss.tools.common.el.core@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.tools.common.ui@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.tools.common.el.ui@default:default,org.jboss.ide.eclipse.archives.test@default:default,org.jboss.tools.common.verification.ui.test@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.tools.common.gef@default:default,org.jboss.tools.common.meta.ui@default:default,org.jboss.ide.eclipse.as.ui.test@default:default,! org.jboss.tools.common.resref.core@default:default,org.jboss.ide.eclipse.as.classpath.ui@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.ide.eclipse.as.doc.user@default:default,org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.jmx.ui.test@default:default,org.jboss.ide.eclipse.as.ui.mbeans@default:default,org.jboss.ide.eclipse.as.test@default:default,org.jboss.ide.eclipse.as.rse.ui@default:default,org.jboss.tools.common.verification.ui@default:default,org.jboss.tools.common.resref.ui@default:default,org.jboss.tools.common@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.eclipse.jsch.ui@default:default,org.jboss.tools.jmx.core.test@default:default,org.jboss.tools.common.model.ui.test@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.ide.eclipse.a! s.classpath.core@default:default,org.jboss.tools.common.text.x! ml@defau lt:default,org.jboss.tools.common.verification.test@default:default,org.jboss.tools.common.projecttemplates@default:default,org.jboss.ide.eclipse.as.ssh@default:default,org.jboss.tools.tests.performance@default:default,org.jboss.tools.common.text.ext@default:default,org.jboss.tools.common.verification@default:default,org.jboss.tools.common.model.test@default:default,org.jboss.ide.eclipse.archives.ui.test@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceDomUnmarshallingTest.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceDomUnmarshallingTest.java (rev 0) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceDomUnmarshallingTest.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -0,0 +1,69 @@ +/******************************************************************************* + * 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.test.core.client; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.io.ByteArrayInputStream; +import java.net.MalformedURLException; + +import javax.xml.bind.JAXBException; + +import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException; +import org.jboss.tools.deltacloud.core.client.Instance; +import org.jboss.tools.deltacloud.core.client.InstanceAction; +import org.jboss.tools.deltacloud.core.client.unmarshal.InstanceActionUnmarshaller; +import org.jboss.tools.deltacloud.core.client.unmarshal.InstanceUnmarshaller; +import org.jboss.tools.internal.deltacloud.test.fakes.ServerInstanceResponseFakes.InstanceActionResponse; +import org.jboss.tools.internal.deltacloud.test.fakes.ServerInstanceResponseFakes.InstanceResponse; +import org.junit.Test; + +/** + * @author André Dietisheim + */ +public class InstanceDomUnmarshallingTest { + + @Test + public void keyActionMayBeUnmarshalled() throws MalformedURLException, JAXBException, DeltaCloudClientException { + InstanceAction instanceAction = new InstanceAction(); + ByteArrayInputStream inputStream = new ByteArrayInputStream(InstanceActionResponse.response.getBytes()); + new InstanceActionUnmarshaller().unmarshall(inputStream, instanceAction); + assertNotNull(instanceAction); + assertEquals(InstanceActionResponse.name, instanceAction.getName()); + assertEquals(InstanceActionResponse.url, instanceAction.getUrl().toString()); + assertEquals(InstanceActionResponse.method.toUpperCase(), instanceAction.getMethod().toString().toUpperCase()); + } + + @Test + public void instanceMayBeUnmarshalled() throws DeltaCloudClientException { + Instance instance = new Instance(); + ByteArrayInputStream inputStream = new ByteArrayInputStream(InstanceResponse.instanceResponse.getBytes()); + new InstanceUnmarshaller().unmarshall(inputStream, instance); + assertNotNull(instance); + assertEquals(InstanceResponse.id1, instance.getId()); + assertEquals(InstanceResponse.name1, instance.getName()); + assertEquals(InstanceResponse.ownerId1, instance.getOwnerId()); + assertEquals(InstanceResponse.image1Id, instance.getImageId()); + assertEquals(InstanceResponse.hardwareProfile1Id, instance.getProfileId()); + assertEquals(InstanceResponse.realm1Id, instance.getRealmId()); + assertEquals(InstanceResponse.state, instance.getState()); + assertEquals(InstanceResponse.keyname1, instance.getKeyId()); + assertEquals(2, instance.getActions().size()); + assertEquals(InstanceResponse.actionNameStop, instance.getActions().get(0).getName()); + assertEquals(InstanceResponse.actionNameReboot, instance.getActions().get(1).getName()); + assertEquals(1, instance.getPublicAddresses().size()); + assertEquals(InstanceResponse.publicAddress1, instance.getPublicAddresses().get(0)); + assertEquals(1, instance.getPrivateAddresses().size()); + assertEquals(InstanceResponse.privateAddress1, instance.getPrivateAddresses().get(0)); + + } +} Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceDomUnmarshallingTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/KeyDomUnmarshallingTest.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/KeyDomUnmarshallingTest.java 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/KeyDomUnmarshallingTest.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -28,6 +28,7 @@ import org.jboss.tools.deltacloud.core.client.unmarshal.KeyActionUnmarshaller; import org.jboss.tools.deltacloud.core.client.unmarshal.KeyUnmarshaller; import org.jboss.tools.deltacloud.core.client.unmarshal.KeysUnmarshaller; +import org.jboss.tools.internal.deltacloud.test.fakes.ServerKeyResponseFakes; import org.jboss.tools.internal.deltacloud.test.fakes.ServerKeyResponseFakes.KeyActionResponse; import org.jboss.tools.internal.deltacloud.test.fakes.ServerKeyResponseFakes.KeyResponse; import org.jboss.tools.internal.deltacloud.test.fakes.ServerKeyResponseFakes.KeysResponse; @@ -55,7 +56,7 @@ ByteArrayInputStream inputStream = new ByteArrayInputStream(KeyResponse.keyResponse.getBytes()); new KeyUnmarshaller().unmarshall(inputStream, key); assertNotNull(key); - assertEquals(org.jboss.tools.internal.deltacloud.test.fakes.ServerKeyResponseFakes.KeyResponse.id, key.getId()); + assertEquals(ServerKeyResponseFakes.KeyResponse.id, key.getId()); assertEquals(KeyResponse.fingerprint, key.getFingerprint()); assertEquals(new URL(KeyResponse.url), key.getUrl()); assertEquals(KeyResponse.pem, key.getPem()); Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerInstanceResponseFakes.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerInstanceResponseFakes.java (rev 0) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerInstanceResponseFakes.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -0,0 +1,108 @@ +/******************************************************************************* + * 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.test.fakes; + +import org.jboss.tools.deltacloud.core.client.Instance.InstanceState; + +/** + * @author André Dietisheim + */ +public class ServerInstanceResponseFakes { + + public static class InstanceActionResponse { + public static final String url = "http://try.steamcannon.org/deltacloud/api/instances/i-6f16e503/start"; + public static final String method = "post"; + public static final String name = "start"; + public static final String response = ServerResponseFakes.getActionXML(url, method, name); + } + + public static class InstanceResponse { + + public static final String url1 = "http://try.steamcannon.org/deltacloud/api/instances/i-6f16e503"; + public static final String id1 = "i-6f16e503"; + public static final String name1 = "ami-7d07ec14"; + public static final String ownerId1 = "357159121505"; + public static final String image1Url = "http://try.steamcannon.org/deltacloud/api/images/ami-7d07ec14"; + public static final String image1Id = "ami-7d07ec14"; + public static final String realm1Url = "http://try.steamcannon.org/deltacloud/api/realms/us-east-1a"; + public static final String realm1Id = "us-east-1a"; + public static final InstanceState state = InstanceState.RUNNING; + public static final String hardwareProfile1Url = "http://try.steamcannon.org/deltacloud/api/hardware_profiles/m1.small"; + public static final String hardwareProfile1Id = "m1.small"; + public static final String keyname1 = "ad10"; + public static final String actionNameStop = "stop"; + public static final String actionNameReboot = "reboot"; + public static final String publicAddress1 = "ec2-50-16-108-18.compute-1.amazonaws.com"; + public static final String privateAddress1 = "ec2-50-16-108-18.compute-1.amazonaws.com"; + + public static final String instanceResponse = getInstanceResponseXML(url1, id1, name1, ownerId1, image1Url, + image1Id, realm1Url, realm1Id, state, hardwareProfile1Url, hardwareProfile1Id, keyname1, + actionNameStop, actionNameReboot, publicAddress1, privateAddress1); + } + + private static final String getInstanceResponseXML(String url, String id, String name, String owner, + String imageUrl, String imageId, String realmUrl, String realmId, InstanceState state, + String hardwareProfileUrl, String hardwareProfileId, String keyname, String actionName1, + String actionName2, String publicAddress, String privateAddress) { + return "<instance href=\"" + + url + + "\" id=\"" + + id + + "\">" + + "<name>" + + name + + "</name>" + + "<owner_id>" + + owner + + "</owner_id>" + + "<image href=\"" + + imageUrl + + "\" id=\"" + + imageId + + "\"/>" + + getRealmResponseXML(realmUrl, realmId) + + "<state>" + + state.toString() + + "</state>" + + getHardwareProfileXML(hardwareProfileUrl, hardwareProfileId) + + "<actions>" + + ServerResponseFakes.getActionXML("http://try.steamcannon.org/deltacl... + id + + "/reboot", "post", actionName1) + + ServerResponseFakes.getActionXML("http://try.steamcannon.org/deltacl... + id + + "/stop", "post", actionName2) + + "</actions>" + + "<public_addresses>" + + getAddressXML(publicAddress) + + "</public_addresses>" + + "<private_addresses>" + + getAddressXML(privateAddress) + + "</private_addresses>" + + "<authentication type='key'>" + + "<login>" + + "<keyname>" + keyname + "</keyname>" + + "</login>" + + "</authentication>" + + "</instance>"; + } + + private static String getAddressXML(String address) { + return "<address>" + address + "</address>"; + } + + private static String getHardwareProfileXML(String url, String id) { + return "<hardware_profile href=\"" + url + "\" id=\"" + id + "\"></hardware_profile>"; + } + + private static String getRealmResponseXML(String url, String id) { + return "<realm href=\"" + url + "\" id=\"" + id + "\"/>"; + } + +} Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerInstanceResponseFakes.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerKeyResponseFakes.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerKeyResponseFakes.java 2011-01-06 19:37:25 UTC (rev 27955) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerKeyResponseFakes.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -19,7 +19,7 @@ public static final String url = "http://localhost:3001/api/keys/test1292840175447"; public static final String method = "delete"; public static final String name = "destroy"; - public static final String keyActionResponse = getKeyActionXML(url, method, name); + public static final String keyActionResponse = ServerResponseFakes.getActionXML(url, method, name); } public static class KeyResponse { @@ -82,18 +82,11 @@ + "</keys>"; } - private static final String getKeyActionXML(String url, String method, String name) { - return "<link " - + "method='" + method + "' " - + "href='" + url + "' " - + "rel='" + name + "' />"; - } - private static final String getKeyResponseXML(String id, String fingerprint, String pem, String url, String method, String name) { return "<key href='" + url + "' id='" + id + "' type='key'>" + "<actions>" - + getKeyActionXML(url, method, name) + + ServerResponseFakes.getActionXML(url, method, name) + "</actions>" + "<fingerprint>" + fingerprint + "</fingerprint>" + "<pem><pem>" + pem + "</pem></pem>" Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerResponseFakes.java =================================================================== --- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerResponseFakes.java (rev 0) +++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerResponseFakes.java 2011-01-06 21:23:48 UTC (rev 27956) @@ -0,0 +1,24 @@ +/******************************************************************************* + * 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.test.fakes; + +/** + * @author André Dietisheim + */ +public class ServerResponseFakes { + + public static final String getActionXML(String url, String method, String name) { + return "<link " + + "method='" + method + "' " + + "href='" + url + "' " + + "rel='" + name + "' />"; + } +} Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ServerResponseFakes.java ___________________________________________________________________ Name: svn:mime-type + text/plain