Author: adietish
Date: 2011-01-27 05:33:01 -0500 (Thu, 27 Jan 2011)
New Revision: 28649
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudDriver.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/API.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/APIUnmarshaller.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/APIDomUnmarshallingTest.launch
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/APIDomUnmarshallingTest.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/APIResponseFakes.java
Removed:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/Driver.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/KeyActionXmlAdapter.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPageModel.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudDriverValidator.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/Url2DriverConverter.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceDomUnmarshallingTest.launch
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceMockIntegrationTest.launch
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ServerTypeMockIntegrationTest.java
Log:
[JBIDE-8250]
- renamed Driver to DeltaCloudDriver, renamed ServerType to Driver
- moved driver unmarshalling to APIUnmarshaller
- added tests for APIUnmarshaller
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-27 08:41:02
UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-27 10:33:01
UTC (rev 28649)
@@ -1,5 +1,11 @@
2011-01-27 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+ * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java (getServerType):
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (getDriver):
+ [JBIDE-8250]
+ - renamed Driver to DeltaCloudDriver, renamed ServerType to Driver
+ - moved driver unmarshalling to APIUnmarshaller
+ - added tests for APIUnmarshaller
* src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java (UNAUTHORIZED):
* src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
(throwOnHttpErrors):
[JBIDE-8250] authorization error is status code 401 (was: 403)
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -18,10 +18,10 @@
import java.util.regex.PatternSyntaxException;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.jboss.tools.deltacloud.core.client.API.Driver;
import org.jboss.tools.deltacloud.core.client.DeltaCloudAuthClientException;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl;
-import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl.DeltaCloudServerType;
import org.jboss.tools.deltacloud.core.client.DeltaCloudNotFoundClientException;
import org.jboss.tools.deltacloud.core.client.HardwareProfile;
import org.jboss.tools.deltacloud.core.client.Image;
@@ -45,7 +45,7 @@
private String name;
private String username;
private String url;
- private Driver driver;
+ private DeltaCloudDriver driver;
private String lastKeyname = "";
private String lastImageId = "";
@@ -68,18 +68,18 @@
this(name, url, username, passwd, null);
}
- public DeltaCloud(String name, String url, String username, String password, Driver
driver)
+ public DeltaCloud(String name, String url, String username, String password,
DeltaCloudDriver driver)
throws DeltaCloudException {
this(name, url, username, password, driver, IImageFilter.ALL_STRING,
IInstanceFilter.ALL_STRING, new ArrayList<IInstanceAliasMapping>());
}
- public DeltaCloud(String name, String url, String username, Driver driver, String
imageFilterRules,
+ public DeltaCloud(String name, String url, String username, DeltaCloudDriver driver,
String imageFilterRules,
String instanceFilterRules, Collection<IInstanceAliasMapping>
instanceAliasMappings)
throws DeltaCloudException {
this(name, url, username, null, driver, imageFilterRules, instanceFilterRules,
instanceAliasMappings);
}
- public DeltaCloud(String name, String url, String username, String password, Driver
driver,
+ public DeltaCloud(String name, String url, String username, String password,
DeltaCloudDriver driver,
String imageFilterRules, String instanceFilterRules,
Collection<IInstanceAliasMapping> instanceAliasMappings)
throws DeltaCloudException {
this.url = url;
@@ -93,7 +93,7 @@
this.instanceAliasMappings = instanceAliasMappings;
}
- public void update(String name, String url, String username, String password, Driver
driver)
+ public void update(String name, String url, String username, String password,
DeltaCloudDriver driver)
throws DeltaCloudException {
this.driver = driver;
@@ -174,13 +174,13 @@
return passwordStore.getPassword();
}
- public Driver getDriver() {
+ public DeltaCloudDriver getDriver() {
return driver;
}
public boolean isValid() {
return driver != null
- && driver != Driver.UNKNOWN;
+ && driver != DeltaCloudDriver.UNKNOWN;
}
public String getLastImageId() {
@@ -612,10 +612,10 @@
return name;
}
- public static Driver getServerDriver(String url) throws DeltaCloudException {
+ public static DeltaCloudDriver getServerDriver(String url) throws DeltaCloudException {
try {
- DeltaCloudServerType serverType = new DeltaCloudClientImpl(url).getServerType();
- return Driver.valueOf(serverType);
+ Driver driver = new DeltaCloudClientImpl(url).getServerType();
+ return DeltaCloudDriver.valueOf(driver);
} catch (Exception e) {
// TODO internationalize strings
throw new DeltaCloudException(
Copied:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudDriver.java
(from rev 28633,
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/Driver.java)
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudDriver.java
(rev 0)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudDriver.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * 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;
+
+import org.jboss.tools.deltacloud.core.client.API.Driver;
+
+
+/**
+ * @author André Dietisheim
+ */
+public enum DeltaCloudDriver {
+
+ MOCK(Driver.MOCK), EC2(Driver.EC2), UNKNOWN(Driver.UNKNOWN);
+
+ private Driver driver;
+
+ private DeltaCloudDriver(Driver driver) {
+ this.driver = driver;
+ }
+
+ public static DeltaCloudDriver valueOf(Driver driver) {
+ for(DeltaCloudDriver deltaCloudDriver : values()) {
+ if (deltaCloudDriver.driver.equals(driver)) {
+ return deltaCloudDriver;
+ }
+ }
+ return UNKNOWN;
+ }
+
+ public static DeltaCloudDriver checkedValueOf(String name) {
+ for (DeltaCloudDriver driver : values()) {
+ if (driver.name().equals(name)) {
+ return driver;
+ }
+ }
+ return UNKNOWN;
+ }
+}
Property changes on:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudDriver.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -103,7 +103,7 @@
String username = URLEncoder.encode(
attrs.getNamedItem(DeltaCloudXMLBuilder.ATTR_USERNAME).getNodeValue(),
DeltaCloudXMLBuilder.ENCODING); // $NON-NLS-1$
- Driver driver =
Driver.checkedValueOf(attrs.getNamedItem(DeltaCloudXMLBuilder.ATTR_TYPE).getNodeValue());
// $NON-NLS-1$
+ DeltaCloudDriver driver =
DeltaCloudDriver.checkedValueOf(attrs.getNamedItem(DeltaCloudXMLBuilder.ATTR_TYPE).getNodeValue());
// $NON-NLS-1$
String imageFilterRules =
getImageFilterRules(attrs.getNamedItem("imagefilter")); // $NON-NLS-1$
String instanceFilterRules =
getInstanceFilterRules(attrs.getNamedItem("instancefilter")); // $NON-NLS-1$
String lastKeyName =
getNodeValue(attrs.getNamedItem(DeltaCloudXMLBuilder.ATTR_LASTKEYNAME)); // $NON-NLS-1$
Deleted:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/Driver.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/Driver.java 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/Driver.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -1,45 +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;
-
-import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl.DeltaCloudServerType;
-
-/**
- * @author André Dietisheim
- */
-public enum Driver {
-
- MOCK(DeltaCloudServerType.MOCK), EC2(DeltaCloudServerType.EC2),
UNKNOWN(DeltaCloudServerType.UNKNOWN);
-
- private DeltaCloudServerType deltaCloudServerType;
-
- private Driver(DeltaCloudServerType deltaCloudServerType) {
- this.deltaCloudServerType = deltaCloudServerType;
- }
-
- public static Driver valueOf(DeltaCloudServerType deltaCloudServerType) {
- for(Driver type : values()) {
- if (type.deltaCloudServerType.equals(deltaCloudServerType)) {
- return type;
- }
- }
- return UNKNOWN;
- }
-
- public static Driver checkedValueOf(String name) {
- for (Driver type : values()) {
- if (type.name().equals(name)) {
- return type;
- }
- }
- return UNKNOWN;
- }
-}
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/API.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/API.java
(rev 0)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/API.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * 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;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class API extends AbstractDeltaCloudActionAwareObject<KeyAction> {
+
+ private static final long serialVersionUID = 1L;
+
+ public static enum Driver {
+ UNKNOWN, MOCK, EC2;
+
+ public static Driver checkedValueOf(String name) {
+ for (Driver driver : values()) {
+ if (driver.name().equals(name)) {
+ return driver;
+ }
+ }
+ return UNKNOWN;
+ }
+
+ }
+
+ private Driver driver;
+
+ public API() {
+ }
+
+ public void setDriver(Driver driver) {
+ this.driver = driver;
+ }
+
+ public void setDriver(String driver) {
+ setDriver(Driver.checkedValueOf(driver.toUpperCase()));
+ }
+
+ public Driver getDriver() {
+ return driver;
+ }
+
+ @Override
+ public String toString() {
+ return "API [driver=" + driver.name() + super.toString() + "]";
+ }
+}
Property changes on:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/API.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -12,7 +12,7 @@
import java.util.List;
-import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl.DeltaCloudServerType;
+import org.jboss.tools.deltacloud.core.client.API.Driver;
/**
* @author Martyn Taylor
@@ -27,7 +27,7 @@
*
* @see DeltaCloudServerType
*/
- public DeltaCloudServerType getServerType();
+ public Driver getServerType();
/**
* Returns a list of Delta Cloud Realms
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-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -10,11 +10,8 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.core.client;
-import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.UnknownHostException;
@@ -22,10 +19,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
import org.apache.http.HttpResponse;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
@@ -34,6 +27,7 @@
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.impl.client.DefaultHttpClient;
+import org.jboss.tools.deltacloud.core.client.API.Driver;
import org.jboss.tools.deltacloud.core.client.request.CreateInstanceRequest;
import org.jboss.tools.deltacloud.core.client.request.CreateKeyRequest;
import org.jboss.tools.deltacloud.core.client.request.DeleteKeyRequest;
@@ -50,6 +44,7 @@
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.APIUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.HardwareProfileUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.HardwareProfilesUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.ImageUnmarshaller;
@@ -60,29 +55,16 @@
import org.jboss.tools.deltacloud.core.client.unmarshal.KeysUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.RealmUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.RealmsUnmarshaller;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
/**
* @author Andre Dietisheim (based on prior implementation by Martyn Taylor)
*/
public class DeltaCloudClientImpl implements InternalDeltaCloudClient {
- private static final String DOCUMENT_ELEMENT_DRIVER = "driver";
- private static final String DOCUMENT_ELEMENT_API = "api";
-
private String baseUrl;
private String username;
private String password;
- private DocumentBuilderFactory documentBuilderFactory;
- public static enum DeltaCloudServerType {
- UNKNOWN, MOCK, EC2
- }
-
public DeltaCloudClientImpl(String url) throws MalformedURLException,
DeltaCloudClientException {
this(url, null, null);
@@ -92,7 +74,6 @@
this.baseUrl = url;
this.username = username;
this.password = password;
- this.documentBuilderFactory = DocumentBuilderFactory.newInstance();
}
protected InputStream request(DeltaCloudRequest deltaCloudRequest)
@@ -120,19 +101,6 @@
}
}
- protected String requestStringResponse(DeltaCloudRequest deltaCloudRequest)
- throws DeltaCloudClientException {
- try {
- InputStream inputStream = request(deltaCloudRequest);
- if (inputStream == null) {
- return null;
- }
- return getResponse(inputStream);
- } catch (IOException e) {
- throw new DeltaCloudClientException(e);
- }
- }
-
private void throwOnHttpErrors(URL requestUrl, HttpResponse httpResponse)
throws DeltaCloudClientException {
int statusCode = httpResponse.getStatusLine().getStatusCode();
@@ -158,15 +126,6 @@
}
}
- private String getResponse(InputStream inputStream) throws IOException,
- DeltaCloudClientException {
- if (inputStream == null) {
- return null;
- }
- String xml = readInputStreamToString(inputStream);
- return xml;
- }
-
/**
* Returns a request instance for the given request type and url.
*
@@ -216,50 +175,15 @@
return httpClient;
}
- private static String readInputStreamToString(InputStream is)
- throws DeltaCloudClientException {
+ public Driver getServerType() {
try {
- try {
- if (is != null) {
- StringBuilder sb = new StringBuilder();
- String line = null;
-
- BufferedReader reader = new BufferedReader(new InputStreamReader(is,
"UTF-8"));
- while ((line = reader.readLine()) != null) {
- sb.append(line).append("\n");
- }
- return sb.toString();
- }
- } finally {
- is.close();
- }
- } catch (Exception e) {
- throw new DeltaCloudClientException(
- "Error converting Response to String", e);
+ InputStream response = request(new TypeRequest(baseUrl));
+ API api = new APIUnmarshaller().unmarshall(response, new API());
+ return api.getDriver();
+ } catch (DeltaCloudClientException e) {
+ return Driver.UNKNOWN;
}
- return "";
}
-
- public DeltaCloudServerType getServerType() {
- DeltaCloudServerType serverType = DeltaCloudServerType.UNKNOWN;
- try {
- String apiResponse = requestStringResponse(new TypeRequest(baseUrl));
- Document document = getDocument(apiResponse);
- NodeList elements = document.getElementsByTagName(DOCUMENT_ELEMENT_API);
- if (elements.getLength() > 0) {
- Node n = elements.item(0);
- Node driver = n.getAttributes().getNamedItem(DOCUMENT_ELEMENT_DRIVER);
- if (driver != null) {
- String driverValue = driver.getNodeValue();
- serverType = DeltaCloudServerType.valueOf(driverValue.toUpperCase());
- }
- }
- } catch (Exception e) {
- serverType = DeltaCloudServerType.UNKNOWN;
- }
- return serverType;
- }
-
@Override
public Instance createInstance(String imageId) throws DeltaCloudClientException {
try {
@@ -412,13 +336,6 @@
return key;
}
- private Document getDocument(String response) throws ParserConfigurationException,
SAXException, IOException {
- InputSource is = new InputSource(new StringReader(response));
- DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
- Document document = documentBuilder.parse(is);
- return document;
- }
-
public boolean performInstanceAction(InstanceAction action) throws
DeltaCloudClientException {
if (action != null) {
try {
Deleted:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/KeyActionXmlAdapter.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/KeyActionXmlAdapter.java 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/KeyActionXmlAdapter.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -1,18 +0,0 @@
-package org.jboss.tools.deltacloud.core.client;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-public class KeyActionXmlAdapter extends XmlAdapter<String, KeyAction> {
-
- @Override
- public KeyAction unmarshal(String v) throws Exception {
- return null;
- }
-
- @Override
- public String marshal(KeyAction v) throws Exception {
- return null;
- }
-
-
-}
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/APIUnmarshaller.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/APIUnmarshaller.java
(rev 0)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/APIUnmarshaller.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * 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.API;
+import org.w3c.dom.Element;
+
+/**
+ * @author André Dietisheim
+ */
+public class APIUnmarshaller extends AbstractDOMUnmarshaller<API> {
+
+ public APIUnmarshaller() {
+ super("api", API.class);
+ }
+
+ protected API doUnmarshall(Element element, API server) throws Exception {
+ if (element != null) {
+ server.setDriver(getAttributeText("driver", element));
+ }
+ return server;
+ }
+}
Property changes on:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/APIUnmarshaller.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-27 08:41:02 UTC (rev 28648)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud
Tools.launch 2011-01-27 10:33:01 UTC (rev 28649)
@@ -18,7 +18,7 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER"
value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
-consoleLog -console -debug"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
-consoleLog -console"/>
<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"/>
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -56,10 +56,9 @@
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.log.LogHelper;
import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudDriver;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudManager;
-import org.jboss.tools.deltacloud.core.Driver;
-import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl.DeltaCloudServerType;
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
import
org.jboss.tools.internal.deltacloud.ui.common.databinding.validator.CompositeValidator;
@@ -126,12 +125,12 @@
private Label typeLabel;
- public DeltaCloudTypeLabelAdapter(Driver cloudType, Label typeLabel) {
+ public DeltaCloudTypeLabelAdapter(DeltaCloudDriver cloudType, Label typeLabel) {
this.typeLabel = typeLabel;
init(cloudType);
}
- private void init(Driver cloudType) {
+ private void init(DeltaCloudDriver cloudType) {
setLabelText(cloudType);
}
@@ -142,7 +141,7 @@
}
private void setLabelText(Object cloudType) {
- if (cloudType != null && !Driver.UNKNOWN.equals(cloudType)) {
+ if (cloudType != null && !DeltaCloudDriver.UNKNOWN.equals(cloudType)) {
typeLabel.setText(cloudType.toString());
} else {
typeLabel.setText("?"); // $NON-NLS-1$
@@ -302,7 +301,7 @@
}
public CloudConnectionPage(String pageName, String defaultName, String defaultUrl,
String defaultUsername,
- String defaultPassword, Driver defaultDriver, CloudConnection cloudConnection) throws
MalformedURLException {
+ String defaultPassword, DeltaCloudDriver defaultDriver, CloudConnection
cloudConnection) throws MalformedURLException {
super(pageName);
this.connectionModel =
new CloudConnectionPageModel(defaultName, defaultUrl, defaultUsername,
defaultPassword, defaultDriver);
@@ -540,8 +539,8 @@
*/
IObservableValue cloudTypeObservable =
urlToCloudTypeConverter.getCloudTypeObservable();
Object value = cloudTypeObservable.getValue();
- Assert.isTrue(value == null || value instanceof Driver);
- DeltaCloudTypeLabelAdapter cloudTypeAdapter = new DeltaCloudTypeLabelAdapter((Driver)
value, typeLabel);
+ Assert.isTrue(value == null || value instanceof DeltaCloudDriver);
+ DeltaCloudTypeLabelAdapter cloudTypeAdapter = new
DeltaCloudTypeLabelAdapter((DeltaCloudDriver) value, typeLabel);
cloudTypeObservable.addValueChangeListener(cloudTypeAdapter);
ControlDecorationSupport.create(urlTypeBinding, SWT.LEFT | SWT.TOP);
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPageModel.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPageModel.java 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPageModel.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -12,7 +12,7 @@
import java.net.MalformedURLException;
-import org.jboss.tools.deltacloud.core.Driver;
+import org.jboss.tools.deltacloud.core.DeltaCloudDriver;
import org.jboss.tools.internal.deltacloud.core.observable.ObservablePojo;
/**
@@ -35,18 +35,18 @@
private String username;
private String password;
- private Driver driver;
+ private DeltaCloudDriver driver;
private String initialName;
public CloudConnectionPageModel() {
- this("", "", "", "", Driver.UNKNOWN);
+ this("", "", "", "",
DeltaCloudDriver.UNKNOWN);
}
public CloudConnectionPageModel(String name, String url, String username, String
password) throws MalformedURLException {
- this(name, url, username, password, Driver.UNKNOWN);
+ this(name, url, username, password, DeltaCloudDriver.UNKNOWN);
}
- public CloudConnectionPageModel(String name, String url, String username, String
password, Driver driver) {
+ public CloudConnectionPageModel(String name, String url, String username, String
password, DeltaCloudDriver driver) {
this.name = name;
this.initialName = name;
this.url = url;
@@ -91,11 +91,11 @@
firePropertyChange(PROPERTY_URL, this.url, this.url = url);
}
- public Driver getDriver() {
+ public DeltaCloudDriver getDriver() {
return driver;
}
- public void setDriver(Driver driver) {
+ public void setDriver(DeltaCloudDriver driver) {
firePropertyChange(PROPERTY_DRIVER, this.driver, this.driver = driver);
}
}
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudDriverValidator.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudDriverValidator.java 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudDriverValidator.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -13,7 +13,7 @@
import org.eclipse.core.databinding.validation.IValidator;
import org.eclipse.core.databinding.validation.ValidationStatus;
import org.eclipse.core.runtime.IStatus;
-import org.jboss.tools.deltacloud.core.Driver;
+import org.jboss.tools.deltacloud.core.DeltaCloudDriver;
/**
* @author André Dietisheim
@@ -23,7 +23,7 @@
@Override
public IStatus validate(Object value) {
if (value != null
- && !Driver.UNKNOWN.equals(value)) {
+ && !DeltaCloudDriver.UNKNOWN.equals(value)) {
return ValidationStatus.ok();
} else {
return
ValidationStatus.warning(WizardMessages.getString("IllegalCloudUrl.msg"));
//$NON-NLS-1$
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -13,7 +13,7 @@
import java.text.MessageFormat;
import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.Driver;
+import org.jboss.tools.deltacloud.core.DeltaCloudDriver;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
/**
@@ -34,7 +34,7 @@
String url = mainPage.getModel().getUrl();
String username = mainPage.getModel().getUsername();
String password = mainPage.getModel().getPassword();
- Driver driver = mainPage.getModel().getDriver();
+ DeltaCloudDriver driver = mainPage.getModel().getDriver();
try {
initialCloud.update(name, url, username, password, driver);
} catch (Exception e) {
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -19,7 +19,7 @@
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudManager;
-import org.jboss.tools.deltacloud.core.Driver;
+import org.jboss.tools.deltacloud.core.DeltaCloudDriver;
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.internal.deltacloud.ui.preferences.IPreferenceKeys;
@@ -111,7 +111,7 @@
String username = mainPage.getModel().getUsername();
String password = mainPage.getModel().getPassword();
- Driver driver = mainPage.getModel().getDriver();
+ DeltaCloudDriver driver = mainPage.getModel().getDriver();
try {
DeltaCloud newCloud = new DeltaCloud(name, url, username, password, driver);
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/Url2DriverConverter.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/Url2DriverConverter.java 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/Url2DriverConverter.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -16,7 +16,7 @@
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
-import org.jboss.tools.deltacloud.core.Driver;
+import org.jboss.tools.deltacloud.core.DeltaCloudDriver;
/**
* A class that converts an url (string) to a DeltaCloudType (enum). The state
@@ -34,22 +34,22 @@
IObservableValue cloudTypeObservable = new WritableValue();
public Url2DriverConverter() {
- super(String.class, Driver.class);
+ super(String.class, DeltaCloudDriver.class);
}
@Override
public Object convert(Object fromObject) {
String deltaCloudUrl = (String) fromObject;
- Driver cloudType = getCloudType(deltaCloudUrl);
+ DeltaCloudDriver cloudType = getCloudType(deltaCloudUrl);
cloudTypeObservable.setValue(cloudType);
return cloudType;
}
- private Driver getCloudType(String url) {
+ private DeltaCloudDriver getCloudType(String url) {
try {
return DeltaCloud.getServerDriver(url);
} catch (DeltaCloudException e) {
- return Driver.UNKNOWN;
+ return DeltaCloudDriver.UNKNOWN;
}
}
Added:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/APIDomUnmarshallingTest.launch
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/APIDomUnmarshallingTest.launch
(rev 0)
+++
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/APIDomUnmarshallingTest.launch 2011-01-27
10:33:01 UTC (rev 28649)
@@ -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.tools.common.el.ui,org.jboss.ide.eclipse.as.test,org.jboss.tools.jmx.ui.test,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/APIDomUnmarshallingTest.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.APIDomUnmarshallingTest"/>
+<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.wst.common.project.facet.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.security@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.registry@default:default,org.apache.xerces@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.osgi@-1:true,org.apache.xml.resolver@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.osgi.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.commands@default:de!
fault,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.compare@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.ide@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.jface.text@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jface@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.team.ui@default:default,org.eclipse.swt@default:default,com.ibm.ic!
u@default:default,org.eclipse.wst.common.environment@default:d!
efault,o
rg.eclipse.equinox.app@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ant.core@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ui.editors@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.debug.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.n!
avigator.resources@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.xml.serializer@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.help@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.p2.engine@default:default,org.hamcrest.core@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.text@default:default,org.eclipse.ui.forms@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.net@default:default,org.eclipse.osgi.services@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclip!
se.wst.common.frameworks@default:default,javax.servlet@default!
:default
,org.eclipse.wst.validation@default:default,org.eclipse.emf.ecore@default:default,javax.xml@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ltk.ui.refactoring@default:default"/>
+<stringAttribute key="selected_workspace_plugins"
value="org.jboss.tools.gwt.core@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.common@default:default,org.jboss.tools.gwt.ui@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default,com.jboss.jbds.usage.branding@default:default,org.jboss.tools.deltacloud.test@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/APIDomUnmarshallingTest.launch
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceDomUnmarshallingTest.launch
===================================================================
---
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceDomUnmarshallingTest.launch 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceDomUnmarshallingTest.launch 2011-01-27
10:33:01 UTC (rev 28649)
@@ -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.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"/>
+<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.tools.common.el.ui,org.jboss.ide.eclipse.as.test,org.jboss.tools.jmx.ui.test,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.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"/>
+<stringAttribute key="selected_target_plugins"
value="org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.security@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.registry@default:default,org.apache.xerces@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.osgi@-1:true,org.apache.xml.resolver@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.osgi.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.commands@default:de!
fault,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.compare@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.ide@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.jface.text@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jface@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.team.ui@default:default,org.eclipse.swt@default:default,com.ibm.ic!
u@default:default,org.eclipse.wst.common.environment@default:d!
efault,o
rg.eclipse.equinox.app@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ant.core@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ui.editors@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.debug.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.n!
avigator.resources@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.xml.serializer@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.help@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.p2.engine@default:default,org.hamcrest.core@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.text@default:default,org.eclipse.ui.forms@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.net@default:default,org.eclipse.osgi.services@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclip!
se.wst.common.frameworks@default:default,javax.servlet@default!
:default
,org.eclipse.wst.validation@default:default,org.eclipse.emf.ecore@default:default,javax.xml@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ltk.ui.refactoring@default:default"/>
+<stringAttribute key="selected_workspace_plugins"
value="org.jboss.tools.gwt.core@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.common@default:default,org.jboss.tools.gwt.ui@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default,com.jboss.jbds.usage.branding@default:default,org.jboss.tools.deltacloud.test@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/InstanceMockIntegrationTest.launch
===================================================================
---
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceMockIntegrationTest.launch 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/InstanceMockIntegrationTest.launch 2011-01-27
10:33:01 UTC (rev 28649)
@@ -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,18 +11,18 @@
<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.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.common,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.usage,org.jboss.tools.usage.test,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests,org.jruby.jruby"/>
+<stringAttribute key="deselected_workspace_plugins"
value="org.jboss.tools.usage,org.jboss.tools.usage.test,org.jboss.tools.tests,org.jboss.tools.common,org.jboss.tools.deltacloud.docs,com.jboss.jbds.usage.branding,org.jboss.tools.deltacloud.ui"/>
<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/InstanceMockIntegrationTest.java"/>
+<listEntry value="/org.jboss.tools.deltacloud.test"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="4"/>
</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.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.jobs@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.net@default:default,org.apache.commons.el@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi@-1:true,org.eclipse.emf.edit@default:default,org.apache.ant@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.common.emfworkbench.integrati!
on@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.resources@default:default,org.eclipse.debug.ui@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.security@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.apache.xml.serializer@default:default,org.eclipse.jface@default:default,org.eclipse.emf.common@default:default,org.eclipse.ui.editors@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.team.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.sdk@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ecf.filetransfer@default:default,com.ibm.icu@default:default,org.eclipse.jface.text@default:def!
ault,org.eclipse.jem.util@default:default,org.eclipse.wst.vali!
dation@d
efault:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.search@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.text@default:default,org.eclipse.wst.sse.core@default:default,javax.xml@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.ui.forms@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.expressions@default:default,org.eclipse.osgi.util@default:default,org.eclipse.ui.navigator.resources@default:default,org.apache.jasper@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.common.pr!
oject.facet.core@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.p2.engine@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ecf@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.hamcrest.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.core.commands@default:default,org.eclipse.compare.core@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.compare@default:default,org.eclipse.ui.cheatsheets@default:default,org.jboss.tools.xulrunner.initialize!
r@default:false,org.apache.lucene@default:default,org.apache.x!
ml.resol
ver@default:default,org.eclipse.help@default:default,org.eclipse.core.variables@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,javax.servlet@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.wst.common.core@default:default,org.junit4@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.osgi.services@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.emf.ecore@default:default,!
org.eclipse.update.configurator@3:true,org.eclipse.help.ui@default:default,javax.servlet.jsp@default:default,org.apache.xerces@default:default,org.eclipse.ui@default:default"/>
-<stringAttribute key="selected_workspace_plugins"
value="org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.test@default:default"/>
+<stringAttribute key="selected_target_plugins"
value="org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.expressions@default:default,org.eclipse.equinox.registry@default:default,org.apache.xerces@default:default,org.eclipse.core.runtime.compatibility@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.osgi@-1:true,org.apache.jasper@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.osgi!
.util@default:default,org.eclipse.jdt.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.compare@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.ide@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.jface.text@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.wst.xml.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.equinox.preferences@default:default,org.apache.lucene.!
analysis@default:default,org.eclipse.core.resources@default:de!
fault,or
g.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jface@default:default,org.junit4@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.common@2:true,org.eclipse.team.ui@default:default,org.eclipse.swt@default:default,com.ibm.icu@default:default,org.eclipse.equinox.http.jetty@default:default,org.mortbay.jetty.server@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.app@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ant.core@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.update.configurator@3:true,org.eclipse.help.base@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ui.editors@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.emf!
.ecore.change@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui@default:default,org.eclipse.help.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.debug.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jem.util@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.common.uriresolver@default:default,javax.servlet.jsp@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.xml.serializer@default:default,org.apache.commons!
.codec*1.3.0.v20100518-1140@default:default,org.apache.commons!
.el@defa
ult:default,org.eclipse.help@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.p2.engine@default:default,org.hamcrest.core@default:default,org.eclipse.ecf@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.emf.edit@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.text@default:default,org.apache.lucene@default:default,org.eclipse.ui.forms@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.net@default:default,org.eclipse.osgi.services@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.common.frameworks@default:default,javax.servlet@default:default,org.apache.ant@default:default,org.eclipse.wst.validation@default:default,org.eclipse.sdk@default:default,org.eclipse.emf.ecore@default:default,javax.xml@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.r!
untime@default:true,org.eclipse.ltk.ui.refactoring@default:default"/>
+<stringAttribute key="selected_workspace_plugins"
value="org.jboss.tools.common.text.ext@default:default,org.jboss.tools.common.verification.test@default:default,org.jboss.tools.common.model.ui.capabilities@default:default,org.jboss.tools.gwt.core@default:default,org.jboss.tools.common.el.ui@default:default,org.jboss.tools.jmx.core.test@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.common.meta.ui@default:default,org.jboss.ide.eclipse.as.ui.mbeans@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.tools.common.model@default:default,org.eclipse.jsch.ui@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.ide.eclipse.as.archives.integration.test@default:default,org.jboss.tools.common.resref.ui@default:default,org.jboss.tools.common.model.ui@default:default,org.jboss.tools.common.projecttemplates@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.ide.eclipse.as.rse.ui@default:defa!
ult,org.jboss.tools.jmx.ui.test@default:default,org.jboss.ide.eclipse.as.ui.test@default:default,org.jboss.ide.eclipse.as.test@default:default,org.jboss.tools.common.gef@default:default,org.jboss.tools.common.el.core.test@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.common.model.test@default:default,org.jboss.tools.common.model.ui.test@default:default,org.jboss.tools.common.resref.core@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.common.verification.ui@default:default,org.jboss.tools.gwt.ui@default:default,org.jboss.ide.eclipse.archives.jdt.integration@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.tools.common.el.core@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.ide.eclipse.as.doc.user@default:default,org.jboss.tools.common.test@default:defa!
ult,org.jboss.tools.common.verification.ui.test@default:defaul!
t,org.jb
oss.tools.ui.bot.ext.test@default:default,org.jboss.ide.eclipse.as.classpath.ui@default:default,org.jboss.ide.eclipse.as.classpath.core@default:default,org.jboss.ide.eclipse.archives.test@default:default,org.jboss.tools.ui.bot.ext@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.tools.common.ui@default:default,org.jboss.tools.tests.performance@default:default,org.jboss.tools.common.verification@default:default,org.jboss.tools.deltacloud.test@default:default,org.jboss.tools.common.text.xml@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"/>
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
===================================================================
---
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.internal.deltacloud.test;
+import org.jboss.tools.internal.deltacloud.test.core.client.APIDomUnmarshallingTest;
import
org.jboss.tools.internal.deltacloud.test.core.client.HardwareProfileDomUnmarshallingTest;
import org.jboss.tools.internal.deltacloud.test.core.client.ImageDomUnmarshallingTest;
import
org.jboss.tools.internal.deltacloud.test.core.client.InstanceDomUnmarshallingTest;
@@ -29,6 +30,7 @@
InstanceDomUnmarshallingTest.class,
ImageDomUnmarshallingTest.class,
HardwareProfileDomUnmarshallingTest.class,
+ APIDomUnmarshallingTest.class,
RealmDomUnmarshallingTest.class})
public class DeltaCloudTestSuite {
}
Added:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/APIDomUnmarshallingTest.java
===================================================================
---
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/APIDomUnmarshallingTest.java
(rev 0)
+++
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/APIDomUnmarshallingTest.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * 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 org.jboss.tools.deltacloud.core.client.API;
+import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
+import org.jboss.tools.deltacloud.core.client.API.Driver;
+import org.jboss.tools.deltacloud.core.client.unmarshal.APIUnmarshaller;
+import org.jboss.tools.internal.deltacloud.test.fakes.APIResponseFakes.APIResponse;
+import org.junit.Test;
+
+/**
+ * @author André Dietisheim
+ */
+public class APIDomUnmarshallingTest {
+
+ @Test
+ public void ec2DriverIsUnmarshalled() throws MalformedURLException,
DeltaCloudClientException {
+ API api = new API();
+ ByteArrayInputStream inputStream = new
ByteArrayInputStream(APIResponse.apiResponse.getBytes());
+ new APIUnmarshaller().unmarshall(inputStream, api);
+ assertNotNull(api);
+ assertEquals(APIResponse.driver, api.getDriver().name().toLowerCase());
+ }
+
+ @Test
+ public void invalidDriverUnmarshalledToUnknown() throws MalformedURLException,
DeltaCloudClientException {
+ API api = new API();
+ ByteArrayInputStream inputStream = new
ByteArrayInputStream(APIResponse.invalidDriverApiResponse.getBytes());
+ new APIUnmarshaller().unmarshall(inputStream, api);
+ assertNotNull(api);
+ assertEquals(Driver.UNKNOWN, api.getDriver());
+ }
+}
Property changes on:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/APIDomUnmarshallingTest.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/ServerTypeMockIntegrationTest.java
===================================================================
---
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ServerTypeMockIntegrationTest.java 2011-01-27
08:41:02 UTC (rev 28648)
+++
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ServerTypeMockIntegrationTest.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -19,6 +19,7 @@
import java.util.Collections;
import java.util.List;
+import org.jboss.tools.deltacloud.core.client.API.Driver;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl;
import org.jboss.tools.deltacloud.core.client.DeltaCloudNotFoundClientException;
@@ -55,7 +56,7 @@
@Test
public void recognizesDeltaCloud() throws IOException {
- assertEquals(DeltaCloudClientImpl.DeltaCloudServerType.MOCK,
testSetup.getClient().getServerType());
+ assertEquals(Driver.MOCK, testSetup.getClient().getServerType());
}
/**
@@ -75,7 +76,7 @@
serverFake.start();
try {
assertEquals(
- DeltaCloudClientImpl.DeltaCloudServerType.UNKNOWN,
+ Driver.UNKNOWN,
new DeltaCloudClientImpl(
MockIntegrationTestContext.SERVERFAKE_URL,
MockIntegrationTestContext.DELTACLOUD_USER,
MockIntegrationTestContext.DELTACLOUD_PASSWORD).getServerType());
@@ -97,7 +98,7 @@
DeltaCloudClientImpl errorClient = new
DeltaCloudClientImpl(MockIntegrationTestContext.DELTACLOUD_URL) {
@Override
public List<Image> listImages() throws DeltaCloudClientException {
- requestStringResponse(new DeltaCloudRequest() {
+ request(new DeltaCloudRequest() {
@Override
public URL getUrl() throws MalformedURLException {
Added:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/APIResponseFakes.java
===================================================================
---
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/APIResponseFakes.java
(rev 0)
+++
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/APIResponseFakes.java 2011-01-27
10:33:01 UTC (rev 28649)
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * 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 APIResponseFakes {
+
+ public static class APIResponse {
+ public static final String url =
"http://localhost:3001/api/keys/test1292840175447";
+ public static final String driver = "ec2";
+
+ public static final String apiResponse = getApiResponseXML(url, driver);
+ public static final String invalidDriverApiResponse = getApiResponseXML(url,
"foo");
+ }
+
+ private static final String getApiResponseXML(String url, String driver) {
+ return "<api driver='" + driver + "'
version='0.1'>"
+ + " <link href='" + url + "realms'
rel='realms'>"
+ + " </link>"
+ + " <link href='" + url + "images'
rel='images'>"
+ + " <feature name='owner_id'></feature>"
+ + " </link>"
+ + " <link href='" + url + "instance_states'
rel='instance_states'>"
+ + " </link>"
+ + " <link href='" + url + "instances'
rel='instances'>"
+ + " <feature name='user_data'></feature>"
+ + " <feature name='authentication_key'></feature>"
+ + " <feature name='public_ip'></feature>"
+ + " <feature name='security_group'></feature>"
+ + " </link>"
+ + " <link href='" + url + "hardware_profiles'
rel='hardware_profiles'>"
+ + " </link>"
+ + " <link href='" + url + "storage_snapshots'
rel='storage_snapshots'>"
+ + " </link>"
+ + " <link href='" + url + "storage_volumes'
rel='storage_volumes'>"
+ + " </link>"
+ + " <link href='" + url + "keys'
rel='keys'>"
+ + " </link>"
+ + " <link href='" + url + "buckets'
rel='buckets'>"
+ + " <feature name='bucket_location'></feature>"
+ + " </link>"
+ + "</api>";
+
+ }
+
+}
Property changes on:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/APIResponseFakes.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain