From 95347a5b9662d41033c00277ff0da578249fa90d Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Mon, 23 Apr 2012 19:25:22 -0700 Subject: [PATCH] wrapper -> view; typo undo --- .../vcloud/director/v1_5/domain/Capabilities.java | 4 ++-- .../jclouds/vcloud/director/v1_5/domain/Catalog.java | 4 ++-- .../jclouds/vcloud/director/v1_5/domain/Entity.java | 4 ++-- .../jclouds/vcloud/director/v1_5/domain/Group.java | 4 ++-- .../vcloud/director/v1_5/domain/ResourceEntity.java | 4 ++-- .../jclouds/vcloud/director/v1_5/domain/User.java | 4 ++-- .../vcloud/director/v1_5/domain/VAppTemplate.java | 4 ++-- .../org/jclouds/vcloud/director/v1_5/domain/Vdc.java | 6 +++--- .../vcloud/director/v1_5/domain/org/AdminOrg.java | 12 ++++++------ .../v1_5/domain/params/ControlAccessParams.java | 4 ++-- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java index df0b3c2473..c3d17c753f 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java @@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementView; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Objects; @@ -106,7 +106,7 @@ public class Capabilities { } - @XmlElementView(name = "SupportedHardwareVersions") + @XmlElementWrapper(name = "SupportedHardwareVersions") @XmlElement(name = "SupportedHardwareVersion") protected Set supportedHardwareVersions = Sets.newLinkedHashSet(); diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java index 9759cb3e06..cd82435e3d 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java @@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementView; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; @@ -129,7 +129,7 @@ public class Catalog extends Entity { @XmlElement(name = "Owner") private Owner owner; - @XmlElementView(name = "CatalogItems") + @XmlElementWrapper(name = "CatalogItems") @XmlElement(name = "CatalogItem") private Set catalogItems; @XmlElement(name = "IsPublished") diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java index d0ef6fbe72..43e8559c9e 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java @@ -25,7 +25,7 @@ import java.util.List; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementView; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; @@ -124,7 +124,7 @@ public class Entity extends Resource { @XmlElement(name = "Description") private String description; - @XmlElementView(name = "Tasks") + @XmlElementWrapper(name = "Tasks") @XmlElement(name = "Task") private List tasks; @XmlAttribute diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java index 4b0b6e39e9..713f11a5e8 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java @@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementView; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; @@ -135,7 +135,7 @@ public class Group extends Entity { @XmlElement(name = "NameInSource") protected String nameInSource; - @XmlElementView(name = "UsersList") + @XmlElementWrapper(name = "UsersList") @XmlElement(name = "UserReference") protected Set usersList = Sets.newLinkedHashSet(); @XmlElement(name = "Role") diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java index 3d120a7804..fd889a449d 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java @@ -26,7 +26,7 @@ import java.util.Set; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementView; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; @@ -171,7 +171,7 @@ public abstract class ResourceEntity extends Entity { } } - @XmlElementView(name = "Files") + @XmlElementWrapper(name = "Files") @XmlElement(name = "File") private Set files; @XmlAttribute diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java index c573b5c3e0..b794c1c71e 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java @@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementView; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; @@ -348,7 +348,7 @@ public class User extends Entity { private Reference role; @XmlElement(name = "Password") private String password; - @XmlElementView(name = "GroupReferences") + @XmlElementWrapper(name = "GroupReferences") private List groups; protected User(Builder builder) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java index c8db687608..7c90d7a29c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlElementView; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import org.jclouds.dmtf.ovf.DeploymentOptionSection; @@ -146,7 +146,7 @@ public class VAppTemplate extends ResourceEntity { @XmlElement(name = "Owner") private Owner owner; - @XmlElementView(name = "Children") + @XmlElementWrapper(name = "Children") @XmlElement(name = "Vm") private Set children = Sets.newLinkedHashSet(); @XmlElementRefs({ diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java index d6ba587b0e..fbf51762ea 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java @@ -25,7 +25,7 @@ import java.util.Set; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementView; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; @@ -223,10 +223,10 @@ public class Vdc extends Entity { private CapacityWithUsage storageCapacity; @XmlElement(name = "ComputeCapacity", required = true) private ComputeCapacity computeCapacity; - @XmlElementView(name = "ResourceEntities") + @XmlElementWrapper(name = "ResourceEntities") @XmlElement(name = "ResourceEntity") private Set resourceEntities = Sets.newLinkedHashSet(); - @XmlElementView(name = "AvailableNetworks") + @XmlElementWrapper(name = "AvailableNetworks") @XmlElement(name = "Network") protected Set availableNetworks = Sets.newLinkedHashSet(); @XmlElement(name = "Capabilities") diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java index 2c1187e368..e92df61ba5 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java @@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementView; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; @@ -208,19 +208,19 @@ public class AdminOrg extends Org { @XmlElement(name = "Settings", required = true) private OrgSettings settings; - @XmlElementView(name = "Users") + @XmlElementWrapper(name = "Users") @XmlElement(name = "UserReference") protected Set users = Sets.newLinkedHashSet(); - @XmlElementView(name = "Groups") + @XmlElementWrapper(name = "Groups") @XmlElement(name = "GroupReference") protected Set groups = Sets.newLinkedHashSet(); - @XmlElementView(name = "Catalogs") + @XmlElementWrapper(name = "Catalogs") @XmlElement(name = "CatalogReference") private Set catalogs = Sets.newLinkedHashSet(); - @XmlElementView(name = "Vdcs") + @XmlElementWrapper(name = "Vdcs") @XmlElement(name = "Vdc") protected Set vdcs = Sets.newLinkedHashSet(); - @XmlElementView(name = "Networks") + @XmlElementWrapper(name = "Networks") @XmlElement(name = "Network") protected Set networks = Sets.newLinkedHashSet(); diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java index d337a1ef36..dd1c66f3c9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Set; import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementView; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; @@ -143,7 +143,7 @@ public class ControlAccessParams { protected Boolean sharedToEveryone; @XmlElement(name = "EveryoneAccessLevel") protected String everyoneAccessLevel; - @XmlElementView(name = "AccessSettings") + @XmlElementWrapper(name = "AccessSettings") @XmlElement(name = "AccessSetting") protected List accessSettings;