fix xml annotations

This commit is contained in:
danikov 2012-02-13 16:46:15 +00:00
parent 121d88121a
commit cefbe01e53
2 changed files with 8 additions and 7 deletions

View File

@ -20,6 +20,7 @@
package org.jclouds.vcloud.director.v1_5.domain; package org.jclouds.vcloud.director.v1_5.domain;
import static com.google.common.base.Objects.equal; 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.net.URI;
import java.util.Set; 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.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects; import com.google.common.base.Objects;
@ -60,9 +62,8 @@ import com.google.common.base.Objects;
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Media", propOrder = { @XmlRootElement(namespace = VCLOUD_1_5_NS, name = "Media")
"owner" @XmlType(propOrder = {"owner"})
})
public class Media public class Media
extends ResourceEntityType<Media> extends ResourceEntityType<Media>
@ -220,7 +221,7 @@ public class Media
super(); super();
} }
@XmlElement(name = "Owner") @XmlElement(namespace = VCLOUD_1_5_NS, name = "Owner")
protected Owner owner; protected Owner owner;
@XmlAttribute(required = true) @XmlAttribute(required = true)
protected String imageType; protected String imageType;

View File

@ -28,6 +28,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects; import com.google.common.base.Objects;
@ -59,9 +60,8 @@ import com.google.common.collect.Sets;
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Owner", propOrder = { @XmlRootElement(name = "Owner")
"user" @XmlType(propOrder = {"user"})
})
public class Owner public class Owner
extends ResourceType<Owner> extends ResourceType<Owner>