JBoss Tools SVN: r28093 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core/client and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-11 08:44:39 -0500 (Tue, 11 Jan 2011)
New Revision: 28093
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/RealmUnmarshaller.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/RealmsUnmarshaller.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/client/DeltaCloudClientImpl.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Realm.java
Log:
[JBIDE-7935] moved realms unmarshalling to separate classes (and added tests).
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-11 11:51:14 UTC (rev 28092)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-11 13:44:39 UTC (rev 28093)
@@ -1,5 +1,8 @@
2011-01-11 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+ * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
+ (listRealms):
+ [JBIDE-7935] moved realms unmarshalling to separate classes (and added tests).
* src/org/jboss/tools/deltacloud/core/client/request/TypeRequest.java:
* src/org/jboss/tools/deltacloud/core/client/request/PerformInstanceActionRequest.java:
* src/org/jboss/tools/deltacloud/core/client/request/ListRealmsRequest.java:
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-11 11:51:14 UTC (rev 28092)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-11 13:44:39 UTC (rev 28093)
@@ -34,7 +34,6 @@
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.impl.client.DefaultHttpClient;
-import org.eclipse.core.runtime.Assert;
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;
@@ -59,8 +58,9 @@
import org.jboss.tools.deltacloud.core.client.unmarshal.InstancesUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.KeyUnmarshaller;
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.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
@@ -111,7 +111,8 @@
} catch (DeltaCloudClientException e) {
throw e;
} catch (MalformedURLException e) {
- throw new DeltaCloudClientException(MessageFormat.format("Could not connect to \"{0}\". The url is invalid.", deltaCloudRequest.toString()), e);
+ throw new DeltaCloudClientException(MessageFormat.format(
+ "Could not connect to \"{0}\". The url is invalid.", deltaCloudRequest.toString()), e);
} catch (IOException e) {
throw new DeltaCloudClientException(e);
} catch (Exception e) {
@@ -360,46 +361,21 @@
@Override
public List<Realm> listRealms() throws DeltaCloudClientException {
try {
- return buildRealms(request(new ListRealmsRequest(baseUrl)));
+ InputStream inputStream = request(new ListRealmsRequest(baseUrl));
+ List<Realm> realms = new ArrayList<Realm>();
+ new RealmsUnmarshaller().unmarshall(inputStream, realms);
+ return realms;
} catch (Exception e) {
- throw new DeltaCloudClientException(MessageFormat.format("could not get realms on cloud at \"{0}\"",
- baseUrl), e);
+ throw new DeltaCloudClientException(
+ MessageFormat.format("could not get realms on cloud at \"{0}\"", baseUrl), e);
}
}
- private List<Realm> buildRealms(InputStream inputStream)
- throws ParserConfigurationException, SAXException, IOException, DeltaCloudClientException {
- Document document = getDocument(getResponse(inputStream));
- List<Realm> realms = new ArrayList<Realm>();
- NodeList elements = document.getElementsByTagName("realm");
- for (int i = 0; i < elements.getLength(); i++) {
- Realm realm = createRealm((Element) elements.item(i));
- realms.add(realm);
- }
- return realms;
- }
-
- private Realm createRealm(Node node) {
- Assert.isLegal(node instanceof Element);
- Realm realm = new Realm();
- updateRealm(realm, (Element) node);
- return realm;
- }
-
- private Realm updateRealm(Realm realm, Element element) {
- realm.setId(element.getAttribute("id"));
- realm.setName(element.getElementsByTagName("name").item(0).getTextContent());
- realm.setLimit(element.getElementsByTagName("limit").item(0).getTextContent());
- realm.setState(element.getElementsByTagName("state").item(0).getTextContent());
-
- return realm;
- }
-
@Override
public Realm listRealms(String realmId) throws DeltaCloudClientException {
try {
- Document document = getDocument(getResponse(request(new ListRealmRequest(baseUrl, realmId))));
- return createRealm((Element) document.getElementsByTagName("realm").item(0));
+ InputStream response = request(new ListRealmRequest(baseUrl, realmId));
+ return new RealmUnmarshaller().unmarshall(response, new Realm());
} catch (Exception e) {
throw new DeltaCloudClientException(
MessageFormat.format("could not get realms on cloud at \"{0}\"", baseUrl), e);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Realm.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Realm.java 2011-01-11 11:51:14 UTC (rev 28092)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Realm.java 2011-01-11 13:44:39 UTC (rev 28093)
@@ -10,70 +10,63 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.core.client;
-import javax.xml.bind.annotation.XmlElement;
-
/**
* @author Martyn Taylor
+ * @author André Dietisheim
*/
public class Realm extends AbstractDeltaCloudObject {
private static final long serialVersionUID = 1L;
- public static enum RealmState {
- AVAILABLE, UNAVAILABLE, UNKNOWN
- }
+ public static final int LIMIT_DEFAULT = -1;
- @XmlElement
private String name;
-
- @XmlElement
private RealmState state;
-
- @XmlElement
private int limit;
- protected Realm() {
+ public static enum RealmState {
+ AVAILABLE, UNAVAILABLE, UNKNOWN
}
- protected void setName(String name) {
- this.name = name;
+ public Realm() {
}
- protected void setState(String state) {
- try {
- this.state = RealmState.valueOf(state);
- } catch (Exception e) {
- this.state = RealmState.UNKNOWN;
- }
+ public void setName(String name) {
+ this.name = name;
}
- protected void setLimit(int limit) {
+
+ public void setLimit(int limit) {
this.limit = limit;
}
- protected void setLimit(String limit) {
+ public void setLimit(String limit) {
try {
this.limit = Integer.parseInt(limit);
} catch (Exception e) {
- this.limit = -1;
+ this.limit = LIMIT_DEFAULT;
}
}
-
- public static long getSerialversionuid() {
- return serialVersionUID;
+
+ public int getLimit() {
+ return limit;
}
public String getName() {
return name;
}
+ public void setState(String state) {
+ try {
+ this.state = RealmState.valueOf(state.toUpperCase());
+ } catch (Exception e) {
+ this.state = RealmState.UNKNOWN;
+ }
+ }
+
public RealmState getState() {
return state;
}
- public int getLimit() {
- return limit;
- }
-
@Override
public String toString() {
String s = "";
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/RealmUnmarshaller.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/RealmUnmarshaller.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/RealmUnmarshaller.java 2011-01-11 13:44:39 UTC (rev 28093)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * 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.Realm;
+import org.w3c.dom.Element;
+
+/**
+ * @author André Dietisheim
+ */
+public class RealmUnmarshaller extends AbstractDOMUnmarshaller<Realm> {
+
+ public RealmUnmarshaller() {
+ super("realm", Realm.class);
+ }
+
+ protected Realm doUnmarshall(Element element, Realm realm) throws Exception {
+ realm.setId(getAttributeText("id", element));
+ realm.setName(getFirstElementText("name", element));
+ realm.setLimit(getFirstElementText("limit", element));
+ realm.setState(getFirstElementText("state", element));
+ return realm;
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/RealmUnmarshaller.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/RealmsUnmarshaller.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/RealmsUnmarshaller.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/RealmsUnmarshaller.java 2011-01-11 13:44:39 UTC (rev 28093)
@@ -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.DeltaCloudClientException;
+import org.jboss.tools.deltacloud.core.client.Realm;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * @author André Dietisheim
+ */
+public class RealmsUnmarshaller extends AbstractDeltaCloudObjectsUnmarshaller<Realm> {
+
+ public RealmsUnmarshaller() {
+ super("realms", "realm");
+ }
+
+ @Override
+ protected Realm unmarshallChild(Node node) throws DeltaCloudClientException {
+ return new RealmUnmarshaller().unmarshall((Element) node, new Realm());
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/RealmsUnmarshaller.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r28092 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core/client and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-11 06:51:14 -0500 (Tue, 11 Jan 2011)
New Revision: 28092
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
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/request/AbstractDeltaCloudRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractListObjectsRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/DeleteKeyRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfileRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfilesRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImageRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImagesRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstanceRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstancesRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeyRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeysRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmsRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/PerformInstanceActionRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/TypeRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java
Log:
[JBIDE-7695] delayed URL creation to request time. Gained capability to store invalid urls and report them at request time.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-11 11:51:14 UTC (rev 28092)
@@ -1,5 +1,30 @@
2011-01-11 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+ * src/org/jboss/tools/deltacloud/core/client/request/TypeRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/PerformInstanceActionRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/ListRealmsRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/ListRealmRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/ListKeysRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/ListKeyRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/ListInstancesRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/ListInstanceRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/ListImagesRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/ListImageRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfilesRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfileRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/DeleteKeyRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/AbstractListObjectsRequest.java:
+ * src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java:
+ (urlString):
+ (url):
+ (getUrl):
+ (toString):
+ (getUrlString):
+ * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
+ (request):
+ [JBIDE-7695] delayed URL creation to request time. Gained capability to store invalid urls and report them at request time.
* src/org/jboss/tools/deltacloud/core/client/unmarshal/ImagesUnmarshaller.java:
* src/org/jboss/tools/deltacloud/core/client/unmarshal/ImageUnmarshaller.java:
* src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
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-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -74,36 +74,27 @@
private static final String DOCUMENT_ELEMENT_DRIVER = "driver";
private static final String DOCUMENT_ELEMENT_API = "api";
- public static enum DeltaCloudServerType {
- UNKNOWN, MOCK, EC2
- }
-
- private URL baseUrl;
+ 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);
}
public DeltaCloudClientImpl(String url, String username, String password) throws DeltaCloudClientException {
- this.baseUrl = createUrl(url);
+ this.baseUrl = url;
this.username = username;
this.password = password;
this.documentBuilderFactory = DocumentBuilderFactory.newInstance();
}
- private URL createUrl(String url) throws DeltaCloudClientException {
- try {
- return new URL(url);
- } catch (MalformedURLException e) {
- throw new DeltaCloudClientException(MessageFormat.format(
- "Could not create url for {0}", url), e);
- }
- }
-
protected InputStream request(DeltaCloudRequest deltaCloudRequest)
throws DeltaCloudClientException {
DefaultHttpClient httpClient = new DefaultHttpClient();
@@ -119,12 +110,12 @@
return httpResponse.getEntity().getContent();
} catch (DeltaCloudClientException e) {
throw e;
+ } catch (MalformedURLException e) {
+ throw new DeltaCloudClientException(MessageFormat.format("Could not connect to \"{0}\". The url is invalid.", deltaCloudRequest.toString()), e);
} catch (IOException e) {
throw new DeltaCloudClientException(e);
} catch (Exception e) {
throw new DeltaCloudClientException(e);
- } finally {
- // httpClient.getConnectionManager().shutdown();
}
}
@@ -455,15 +446,11 @@
public boolean performInstanceAction(InstanceAction action) throws DeltaCloudClientException {
if (action != null) {
try {
- InputStream inputStream = request(new PerformInstanceActionRequest(
- new URL(action.getUrl()), action.getMethod()));
+ InputStream inputStream = request(
+ new PerformInstanceActionRequest(action.getUrl(), action.getMethod()));
if (!InstanceAction.DESTROY.equals(action.getName())) {
new InstanceUnmarshaller().unmarshall(inputStream, action.getOwner());
}
- } catch (MalformedURLException e) {
- throw new DeltaCloudClientException(
- MessageFormat.format("Could not perform action {0} on instance {1}", action.getName(), action
- .getOwner().getName()), e);
} catch (DeltaCloudClientException e) {
throw e;
} catch (Exception e) {
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractDeltaCloudRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -21,28 +21,40 @@
*/
public abstract class AbstractDeltaCloudRequest implements DeltaCloudRequest {
+ private String urlString;
private URL url;
private HttpMethod httpMethod;
private UrlBuilder urlBuilder;
- protected AbstractDeltaCloudRequest(URL baseURL, HttpMethod httpMethod) {
+ protected AbstractDeltaCloudRequest(String baseURL, HttpMethod httpMethod) {
this.httpMethod = httpMethod;
this.urlBuilder = createUrlBuilder(baseURL);
}
protected abstract String doCreateUrl(UrlBuilder urlBuilder);
- protected UrlBuilder createUrlBuilder(URL baseURL) {
- return new UrlBuilder(baseURL).path(API_PATH_SEGMENT);
+ protected UrlBuilder createUrlBuilder(String baseUrl) {
+ return new UrlBuilder(baseUrl).path(API_PATH_SEGMENT);
}
public URL getUrl() throws MalformedURLException {
if (url == null) {
- this.url = new URL(doCreateUrl(urlBuilder));
+ this.url = new URL(getUrlString());
}
return url;
}
+ protected String getUrlString() {
+ if (urlString == null) {
+ this.urlString = doCreateUrl(urlBuilder);
+ }
+ return urlString;
+ }
+
+ public String toString() {
+ return getUrlString();
+ }
+
public HttpMethod getHttpMethod() {
return httpMethod;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractListObjectsRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractListObjectsRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/AbstractListObjectsRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,12 +10,9 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
import org.jboss.tools.deltacloud.core.client.HttpMethod;
import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder;
-
/**
* Lists images, instances, realms or profiles on the deltacloud server.
*
@@ -30,7 +27,7 @@
private String objectType;
- public AbstractListObjectsRequest(URL baseUrl, String objectType) {
+ public AbstractListObjectsRequest(String baseUrl, String objectType) {
super(baseUrl, HttpMethod.GET);
this.objectType = objectType;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,8 +10,6 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
import org.jboss.tools.deltacloud.core.client.HttpMethod;
import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder;
@@ -30,11 +28,11 @@
private String memory;
private String storage;
- public CreateInstanceRequest(URL baseUrl, String imageId) {
+ public CreateInstanceRequest(String baseUrl, String imageId) {
this(baseUrl, null, imageId, null, null, null, null, null);
}
- public CreateInstanceRequest(URL baseUrl, String name, String imageId, String profileId, String realmId,
+ public CreateInstanceRequest(String baseUrl, String name, String imageId, String profileId, String realmId,
String keyId, String memory, String storage) {
super(baseUrl, HttpMethod.POST);
this.name = name;
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,8 +10,6 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
import org.jboss.tools.deltacloud.core.client.HttpMethod;
import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder;
@@ -24,7 +22,7 @@
private String keyName;
- public CreateKeyRequest(URL baseUrl, String keyName) {
+ public CreateKeyRequest(String baseUrl, String keyName) {
super(baseUrl, HttpMethod.POST);
this.keyName = keyName;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/DeleteKeyRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/DeleteKeyRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/DeleteKeyRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,12 +10,9 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
import org.jboss.tools.deltacloud.core.client.HttpMethod;
import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder;
-
/**
* Deletes a key on the deltacloud server
*
@@ -25,7 +22,7 @@
private String keyName;
- public DeleteKeyRequest(URL baseUrl, String keyName) {
+ public DeleteKeyRequest(String baseUrl, String keyName) {
super(baseUrl, HttpMethod.DELETE);
this.keyName = keyName;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfileRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfileRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfileRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,12 +10,9 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
import org.jboss.tools.deltacloud.core.client.HttpMethod;
import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder;
-
/**
* A request for a hardware profile on a deltacloud server.
*
@@ -31,7 +28,7 @@
* @param baseUrl the base url
* @param imageId
*/
- public ListHardwareProfileRequest(URL baseUrl, String profileId) {
+ public ListHardwareProfileRequest(String baseUrl, String profileId) {
super(baseUrl, HttpMethod.GET);
this.profileId = profileId;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfilesRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfilesRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListHardwareProfilesRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,9 +10,6 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
-
/**
* Lists profiles on the deltacloud server.
*
@@ -20,7 +17,7 @@
*/
public class ListHardwareProfilesRequest extends AbstractListObjectsRequest {
- public ListHardwareProfilesRequest(URL baseUrl) {
+ public ListHardwareProfilesRequest(String baseUrl) {
super(baseUrl, "hardware_profiles");
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImageRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImageRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImageRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,8 +10,6 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
import org.jboss.tools.deltacloud.core.client.HttpMethod;
import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder;
@@ -25,7 +23,7 @@
private String imageId;
- public ListImageRequest(URL baseUrl, String imageId) {
+ public ListImageRequest(String baseUrl, String imageId) {
super(baseUrl, HttpMethod.GET);
this.imageId = imageId;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImagesRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImagesRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListImagesRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,9 +10,6 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
-
/**
* Lists images on the deltacloud server.
*
@@ -20,7 +17,7 @@
*/
public class ListImagesRequest extends AbstractListObjectsRequest {
- public ListImagesRequest(URL baseUrl) {
+ public ListImagesRequest(String baseUrl) {
super(baseUrl, "images");
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstanceRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstanceRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstanceRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,12 +10,9 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
import org.jboss.tools.deltacloud.core.client.HttpMethod;
import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder;
-
/**
* Lists an instance on the deltacloud server
*
@@ -25,7 +22,7 @@
private String instanceId;
- public ListInstanceRequest(URL baseUrl, String instanceId) {
+ public ListInstanceRequest(String baseUrl, String instanceId) {
super(baseUrl, HttpMethod.GET);
this.instanceId = instanceId;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstancesRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstancesRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListInstancesRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,9 +10,6 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
-
/**
* Lists instances on the deltacloud server.
*
@@ -20,7 +17,7 @@
*/
public class ListInstancesRequest extends AbstractListObjectsRequest {
- public ListInstancesRequest(URL baseUrl) {
+ public ListInstancesRequest(String baseUrl) {
super(baseUrl, "instances");
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeyRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeyRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeyRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,12 +10,9 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
import org.jboss.tools.deltacloud.core.client.HttpMethod;
import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder;
-
/**
* List a key with a given name that is available on the deltacloud server
*
@@ -25,7 +22,7 @@
private String name;
- public ListKeyRequest(URL baseUrl, String name) {
+ public ListKeyRequest(String baseUrl, String name) {
super(baseUrl, HttpMethod.GET);
this.name = name;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeysRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeysRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListKeysRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,12 +10,9 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
import org.jboss.tools.deltacloud.core.client.HttpMethod;
import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder;
-
/**
* Lists keys available on the deltacloud server
*
@@ -23,7 +20,7 @@
*/
public class ListKeysRequest extends AbstractDeltaCloudRequest {
- public ListKeysRequest(URL baseUrl) {
+ public ListKeysRequest(String baseUrl) {
super(baseUrl, HttpMethod.GET);
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,12 +10,9 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
import org.jboss.tools.deltacloud.core.client.HttpMethod;
import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder;
-
/**
* Lists a realm on the deltacloud server
*
@@ -25,7 +22,7 @@
private String realmId;
- public ListRealmRequest(URL baseUrl, String realmId) {
+ public ListRealmRequest(String baseUrl, String realmId) {
super(baseUrl, HttpMethod.GET);
this.realmId = realmId;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmsRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmsRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/ListRealmsRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,9 +10,6 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
-
/**
* Lists realms on the deltacloud server.
*
@@ -20,7 +17,7 @@
*/
public class ListRealmsRequest extends AbstractListObjectsRequest {
- public ListRealmsRequest(URL baseUrl) {
+ public ListRealmsRequest(String baseUrl) {
super(baseUrl, "realms");
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/PerformInstanceActionRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/PerformInstanceActionRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/PerformInstanceActionRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,12 +10,9 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
import org.jboss.tools.deltacloud.core.client.HttpMethod;
import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder;
-
/**
* Performs an action on a instance on the deltacloud server
*
@@ -23,7 +20,7 @@
*/
public class PerformInstanceActionRequest extends AbstractDeltaCloudRequest {
- public PerformInstanceActionRequest(URL url, HttpMethod httpMethod) {
+ public PerformInstanceActionRequest(String url, HttpMethod httpMethod) {
super(url, httpMethod);
}
@@ -33,7 +30,7 @@
}
@Override
- protected UrlBuilder createUrlBuilder(URL baseURL) {
+ protected UrlBuilder createUrlBuilder(String baseURL) {
return new UrlBuilder(baseURL);
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/TypeRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/TypeRequest.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/TypeRequest.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -10,12 +10,9 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.request;
-import java.net.URL;
-
import org.jboss.tools.deltacloud.core.client.HttpMethod;
import org.jboss.tools.deltacloud.core.client.utils.UrlBuilder;
-
/**
* A request for the type of deltacloud server.
*
@@ -23,7 +20,7 @@
*/
public class TypeRequest extends AbstractDeltaCloudRequest {
- public TypeRequest(URL baseUrl) {
+ public TypeRequest(String baseUrl) {
super(baseUrl, HttpMethod.GET);
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java 2011-01-11 10:32:07 UTC (rev 28091)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java 2011-01-11 11:51:14 UTC (rev 28092)
@@ -34,6 +34,10 @@
public UrlBuilder() {
}
+ public UrlBuilder(String baseUrl) {
+ urlStringBuilder.append(baseUrl);
+ }
+
public UrlBuilder(URL baseUrl) {
urlStringBuilder.append(baseUrl.toString());
}
@@ -123,10 +127,6 @@
}
public String toString() {
- try {
- return toUrl().toString();
- } catch (MalformedURLException e) {
- throw new RuntimeException(e.getMessage(), e);
- }
+ return urlStringBuilder.toString();
}
}
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r28091 - in trunk/deltacloud: plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-11 05:32:07 -0500 (Tue, 11 Jan 2011)
New Revision: 28091
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/ImageUnmarshaller.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/ImagesUnmarshaller.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ImageDomUnmarshallingTest.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ImageResponseFakes.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/client/DeltaCloudClientImpl.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Image.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ChangeLog
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
Log:
[JBIDE-7935] moved image unmarshaling to its own class (and created tests for it)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-11 05:16:11 UTC (rev 28090)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-01-11 10:32:07 UTC (rev 28091)
@@ -1,3 +1,12 @@
+2011-01-11 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+
+ * src/org/jboss/tools/deltacloud/core/client/unmarshal/ImagesUnmarshaller.java:
+ * src/org/jboss/tools/deltacloud/core/client/unmarshal/ImageUnmarshaller.java:
+ * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
+ (listImages):
+ (listImages):
+ [JBIDE-7935] moved image unmarshalling to its own class (and created tests for it)
+
2011-01-10 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
* src/org/jboss/tools/deltacloud/core/client/unmarshal/HardwareProfileUnmarshaller.java:
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-11 05:16:11 UTC (rev 28090)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-11 10:32:07 UTC (rev 28091)
@@ -15,7 +15,6 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringReader;
-import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.UnknownHostException;
@@ -23,15 +22,9 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.JAXB;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
import org.apache.http.HttpResponse;
import org.apache.http.auth.AuthScope;
@@ -42,7 +35,6 @@
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.impl.client.DefaultHttpClient;
import org.eclipse.core.runtime.Assert;
-import org.jboss.tools.deltacloud.core.client.request.AbstractListObjectsRequest;
import org.jboss.tools.deltacloud.core.client.request.CreateInstanceRequest;
import org.jboss.tools.deltacloud.core.client.request.CreateKeyRequest;
import org.jboss.tools.deltacloud.core.client.request.DeleteKeyRequest;
@@ -59,7 +51,10 @@
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.HardwareProfileUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.HardwareProfilesUnmarshaller;
+import org.jboss.tools.deltacloud.core.client.unmarshal.ImageUnmarshaller;
+import org.jboss.tools.deltacloud.core.client.unmarshal.ImagesUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.InstanceUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.InstancesUnmarshaller;
import org.jboss.tools.deltacloud.core.client.unmarshal.KeyUnmarshaller;
@@ -276,7 +271,8 @@
@Override
public Instance createInstance(String imageId) throws DeltaCloudClientException {
try {
- return buildInstance(request(new CreateInstanceRequest(baseUrl, imageId)));
+ InputStream response = request(new CreateInstanceRequest(baseUrl, imageId));
+ return new InstanceUnmarshaller().unmarshall(response, new Instance());
} catch (DeltaCloudClientException e) {
throw e;
} catch (Exception e) {
@@ -293,9 +289,9 @@
public Instance createInstance(String name, String imageId, String profileId, String realmId, String keyId,
String memory, String storage) throws DeltaCloudClientException {
try {
- InputStream inputStream = request(
+ InputStream response = request(
new CreateInstanceRequest(baseUrl, name, imageId, profileId, realmId, keyId, memory, storage));
- Instance instance = buildInstance(inputStream);
+ Instance instance = new InstanceUnmarshaller().unmarshall(response, new Instance());
// TODO: WORKAROUND for
// https://issues.jboss.org/browse/JBIDE-8005
if (keyId != null) {
@@ -314,8 +310,8 @@
@Override
public HardwareProfile listProfile(String profileId) throws DeltaCloudClientException {
try {
- return buildDeltaCloudObject(HardwareProfile.class,
- requestStringResponse(new ListHardwareProfileRequest(baseUrl, profileId)));
+ InputStream response = request(new ListHardwareProfileRequest(baseUrl, profileId));
+ return new HardwareProfileUnmarshaller().unmarshall(response, new HardwareProfile());
} catch (DeltaCloudClientException e) {
throw e;
} catch (Exception e) {
@@ -338,15 +334,16 @@
@Override
public List<Image> listImages() throws DeltaCloudClientException {
- return listDeltaCloudObjects(Image.class,
- new ListImagesRequest(baseUrl), "image");
+ InputStream response = request(new ListImagesRequest(baseUrl));
+ List<Image> images = new ArrayList<Image>();
+ new ImagesUnmarshaller().unmarshall(response, images);
+ return images;
}
@Override
public Image listImages(String imageId) throws DeltaCloudClientException {
- return JAXB.unmarshal(new StringReader(
- requestStringResponse(new ListImageRequest(baseUrl, imageId))),
- Image.class);
+ InputStream response = request(new ListImageRequest(baseUrl, imageId));
+ return new ImageUnmarshaller().unmarshall(response, new Image());
}
@Override
@@ -360,7 +357,8 @@
@Override
public Instance listInstances(String instanceId) throws DeltaCloudClientException {
try {
- return buildInstance(request(new ListInstanceRequest(baseUrl, instanceId)));
+ InputStream response = request(new ListInstanceRequest(baseUrl, instanceId));
+ return new InstanceUnmarshaller().unmarshall(response, new Instance());
} catch (DeltaCloudClientException e) {
throw e;
} catch (Exception e) {
@@ -447,104 +445,6 @@
return key;
}
- private Instance updateInstance(InputStream inputStream, Instance instance) throws Exception {
- return new InstanceUnmarshaller().unmarshall(inputStream, instance);
- }
-
- private Instance buildInstance(InputStream inputStream) throws Exception {
- return updateInstance(inputStream, new Instance());
- }
-
- private HardwareProfile buildHardwareProfile(String xml)
- throws DeltaCloudClientException {
- try {
- HardwareProfile profile = JAXB.unmarshal(new StringReader(xml),
- HardwareProfile.class);
-
- Document document = getDocument(xml);
-
- List<Node> nodes = getPropertyNodes(document, "hardware_profile"); //$NON-NLS-1$
-
- for (Node n : nodes) {
- Property p = new Property();
- p.setName(n.getAttributes().getNamedItem("name").getNodeValue()); //$NON-NLS-1$
- p.setValue(n.getAttributes()
- .getNamedItem("value").getNodeValue()); //$NON-NLS-1$
- p.setUnit(n.getAttributes().getNamedItem("unit").getNodeValue()); //$NON-NLS-1$
- p.setKind(n.getAttributes().getNamedItem("kind").getNodeValue()); //$NON-NLS-1$
- if (p.getKind().equals("range")) { //$NON-NLS-1$
- NodeList children = n.getChildNodes();
- for (int i = 0; i < children.getLength(); ++i) {
- Node child = children.item(i);
- if (child.getNodeName().equals("range")) { //$NON-NLS-1$
- String first = child.getAttributes()
- .getNamedItem("first").getNodeValue(); //$NON-NLS-1$
- String last = child.getAttributes()
- .getNamedItem("last").getNodeValue(); //$NON-NLS-1$
- p.setRange(first, last);
- }
- }
- } else if (p.getKind().equals("enum")) { //$NON-NLS-1$
- ArrayList<String> enums = new ArrayList<String>();
- NodeList children = n.getChildNodes();
- for (int i = 0; i < children.getLength(); ++i) {
- Node child = children.item(i);
- if (child.getNodeName().equals("enum")) { //$NON-NLS-1$
- NodeList enumChildren = child.getChildNodes();
- for (int j = 0; j < enumChildren.getLength(); ++j) {
- Node enumChild = enumChildren.item(j);
- if (enumChild.getNodeName().equals("entry")) {
- enums.add(enumChild
- .getAttributes()
- .getNamedItem("value").getNodeValue()); //$NON-NLS-1$
- }
- }
- }
- }
- p.setEnums(enums);
- }
- profile.getProperties().add(p);
- }
- return profile;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
-
- private List<Node> getPropertyNodes(Document document, String elementName) {
- NodeList elements = document.getElementsByTagName(elementName);
- ArrayList<Node> values = new ArrayList<Node>();
- for (int i = 0; i < elements.getLength(); i++) {
- NodeList children = elements.item(i).getChildNodes();
- for (int j = 0; j < children.getLength(); ++j) {
- Node child = children.item(j);
- if (child.getNodeName().equals("property")) { //$NON-NLS-1$
- values.add(child);
- }
- }
- }
- return values;
- }
-
- private <T extends AbstractDeltaCloudObject> List<T> listDeltaCloudObjects(Class<T> clazz,
- AbstractListObjectsRequest request, String elementName) throws DeltaCloudClientException {
- try {
- Document document = getDocument(requestStringResponse(request));
- List<T> dco = new ArrayList<T>();
- NodeList nodeList = document.getElementsByTagName(elementName);
- for (int i = 0; i < nodeList.getLength(); i++) {
- dco.add(buildDeltaCloudObject(clazz, nodeToString(nodeList.item(i))));
- }
- return dco;
- } catch (DeltaCloudClientException e) {
- throw e;
- } catch (Exception e) {
- throw new DeltaCloudClientException(MessageFormat.format(
- "Could not list object of type {0}", clazz), e);
- }
- }
-
private Document getDocument(String response) throws ParserConfigurationException, SAXException, IOException {
InputSource is = new InputSource(new StringReader(response));
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
@@ -552,22 +452,13 @@
return document;
}
- @SuppressWarnings("unchecked")
- private <T extends Object> T buildDeltaCloudObject(Class<T> clazz, String node) throws Exception {
- if (clazz.equals(HardwareProfile.class)) {
- return (T) buildHardwareProfile(node);
- } else {
- return JAXB.unmarshal(new StringReader(node), clazz);
- }
- }
-
public boolean performInstanceAction(InstanceAction action) throws DeltaCloudClientException {
if (action != null) {
try {
InputStream inputStream = request(new PerformInstanceActionRequest(
new URL(action.getUrl()), action.getMethod()));
if (!InstanceAction.DESTROY.equals(action.getName())) {
- updateInstance(inputStream, action.getOwner());
+ new InstanceUnmarshaller().unmarshall(inputStream, action.getOwner());
}
} catch (MalformedURLException e) {
throw new DeltaCloudClientException(
@@ -582,15 +473,4 @@
}
return false;
}
-
- private String nodeToString(Node node) throws DeltaCloudClientException {
- try {
- StringWriter writer = new StringWriter();
- Transformer t = TransformerFactory.newInstance().newTransformer();
- t.transform(new DOMSource(node), new StreamResult(writer));
- return writer.toString();
- } catch (TransformerException e) {
- throw new DeltaCloudClientException("Error transforming node to string", e);
- }
- }
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Image.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Image.java 2011-01-11 05:16:11 UTC (rev 28090)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Image.java 2011-01-11 10:32:07 UTC (rev 28091)
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.core.client;
-import javax.xml.bind.annotation.XmlElement;
/**
* @author Martyn Taylor
@@ -19,42 +18,34 @@
{
private static final long serialVersionUID = 1L;
- @XmlElement(name="owner_id")
private String ownerId;
- @XmlElement
private String name;
- @XmlElement
private String description;
- @XmlElement
private String architecture;
- protected Image()
+ public Image()
{
}
- @SuppressWarnings("unused")
- private void setOwnerId(String ownerId)
+ public void setOwnerId(String ownerId)
{
this.ownerId = ownerId;
}
- @SuppressWarnings("unused")
- private void setName(String name)
+ public void setName(String name)
{
this.name = name;
}
- @SuppressWarnings("unused")
- private void setDescription(String description)
+ public void setDescription(String description)
{
this.description = description;
}
- @SuppressWarnings("unused")
- private void setArchitecture(String architecture)
+ public void setArchitecture(String architecture)
{
this.architecture = architecture;
}
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/ImageUnmarshaller.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/ImageUnmarshaller.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/ImageUnmarshaller.java 2011-01-11 10:32:07 UTC (rev 28091)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * 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.Image;
+import org.w3c.dom.Element;
+
+/**
+ * @author André Dietisheim
+ */
+public class ImageUnmarshaller extends AbstractDOMUnmarshaller<Image> {
+
+ public ImageUnmarshaller() {
+ super("image", Image.class);
+ }
+
+ protected Image doUnmarshall(Element element, Image image) throws Exception {
+ image.setId(getAttributeText("id", element));
+ image.setName(getFirstElementText("name", element));
+ image.setOwnerId(getFirstElementText("owner_id", element));
+ image.setDescription(getFirstElementText("description", element));
+ image.setArchitecture(getFirstElementText("architecture", element));
+ return image;
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/ImageUnmarshaller.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/ImagesUnmarshaller.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/ImagesUnmarshaller.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/ImagesUnmarshaller.java 2011-01-11 10:32:07 UTC (rev 28091)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * 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.DeltaCloudClientException;
+import org.jboss.tools.deltacloud.core.client.Image;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * @author André Dietisheim
+ */
+public class ImagesUnmarshaller extends AbstractDeltaCloudObjectsUnmarshaller<Image> {
+
+ public ImagesUnmarshaller() {
+ super("images", "image");
+ }
+
+ @Override
+ protected Image unmarshallChild(Node node) throws DeltaCloudClientException {
+ Image image = new ImageUnmarshaller().unmarshall((Element) node, new Image());
+ return image;
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/ImagesUnmarshaller.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ChangeLog
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ChangeLog 2011-01-11 05:16:11 UTC (rev 28090)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/ChangeLog 2011-01-11 10:32:07 UTC (rev 28091)
@@ -1,3 +1,10 @@
+2011-01-11 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+
+ * src/org/jboss/tools/internal/deltacloud/test/core/client/ImageDomUnmarshallingTest.java:
+ [JBIDE-7935] created tests for image unmarshalling
+ * src/org/jboss/tools/internal/deltacloud/test/core/client/InstanceDomUnmarshallingTest.java:
+ [JBIDE-7935] created tests for instance unmarshalling
+
2010-12-15 André Dietisheim <adietish(a)redhat.com>
* src/org/jboss/tools/internal/deltacloud/test/core/job/SchedulingRulesTest.java:
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-11 05:16:11 UTC (rev 28090)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2011-01-11 10:32:07 UTC (rev 28091)
@@ -11,6 +11,7 @@
package org.jboss.tools.internal.deltacloud.test;
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;
import org.jboss.tools.internal.deltacloud.test.core.client.KeyDomUnmarshallingTest;
import org.jboss.tools.internal.deltacloud.test.core.job.CloudSchedulingRulesTest;
@@ -25,6 +26,7 @@
CloudSchedulingRulesTest.class,
KeyDomUnmarshallingTest.class,
InstanceDomUnmarshallingTest.class,
+ ImageDomUnmarshallingTest.class,
HardwareProfileDomUnmarshallingTest.class})
public class DeltaCloudTestSuite {
}
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ImageDomUnmarshallingTest.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ImageDomUnmarshallingTest.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ImageDomUnmarshallingTest.java 2011-01-11 10:32:07 UTC (rev 28091)
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * 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.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
+import org.jboss.tools.deltacloud.core.client.Image;
+import org.jboss.tools.deltacloud.core.client.unmarshal.ImageUnmarshaller;
+import org.jboss.tools.deltacloud.core.client.unmarshal.ImagesUnmarshaller;
+import org.jboss.tools.internal.deltacloud.test.fakes.ImageResponseFakes.ImageResponse;
+import org.jboss.tools.internal.deltacloud.test.fakes.ImageResponseFakes.ImagesResponse;
+import org.junit.Test;
+
+/**
+ * @author André Dietisheim
+ */
+public class ImageDomUnmarshallingTest {
+
+ @Test
+ public void imageMayBeUnmarshalled() throws DeltaCloudClientException {
+ Image image = new Image();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(ImageResponse.response.getBytes());
+ new ImageUnmarshaller().unmarshall(inputStream, image);
+ assertNotNull(image);
+ assertEquals(ImageResponse.id, image.getId());
+ assertEquals(ImageResponse.name, image.getName());
+ assertEquals(ImageResponse.ownerId, image.getOwnerId());
+ assertEquals(ImageResponse.description, image.getDescription());
+ assertEquals(ImageResponse.architecture, image.getArchitecture());
+ }
+
+ @Test
+ public void imagesMayBeUnmarshalled() throws DeltaCloudClientException {
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(ImagesResponse.response.getBytes());
+ List<Image> images = new ArrayList<Image>();
+ new ImagesUnmarshaller().unmarshall(inputStream, images);
+ assertEquals(2, images.size());
+
+ Image image = images.get(0);
+ assertEquals(ImagesResponse.id1, image.getId());
+ assertEquals(ImagesResponse.name1, image.getName());
+
+ image = images.get(1);
+ assertEquals(ImagesResponse.id2, image.getId());
+ assertEquals(ImagesResponse.name2, image.getName());
+ }
+
+}
Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ImageDomUnmarshallingTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ImageResponseFakes.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ImageResponseFakes.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ImageResponseFakes.java 2011-01-11 10:32:07 UTC (rev 28091)
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * 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 ImageResponseFakes {
+
+ public static class ImageResponse {
+ public static final String url = "http://try.steamcannon.org/deltacloud/api/images/ami-16a3577f";
+ public static final String id = "ami-16a3577f";
+ public static final String name = "sles-10-sp3-v1.00.i386";
+ public static final String ownerId = "013907871322";
+ public static final String description = "SUSE Linux Enterprise Server 10 Service Pack 3 for x86 (v1.00)";
+ public static final String architecture = "i386";
+
+ public static final String response = getImageResponseXML(url, id, name, ownerId, description, architecture);
+ }
+
+ public static class ImagesResponse {
+
+ public static final String url1 = "http://try.steamcannon.org/deltacloud/api/images/ami-16a3577f";
+ public static final String id1 = "ami-16a3577f";
+ public static final String name1 = "sles-10-sp3-v1.00.i386";
+ public static final String ownerId1 = "013907871322";
+ public static final String description1 = "SUSE Linux Enterprise Server 10 Service Pack 3 for x86 (v1.00)";
+ public static final String architecture1 = "i386";
+
+ public static final String url2 = "http://try.steamcannon.org/deltacloud/api/images/ami-16a3578f";
+ public static final String id2 = "ami-16a3578f";
+ public static final String name2 = "sles-10-sp3-v2.00.i686";
+ public static final String ownerId2 = "013907871422";
+ public static final String description2 = "SUSE Linux Enterprise Server 10 Service Pack 3 for x86 (v2.00)";
+ public static final String architecture2 = "i686";
+
+ public static final String response =
+ "<images>"
+ + getImageResponseXML(url1, id1, name1, ownerId1, description1, architecture1)
+ + getImageResponseXML(url2, id2, name2, ownerId2, description2, architecture2)
+ + "</images>";
+
+ }
+
+ private static String getImageResponseXML(String url, String id, String name, String ownerId,
+ String description, String architecture) {
+ return "<image href='" + url + "' id='" + id + "'>"
+ + "<name>" + name + "</name>"
+ + "<owner_id>" + ownerId + "</owner_id>"
+ + "<description>" + description + "</description>"
+ + "<architecture>" + architecture + "</architecture>"
+ + "<state></state>"
+ + "</image>";
+ }
+}
Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/ImageResponseFakes.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r28090 - in trunk/ws/tests/org.jboss.tools.ws.creation.core.test: src/org/jboss/tools/ws/creation/core/test/command and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2011-01-11 00:16:11 -0500 (Tue, 11 Jan 2011)
New Revision: 28090
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorldService.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java
Log:
JBIDE-6581: modify the wsdl url to fix the build failed
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorldService.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorldService.java 2011-01-11 01:45:33 UTC (rev 28089)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorldService.java 2011-01-11 05:16:11 UTC (rev 28090)
@@ -15,7 +15,7 @@
* Generated source version: 2.0
*
*/
-@WebServiceClient(name = "HelloWorldService", targetNamespace = "http://www.example.org/HelloWorld", wsdlLocation = "http://127.0.0.1:8080/JavaFirstTestProject/HelloWorld?wsdl")
+@WebServiceClient(name = "HelloWorldService", targetNamespace = "http://www.example.org/HelloWorld", wsdlLocation = "http://localhost:8080/JavaFirstTestProject/HelloWorld?wsdl")
public class HelloWorldService
extends Service
{
@@ -25,7 +25,7 @@
static {
URL url = null;
try {
- url = new URL("http://127.0.0.1:8080/JavaFirstTestProject/HelloWorld?wsdl");
+ url = new URL("http://localhost:8080/JavaFirstTestProject/HelloWorld?wsdl");
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java 2011-01-11 01:45:33 UTC (rev 28089)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java 2011-01-11 05:16:11 UTC (rev 28090)
@@ -79,8 +79,8 @@
startup(currentServer);
publishWebProject();
- JobUtils.delay(12000);
- String webServiceUrl = "http://127.0.0.1:8080/JavaFirstTestProject/HelloWorld?wsdl";
+ JobUtils.delay(18000);
+ String webServiceUrl = "http://localhost:8080/JavaFirstTestProject/HelloWorld?wsdl";
URL url = new URL(webServiceUrl);
URLConnection conn = url.openConnection();
assertEquals("unable to start JBoss server", IServer.STATE_STARTED,currentServer.getServerState());
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r28089 - trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-01-10 20:45:33 -0500 (Mon, 10 Jan 2011)
New Revision: 28089
Modified:
trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/Book_Info.xml
trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/add_and_manage_server_keys-task.xml
trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/using_the_deltacloud_perspective-task.xml
Log:
Changed Disconnect Cloud to Delete Cloud
Modified: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/Book_Info.xml
===================================================================
--- trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/Book_Info.xml 2011-01-11 01:19:30 UTC (rev 28088)
+++ trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/Book_Info.xml 2011-01-11 01:45:33 UTC (rev 28089)
@@ -9,7 +9,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.0</productnumber>
<edition>1</edition>
- <pubsnumber>4</pubsnumber>
+ <pubsnumber>5</pubsnumber>
<abstract>
<para>
The Cloud Tools Reference Guide provides documentation of the tools used to interact with your cloud computing instances, including the Deltacloud API.
Modified: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/add_and_manage_server_keys-task.xml
===================================================================
--- trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/add_and_manage_server_keys-task.xml 2011-01-11 01:19:30 UTC (rev 28088)
+++ trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/add_and_manage_server_keys-task.xml 2011-01-11 01:45:33 UTC (rev 28089)
@@ -6,7 +6,7 @@
<section id="sect-Cloud_Tools_Reference_Guide-Tasks-add_and_manage_server_keys">
<title>Add and manage server keys</title>
<para>
- To access Deltacloud servers, key file authentication is used. Each key represents the person accessing the server and informs the server of their authorization level.
+ To access Deltacloud servers, key file authentication is used. Each key represents the person accessing the server and informs the server of their authorization level (a person may have several keys).
</para>
<para>
Each unique user requires an individual key file and each file must be specified in the SSH2 private keys list prior to performing the ssh connection. To access the SSH2 private keys list navigate to <menuchoice>
Modified: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/using_the_deltacloud_perspective-task.xml
===================================================================
--- trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/using_the_deltacloud_perspective-task.xml 2011-01-11 01:19:30 UTC (rev 28088)
+++ trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/using_the_deltacloud_perspective-task.xml 2011-01-11 01:45:33 UTC (rev 28089)
@@ -12,7 +12,7 @@
<title>The Cloud Viewer</title>
<para>
- The <guilabel>Cloud Viewer</guilabel> view lists the servers you are connected to, the instances running on each server and the images available on each server. Right-clicking (or control-clicking on Mac OS) on a cloud connection presents you with options to disconnect from a cloud using the <guimenuitem>Disconnect Cloud</guimenuitem> option or reload the the cloud view with the <guimenuitem>Refresh View</guimenuitem> option.
+ The <guilabel>Cloud Viewer</guilabel> view lists the servers you are connected to, the instances running on each server and the images available on each server. Right-clicking (or control-clicking on Mac OS) on a cloud connection presents you with options to delete a cloud using the <guimenuitem>Delete Cloud</guimenuitem> option or reload the the cloud view with the <guimenuitem>Refresh View</guimenuitem> option.
</para>
<para>
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r28088 - trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-01-10 20:19:30 -0500 (Mon, 10 Jan 2011)
New Revision: 28088
Modified:
trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Book_Info.xml
trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Preface.xml
Log:
Updated Preface
Modified: trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Book_Info.xml
===================================================================
--- trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Book_Info.xml 2011-01-11 01:18:57 UTC (rev 28087)
+++ trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Book_Info.xml 2011-01-11 01:19:30 UTC (rev 28088)
@@ -9,7 +9,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.0</productnumber>
<edition>1</edition>
- <pubsnumber>0</pubsnumber>
+ <pubsnumber>1</pubsnumber>
<abstract>
<para>
A short overview and summary of the book's subject and purpose, traditionally no more than one paragraph long. Note: the abstract will appear in the front matter of your book and will also be placed in the description field of the book's RPM spec file.
Modified: trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Preface.xml
===================================================================
--- trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Preface.xml 2011-01-11 01:18:57 UTC (rev 28087)
+++ trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Preface.xml 2011-01-11 01:19:30 UTC (rev 28088)
@@ -1,13 +1,16 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "JBoss_Web_Services_User_Guide.ent">
+<!--<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Cloud_Tools_Reference_Guide.ent">
%BOOK_ENTITIES;
-]>
-<preface id="pref-JBoss_Web_Services_User_Guide-Preface">
+]> -->
+<preface id="pref-Cloud_Tools_Reference_Guide-Preface">
<title>Preface</title>
- <xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <para>
+ This manual uses several conventions to highlight certain words and phrases and draw attention to specific pieces of information. To get more information on these conventions please refer to the <guilabel>Document Conventions</guilabel> manual, which can be found on the <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/index.html">Red Hat Documentation</ulink> website under the <guilabel>JBoss Developer Studio</guilabel> section.
+ </para>
+ <!--<xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</xi:fallback>
- </xi:include>
+ </xi:include>-->
</preface>
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r28087 - trunk/ws/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-01-10 20:18:57 -0500 (Mon, 10 Jan 2011)
New Revision: 28087
Modified:
trunk/ws/docs/reference/en-US/Book_Info.xml
trunk/ws/docs/reference/en-US/Preface.xml
Log:
Updated Preface
Modified: trunk/ws/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/ws/docs/reference/en-US/Book_Info.xml 2011-01-11 01:18:00 UTC (rev 28086)
+++ trunk/ws/docs/reference/en-US/Book_Info.xml 2011-01-11 01:18:57 UTC (rev 28087)
@@ -2,16 +2,22 @@
<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<bookinfo>
- <title>JBoss Web Services User Guide</title><subtitle>Provides information relating to the JBoss Web Services module.</subtitle><productname>JBoss Developer Studio</productname><productnumber>4.0</productnumber><edition>4.0.0</edition><pubsnumber>3</pubsnumber>
- <abstract>
- <para>The JBoss Web Services User Guide explains how to use the JBoss Web Services module to implement web services in Java.</para>
- </abstract>
- <corpauthor>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata>
- </imageobject>
- </inlinemediaobject>
- </corpauthor>
- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <title>JBoss Web Services User Guide</title>
+ <subtitle>Provides information relating to the JBoss Web Services module.</subtitle>
+ <productname>JBoss Developer Studio</productname>
+ <productnumber>4.0</productnumber>
+ <edition>4.0.0</edition>
+ <pubsnumber>4</pubsnumber>
+ <abstract>
+ <para>The JBoss Web Services User Guide explains how to use the JBoss Web Services module to implement web services in Java.</para>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata>
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</bookinfo>
Modified: trunk/ws/docs/reference/en-US/Preface.xml
===================================================================
--- trunk/ws/docs/reference/en-US/Preface.xml 2011-01-11 01:18:00 UTC (rev 28086)
+++ trunk/ws/docs/reference/en-US/Preface.xml 2011-01-11 01:18:57 UTC (rev 28087)
@@ -1,4 +1,16 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-<preface><title>Preface</title><xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></xi:fallback></xi:include></preface>
+<!--<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Cloud_Tools_Reference_Guide.ent">
+%BOOK_ENTITIES;
+]> -->
+<preface id="pref-Cloud_Tools_Reference_Guide-Preface">
+ <title>Preface</title>
+ <para>
+ This manual uses several conventions to highlight certain words and phrases and draw attention to specific pieces of information. To get more information on these conventions please refer to the <guilabel>Document Conventions</guilabel> manual, which can be found on the <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/index.html">Red Hat Documentation</ulink> website under the <guilabel>JBoss Developer Studio</guilabel> section.
+ </para>
+ <!--<xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ </xi:fallback>
+ </xi:include>-->
+</preface>
+
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r28086 - trunk/workingset/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-01-10 20:18:00 -0500 (Mon, 10 Jan 2011)
New Revision: 28086
Modified:
trunk/workingset/docs/reference/en-US/Book_Info.xml
Log:
Updated Preface
Modified: trunk/workingset/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/workingset/docs/reference/en-US/Book_Info.xml 2011-01-11 01:16:01 UTC (rev 28085)
+++ trunk/workingset/docs/reference/en-US/Book_Info.xml 2011-01-11 01:18:00 UTC (rev 28086)
@@ -1,4 +1,23 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<bookinfo><title>Workingset Developer Tools Reference Guide</title><subtitle>Provides information relating to the Workingset Developer Tools module.</subtitle><productname>JBoss Developer Studio</productname><productnumber>3.0</productnumber><edition>1.0</edition><pubsnumber>0</pubsnumber><abstract><para>The Workingset Developer Tools Reference Guide explains how to use the Workingset Developer Tools module to group projects based on a regular expression.</para></abstract><corpauthor><inlinemediaobject><imageobject><imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata></imageobject></inlinemediaobject></corpauthor><xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></bookinfo>
+<bookinfo>
+ <title>Workingset Developer Tools Reference Guide</title>
+ <subtitle>Provides information relating to the Workingset Developer Tools module.</subtitle>
+ <productname>JBoss Developer Studio</productname>
+ <productnumber>3.0</productnumber>
+ <edition>1.0</edition>
+ <pubsnumber>1</pubsnumber>
+ <abstract>
+ <para>The Workingset Developer Tools Reference Guide explains how to use the Workingset Developer Tools module to group projects based on a regular expression.</para>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata>
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+</bookinfo>
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r28085 - trunk/struts/docs/struts_tools_tutorial/en-US.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-01-10 20:16:01 -0500 (Mon, 10 Jan 2011)
New Revision: 28085
Modified:
trunk/struts/docs/struts_tools_tutorial/en-US/Book_Info.xml
trunk/struts/docs/struts_tools_tutorial/en-US/Preface.xml
Log:
Updated Preface
Modified: trunk/struts/docs/struts_tools_tutorial/en-US/Book_Info.xml
===================================================================
--- trunk/struts/docs/struts_tools_tutorial/en-US/Book_Info.xml 2011-01-11 01:15:10 UTC (rev 28084)
+++ trunk/struts/docs/struts_tools_tutorial/en-US/Book_Info.xml 2011-01-11 01:16:01 UTC (rev 28085)
@@ -2,16 +2,22 @@
<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<bookinfo>
- <title>Struts Tools Tutorial</title><subtitle>Guides the reader through a tutorial on the Struts Tools set.</subtitle><productname>JBoss Developer Studio</productname><productnumber>4.0</productnumber><edition>4.0.0</edition><pubsnumber>3</pubsnumber>
- <abstract>
- <para>The Struts Tools Tutorial guide explains how to use the Struts Tools set and guides the reader through a tutorial.</para>
- </abstract>
- <corpauthor>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata>
- </imageobject>
- </inlinemediaobject>
- </corpauthor>
- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <title>Struts Tools Tutorial</title>
+ <subtitle>Guides the reader through a tutorial on the Struts Tools set.</subtitle>
+ <productname>JBoss Developer Studio</productname>
+ <productnumber>4.0</productnumber>
+ <edition>4.0.0</edition>
+ <pubsnumber>4</pubsnumber>
+ <abstract>
+ <para>The Struts Tools Tutorial guide explains how to use the Struts Tools set and guides the reader through a tutorial.</para>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata>
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</bookinfo>
Modified: trunk/struts/docs/struts_tools_tutorial/en-US/Preface.xml
===================================================================
--- trunk/struts/docs/struts_tools_tutorial/en-US/Preface.xml 2011-01-11 01:15:10 UTC (rev 28084)
+++ trunk/struts/docs/struts_tools_tutorial/en-US/Preface.xml 2011-01-11 01:16:01 UTC (rev 28085)
@@ -1,4 +1,16 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-<preface><title>Preface</title><xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></xi:fallback></xi:include></preface>
+<!--<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Cloud_Tools_Reference_Guide.ent">
+%BOOK_ENTITIES;
+]> -->
+<preface id="pref-Cloud_Tools_Reference_Guide-Preface">
+ <title>Preface</title>
+ <para>
+ This manual uses several conventions to highlight certain words and phrases and draw attention to specific pieces of information. To get more information on these conventions please refer to the <guilabel>Document Conventions</guilabel> manual, which can be found on the <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/index.html">Red Hat Documentation</ulink> website under the <guilabel>JBoss Developer Studio</guilabel> section.
+ </para>
+ <!--<xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ </xi:fallback>
+ </xi:include>-->
+</preface>
+
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r28084 - trunk/struts/docs/struts_tools_ref_guide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-01-10 20:15:10 -0500 (Mon, 10 Jan 2011)
New Revision: 28084
Modified:
trunk/struts/docs/struts_tools_ref_guide/en-US/Book_Info.xml
trunk/struts/docs/struts_tools_ref_guide/en-US/Preface.xml
Log:
Updated preface
Modified: trunk/struts/docs/struts_tools_ref_guide/en-US/Book_Info.xml
===================================================================
--- trunk/struts/docs/struts_tools_ref_guide/en-US/Book_Info.xml 2011-01-11 01:14:07 UTC (rev 28083)
+++ trunk/struts/docs/struts_tools_ref_guide/en-US/Book_Info.xml 2011-01-11 01:15:10 UTC (rev 28084)
@@ -2,16 +2,22 @@
<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<bookinfo>
- <title>Struts Tools Reference Guide</title><subtitle>Provides information relating to the Struts Tools module.</subtitle><productname>JBoss Developer Studio</productname><productnumber>4.0</productnumber><edition>4.0.0</edition><pubsnumber>3</pubsnumber>
- <abstract>
- <para>The Struts Tools Reference Guide explains how to use the Struts Tools to create high-quality web applications.</para>
- </abstract>
- <corpauthor>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata>
- </imageobject>
- </inlinemediaobject>
- </corpauthor>
- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <title>Struts Tools Reference Guide</title>
+ <subtitle>Provides information relating to the Struts Tools module.</subtitle>
+ <productname>JBoss Developer Studio</productname>
+ <productnumber>4.0</productnumber>
+ <edition>4.0.0</edition>
+ <pubsnumber>4</pubsnumber>
+ <abstract>
+ <para>The Struts Tools Reference Guide explains how to use the Struts Tools to create high-quality web applications.</para>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"></imagedata>
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</bookinfo>
Modified: trunk/struts/docs/struts_tools_ref_guide/en-US/Preface.xml
===================================================================
--- trunk/struts/docs/struts_tools_ref_guide/en-US/Preface.xml 2011-01-11 01:14:07 UTC (rev 28083)
+++ trunk/struts/docs/struts_tools_ref_guide/en-US/Preface.xml 2011-01-11 01:15:10 UTC (rev 28084)
@@ -1,4 +1,16 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-<preface><title>Preface</title><xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include><xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></xi:fallback></xi:include></preface>
+<!--<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Cloud_Tools_Reference_Guide.ent">
+%BOOK_ENTITIES;
+]> -->
+<preface id="pref-Cloud_Tools_Reference_Guide-Preface">
+ <title>Preface</title>
+ <para>
+ This manual uses several conventions to highlight certain words and phrases and draw attention to specific pieces of information. To get more information on these conventions please refer to the <guilabel>Document Conventions</guilabel> manual, which can be found on the <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/index.html">Red Hat Documentation</ulink> website under the <guilabel>JBoss Developer Studio</guilabel> section.
+ </para>
+ <!--<xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ </xi:fallback>
+ </xi:include>-->
+</preface>
+
13 years, 6 months
- 1
- 0