From cefbe01e5381813af7be7421f0b7bd77b0672a0d Mon Sep 17 00:00:00 2001 From: danikov Date: Mon, 13 Feb 2012 16:46:15 +0000 Subject: [PATCH] fix xml annotations --- .../org/jclouds/vcloud/director/v1_5/domain/Media.java | 9 +++++---- .../org/jclouds/vcloud/director/v1_5/domain/Owner.java | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java index cbcd292807..2c9077b665 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java @@ -20,6 +20,7 @@ package org.jclouds.vcloud.director.v1_5.domain; import static com.google.common.base.Objects.equal; +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS; import java.net.URI; import java.util.Set; @@ -28,6 +29,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Objects; @@ -60,9 +62,8 @@ import com.google.common.base.Objects; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Media", propOrder = { - "owner" -}) +@XmlRootElement(namespace = VCLOUD_1_5_NS, name = "Media") +@XmlType(propOrder = {"owner"}) public class Media extends ResourceEntityType @@ -220,7 +221,7 @@ public class Media super(); } - @XmlElement(name = "Owner") + @XmlElement(namespace = VCLOUD_1_5_NS, name = "Owner") protected Owner owner; @XmlAttribute(required = true) protected String imageType; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java index 642bd159ff..88e392cfd3 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java @@ -28,6 +28,7 @@ import java.util.Set; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Objects; @@ -59,9 +60,8 @@ import com.google.common.collect.Sets; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Owner", propOrder = { - "user" -}) +@XmlRootElement(name = "Owner") +@XmlType(propOrder = {"user"}) public class Owner extends ResourceType