Author: jjohnstn Date: 2010-07-29 16:55:00 -0400 (Thu, 29 Jul 2010) New Revision: 23815 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/DeltaCloudClient.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudObject.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java Log: 2010-07-29 Jeff Johnston <jjohnstn(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (buildHardwareProfile): XML has changed element name to hardware_profile from hardware-profile. (buildInstance): Ditto. * src/org/jboss/tools/deltacloud/core/client/DeltaCloudObject.java (getId): Denote as XMLAttribute now that id is no longer an element. * src/org/jboss/tools/deltacloud/core/client/Instance.java (publicAddresses): Change XML element name to public_addresses from public-addresses. (privateAddresses): Similar except for private-addresses to private_addresses. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-07-29 20:18:16 UTC (rev 23814) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-07-29 20:55:00 UTC (rev 23815) @@ -1,3 +1,14 @@ +2010-07-29 Jeff Johnston <jjohnstn(a)redhat.com&gt; + + * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (buildHardwareProfile): XML + has changed element name to hardware_profile from hardware-profile. + (buildInstance): Ditto. + * src/org/jboss/tools/deltacloud/core/client/DeltaCloudObject.java (getId): Denote as + XMLAttribute now that id is no longer an element. + * src/org/jboss/tools/deltacloud/core/client/Instance.java (publicAddresses): Change + XML element name to public_addresses from public-addresses. + (privateAddresses): Similar except for private-addresses to private_addresses. + 2010-07-28 Jeff Johnston <jjohnstn(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (findCloud): New Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-07-29 20:18:16 UTC (rev 23814) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-07-29 20:55:00 UTC (rev 23815) @@ -244,8 +244,8 @@ Document document = db.parse(new InputSource(new StringReader(xml))); instance.setImageId(getIdFromHref(getAttributeValues(document, "image", "href").get(0))); - instance.setProfileId(getIdFromHref(getAttributeValues(document, "hardware-profile", "href").get(0))); - getProfileProperties(instance, getPropertyNodes(document, "hardware-profile")); + instance.setProfileId(getIdFromHref(getAttributeValues(document, "hardware_profile", "href").get(0))); + getProfileProperties(instance, getPropertyNodes(document, "hardware_profile")); instance.setRealmId(getIdFromHref(getAttributeValues(document, "realm", "href").get(0))); instance.setState(getElementText(document, "state").get(0)); @@ -275,7 +275,7 @@ DocumentBuilder db = dbf.newDocumentBuilder(); Document document = db.parse(new InputSource(new StringReader(xml))); - List<Node> nodes = getPropertyNodes(document, "hardware-profile"); + List<Node> nodes = getPropertyNodes(document, "hardware_profile"); for (Node n : nodes) { Property p = new Property(); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudObject.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudObject.java 2010-07-29 20:18:16 UTC (rev 23814) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudObject.java 2010-07-29 20:55:00 UTC (rev 23815) @@ -2,13 +2,12 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAttribute; public abstract class DeltaCloudObject implements Serializable { private static final long serialVersionUID = 1L; - @XmlElement protected String id; @SuppressWarnings("unused") @@ -16,7 +15,8 @@ { this.id = id; } - + + @XmlAttribute public String getId() { return id; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-07-29 20:18:16 UTC (rev 23814) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-07-29 20:55:00 UTC (rev 23815) @@ -35,10 +35,10 @@ private List<Action> actions; - @XmlElement(name="public-addresses") + @XmlElement(name="public_addresses") private AddressList publicAddresses; - @XmlElement(name="private-addresses") + @XmlElement(name="private_addresses") private AddressList privateAddresses; private Instance()