diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java index b25b64cb15..356118c13a 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java @@ -36,6 +36,14 @@ import org.jclouds.dmtf.ovf.NetworkSection; import org.jclouds.dmtf.ovf.ProductSection; import org.jclouds.dmtf.ovf.SectionType; import org.jclouds.dmtf.ovf.StartupSection; +import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection; +import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection; +import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection; +import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; @@ -52,7 +60,7 @@ import com.google.common.collect.Sets; * @author grkvlt@apache.org */ @XmlType(name = "AbstractVAppType") -public abstract class AbstractVAppType extends ResourceEntityType { +public abstract class AbstractVAppType extends ResourceEntity { public static Builder builder() { return new ConcreteBuilder(); @@ -66,7 +74,7 @@ public abstract class AbstractVAppType extends ResourceEntityType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceEntityType.Builder { + public static abstract class Builder> extends ResourceEntity.Builder { private Boolean deployed; private Reference vAppParent; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java index 3c0683066f..4dd68787f0 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java @@ -21,6 +21,7 @@ package org.jclouds.vcloud.director.v1_5.domain; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; + /** * Admin representation of the container for meta data (key-value pair) associated to different * entities in the system. @@ -39,7 +40,7 @@ import javax.xml.bind.annotation.XmlType; */ @XmlRootElement(name = "AdminCatalog") @XmlType(name = "AdminCatalogType") -public class AdminCatalog extends CatalogType { +public class AdminCatalog extends Catalog { public static Builder builder() { return new ConcreteBuilder(); @@ -53,7 +54,7 @@ public class AdminCatalog extends CatalogType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends CatalogType.Builder { + public static abstract class Builder> extends Catalog.Builder { @Override public AdminCatalog build() { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java index 6b6cabc4e4..fd1c4f65cc 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java @@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; 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 915751e600..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 @@ -18,10 +18,21 @@ */ package org.jclouds.vcloud.director.v1_5.domain; +import static com.google.common.base.Objects.equal; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.util.Set; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; -import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import com.google.common.base.Objects; +import com.google.common.base.Objects.ToStringHelper; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; /** * Container for references to {@link VAppTemplate} and {@link Media} objects. @@ -30,13 +41,12 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; * <complexType name="CatalogType" /> * * - * @author grkvlt@apache.org + * @author danikov */ @XmlSeeAlso({ AdminCatalog.class }) @XmlRootElement(name = "Catalog") -public class Catalog extends CatalogType { - - public static final String MEDIA_TYPE = VCloudDirectorMediaType.CATALOG; +@XmlType(name = "CatalogType") +public class Catalog extends Entity { public static Builder builder() { return new ConcreteBuilder(); @@ -44,30 +54,131 @@ public class Catalog extends CatalogType { @Override public Builder toBuilder() { - return builder().fromCatalog(this); + return builder().fromCatalogType(this); } private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends CatalogType.Builder { + public static class Builder> extends Entity.Builder { + + private Owner owner; + private Set catalogItems = Sets.newLinkedHashSet(); + private Boolean isPublished; + + /** + * @see CatalogType#getOwner() + */ + public B owner(Owner owner) { + this.owner = owner; + return self(); + } + + /** + * @see CatalogItems#getCatalogItems() + */ + public B items(Iterable catalogItems) { + this.catalogItems = Sets.newLinkedHashSet(checkNotNull(catalogItems, "catalogItems")); + return self(); + } + + /** + * @see CatalogItems#getCatalogItems() + */ + public B item(Reference catalogItem) { + this.catalogItems.add(checkNotNull(catalogItem, "catalogItem")); + return self(); + } + + /** + * @see CatalogType#isPublished() + */ + public B isPublished(Boolean isPublished) { + this.isPublished = isPublished; + return self(); + } + + /** + * @see CatalogType#isPublished() + */ + public B published() { + this.isPublished = Boolean.TRUE; + return self(); + } @Override public Catalog build() { return new Catalog(this); } - - public B fromCatalog(Catalog in) { - return fromCatalogType(in); + + public B fromCatalogType(Catalog in) { + return fromEntityType(in).owner(in.getOwner()).items(in.getCatalogItems()).isPublished(in.isPublished()); } } - public Catalog(Builder builder) { + protected Catalog(Builder builder) { super(builder); + this.owner = builder.owner; + this.catalogItems = builder.catalogItems == null || builder.catalogItems.isEmpty() ? null : ImmutableSet.copyOf(builder.catalogItems); + this.isPublished = builder.isPublished; } - @SuppressWarnings("unused") - private Catalog() { - // for JAXB + protected Catalog() { + // For JAXB } + + @XmlElement(name = "Owner") + private Owner owner; + @XmlElementWrapper(name = "CatalogItems") + @XmlElement(name = "CatalogItem") + private Set catalogItems; + @XmlElement(name = "IsPublished") + private Boolean isPublished; + + /** + * Gets the value of the owner property. + */ + public Owner getOwner() { + return owner; + } + + /** + * Gets the value of the catalogItems property. + */ + public Set getCatalogItems() { + return catalogItems == null ? ImmutableSet.of() : ImmutableSet.copyOf(catalogItems); + } + + /** + * Gets the value of the isPublished property. + */ + public Boolean isPublished() { + return isPublished; + } + + @Override + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + Catalog that = Catalog.class.cast(o); + return super.equals(that) && + equal(this.owner, that.owner) && + equal(this.getCatalogItems(), that.getCatalogItems()) && + equal(this.isPublished, that.isPublished); + } + + @Override + public int hashCode() { + return Objects.hashCode(super.hashCode(), owner, getCatalogItems(), catalogItems); + } + + @Override + public ToStringHelper string() { + return super.string().add("owner", owner) + .add("catalogItems", getCatalogItems()) + .add("isPublished", isPublished); + } + } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java index 55e7fe756a..6e5c97a6c8 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java @@ -41,7 +41,7 @@ import com.google.common.collect.Sets; * @author grkvlt@apache.org */ @XmlRootElement(name = "CatalogItem") -public class CatalogItem extends EntityType { +public class CatalogItem extends Entity { public static final String MEDIA_TYPE = VCloudDirectorMediaType.CATALOG_ITEM; @@ -57,7 +57,7 @@ public class CatalogItem extends EntityType { private static class ConcreteBuilder extends Builder { } - public static class Builder> extends EntityType.Builder { + public static class Builder> extends Entity.Builder { private Reference entity; private Set properties = Sets.newLinkedHashSet(); diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogType.java deleted file mode 100644 index 91fe4de009..0000000000 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogType.java +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.jclouds.vcloud.director.v1_5.domain; - -import static com.google.common.base.Objects.equal; -import static com.google.common.base.Preconditions.checkNotNull; - -import java.util.Set; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; - -import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; - -/** - * Container for references to VappTemplate and Media objects. - * - * 
- * <complexType name="CatalogType" />
- *
- * - * @author danikov - */ -@XmlRootElement(name = "Catalog") -public class CatalogType extends EntityType { - - public static Builder builder() { - return new ConcreteBuilder(); - } - - @Override - public Builder toBuilder() { - return builder().fromCatalogType(this); - } - - private static class ConcreteBuilder extends Builder { - } - - public static class Builder> extends EntityType.Builder { - - private Owner owner; - private Set catalogItems = Sets.newLinkedHashSet(); - private Boolean isPublished; - - /** - * @see CatalogType#getOwner() - */ - public B owner(Owner owner) { - this.owner = owner; - return self(); - } - - /** - * @see CatalogItems#getCatalogItems() - */ - public B items(Iterable catalogItems) { - this.catalogItems = Sets.newLinkedHashSet(checkNotNull(catalogItems, "catalogItems")); - return self(); - } - - /** - * @see CatalogItems#getCatalogItems() - */ - public B item(Reference catalogItem) { - this.catalogItems.add(checkNotNull(catalogItem, "catalogItem")); - return self(); - } - - /** - * @see CatalogType#isPublished() - */ - public B isPublished(Boolean isPublished) { - this.isPublished = isPublished; - return self(); - } - - /** - * @see CatalogType#isPublished() - */ - public B published() { - this.isPublished = Boolean.TRUE; - return self(); - } - - @Override - public CatalogType build() { - return new CatalogType(this); - } - - public B fromCatalogType(CatalogType in) { - return fromEntityType(in).owner(in.getOwner()).items(in.getCatalogItems()).isPublished(in.isPublished()); - } - } - - protected CatalogType(Builder builder) { - super(builder); - this.owner = builder.owner; - this.catalogItems = builder.catalogItems == null || builder.catalogItems.isEmpty() ? null : ImmutableSet.copyOf(builder.catalogItems); - this.isPublished = builder.isPublished; - } - - protected CatalogType() { - // For JAXB - } - - @XmlElement(name = "Owner") - private Owner owner; - @XmlElementWrapper(name = "CatalogItems") - @XmlElement(name = "CatalogItem") - private Set catalogItems; - @XmlElement(name = "IsPublished") - private Boolean isPublished; - - /** - * Gets the value of the owner property. - */ - public Owner getOwner() { - return owner; - } - - /** - * Gets the value of the catalogItems property. - */ - public Set getCatalogItems() { - return catalogItems == null ? ImmutableSet.of() : ImmutableSet.copyOf(catalogItems); - } - - /** - * Gets the value of the isPublished property. - */ - public Boolean isPublished() { - return isPublished; - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; - CatalogType that = CatalogType.class.cast(o); - return super.equals(that) && - equal(this.owner, that.owner) && - equal(this.getCatalogItems(), that.getCatalogItems()) && - equal(this.isPublished, that.isPublished); - } - - @Override - public int hashCode() { - return Objects.hashCode(super.hashCode(), owner, getCatalogItems(), catalogItems); - } - - @Override - public ToStringHelper string() { - return super.string().add("owner", owner) - .add("catalogItems", getCatalogItems()) - .add("isPublished", 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 9bb44e4d1c..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 @@ -1,4 +1,4 @@ -/** +/* * Licensed to jclouds, Inc. (jclouds) under one or more * contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -18,46 +18,200 @@ */ package org.jclouds.vcloud.director.v1_5.domain; +import static com.google.common.base.Objects.equal; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.util.List; + +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +import com.google.common.base.Objects; +import com.google.common.base.Objects.ToStringHelper; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; /** - * An entity. + * Basic entity type in the vCloud object model. + * + * Includes the entity name and an optional id, description, and set of running {@link Task}s. + * + * 
+ * <xs:complexType name="EntityType" />
+ *
* * @author grkvlt@apache.org * @author Adam Lowe */ @XmlRootElement(name = "Entity") -public class Entity extends EntityType { - +@XmlType(name = "EntityType") +public class Entity extends Resource { + public static Builder builder() { return new ConcreteBuilder(); } @Override public Builder toBuilder() { - return builder().fromEntity(this); + return builder().fromEntityType(this); } private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends EntityType.Builder { + public static abstract class Builder> extends Resource.Builder { + + private String description; + private List tasks = Lists.newArrayList(); + private String name; + private String id; + + /** + * @see EntityType#getName() + */ + public B name(String name) { + this.name = name; + return self(); + } + + /** + * @see EntityType#getDescription() + */ + public B description(String description) { + this.description = description; + return self(); + } + + /** + * @see EntityType#getId() + */ + public B id(String id) { + this.id = id; + return self(); + } + + /** + * @see EntityType#getTasks() + */ + public B tasks(Iterable tasks) { + this.tasks = Lists.newArrayList(checkNotNull(tasks, "tasks")); + return self(); + } + + /** + * @see EntityType#getTasks() + */ + public B task(Task task) { + this.tasks.add(checkNotNull(task, "task")); + return self(); + } @Override public Entity build() { return new Entity(this); } - - public B fromEntity(Entity in) { - return fromEntityType(in); + + public B fromEntityType(Entity in) { + return fromResource(in) + .description(in.getDescription()) + .tasks(in.getTasks()) + .id(in.getId()).name(in.getName()); } } - private Entity(Builder builder) { + @XmlElement(name = "Description") + private String description; + @XmlElementWrapper(name = "Tasks") + @XmlElement(name = "Task") + private List tasks; + @XmlAttribute + private String id; + @XmlAttribute(required = true) + private String name; + + protected Entity(Builder builder) { super(builder); + this.description = builder.description; + this.tasks = builder.tasks == null || builder.tasks.isEmpty() ? null : ImmutableList.copyOf(builder.tasks); + this.id = builder.id; + this.name = builder.name; } - private Entity() { + protected Entity() { // For JAXB } -} \ No newline at end of file + + /** + * Optional description. + */ + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + /** + * A list of queued, running, or recently completed tasks associated with this entity. + */ + public List getTasks() { + return tasks == null ? ImmutableList.of() : ImmutableList.copyOf(tasks); + } + + /** + * The resource identifier, expressed in URN format. + * + * The value of this attribute uniquely identifies the resource, persists for the life of the + * resource, and is never reused. + */ + public String getId() { + return id; + } + + /** + * Contains the name of the the entity. + */ + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + Entity that = Entity.class.cast(o); + return super.equals(that) && + equal(this.id, that.id) && equal(this.description, that.description) && + equal(this.tasks, that.tasks) && equal(this.name, that.name); + } + + @Override + public boolean clone(Object o) { + if (this == o) + return false; + if (o == null || getClass() != o.getClass()) + return false; + Entity that = Entity.class.cast(o); + return super.clone(that); + } + + @Override + public int hashCode() { + return Objects.hashCode(super.hashCode(), description, tasks, id, name); + } + + @Override + public ToStringHelper string() { + return super.string().add("description", description).add("tasks", tasks).add("id", id).add("name", name); + } +} diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/EntityType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/EntityType.java deleted file mode 100644 index 2184300250..0000000000 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/EntityType.java +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.jclouds.vcloud.director.v1_5.domain; - -import static com.google.common.base.Objects.equal; -import static com.google.common.base.Preconditions.checkNotNull; - -import java.util.List; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlType; - -import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; - -/** - * Basic entity type in the vCloud object model. - * - * Includes the entity name and an optional id, description, and set of running {@link Task}s. - * - * 
- * <xs:complexType name="EntityType" />
- *
- * - * @author grkvlt@apache.org - * @author Adam Lowe - */ -@XmlType(name = "EntityType") -public class EntityType extends ResourceType { - - public static Builder builder() { - return new ConcreteBuilder(); - } - - @Override - public Builder toBuilder() { - return builder().fromEntityType(this); - } - - private static class ConcreteBuilder extends Builder { - } - - public static abstract class Builder> extends ResourceType.Builder { - - private String description; - private List tasks = Lists.newArrayList(); - private String name; - private String id; - - /** - * @see EntityType#getName() - */ - public B name(String name) { - this.name = name; - return self(); - } - - /** - * @see EntityType#getDescription() - */ - public B description(String description) { - this.description = description; - return self(); - } - - /** - * @see EntityType#getId() - */ - public B id(String id) { - this.id = id; - return self(); - } - - /** - * @see EntityType#getTasks() - */ - public B tasks(Iterable tasks) { - this.tasks = Lists.newArrayList(checkNotNull(tasks, "tasks")); - return self(); - } - - /** - * @see EntityType#getTasks() - */ - public B task(Task task) { - this.tasks.add(checkNotNull(task, "task")); - return self(); - } - - @Override - public EntityType build() { - return new EntityType(this); - } - - public B fromEntityType(EntityType in) { - return fromResourceType(in) - .description(in.getDescription()) - .tasks(in.getTasks()) - .id(in.getId()).name(in.getName()); - } - } - - @XmlElement(name = "Description") - private String description; - @XmlElementWrapper(name = "Tasks") - @XmlElement(name = "Task") - private List tasks; - @XmlAttribute - private String id; - @XmlAttribute(required = true) - private String name; - - protected EntityType(Builder builder) { - super(builder); - this.description = builder.description; - this.tasks = builder.tasks == null || builder.tasks.isEmpty() ? null : ImmutableList.copyOf(builder.tasks); - this.id = builder.id; - this.name = builder.name; - } - - protected EntityType() { - // For JAXB - } - - /** - * Optional description. - */ - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - /** - * A list of queued, running, or recently completed tasks associated with this entity. - */ - public List getTasks() { - return tasks == null ? ImmutableList.of() : ImmutableList.copyOf(tasks); - } - - /** - * The resource identifier, expressed in URN format. - * - * The value of this attribute uniquely identifies the resource, persists for the life of the - * resource, and is never reused. - */ - public String getId() { - return id; - } - - /** - * Contains the name of the the entity. - */ - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; - EntityType that = EntityType.class.cast(o); - return super.equals(that) && - equal(this.id, that.id) && equal(this.description, that.description) && - equal(this.tasks, that.tasks) && equal(this.name, that.name); - } - - @Override - public boolean clone(Object o) { - if (this == o) - return false; - if (o == null || getClass() != o.getClass()) - return false; - EntityType that = EntityType.class.cast(o); - return super.clone(that); - } - - @Override - public int hashCode() { - return Objects.hashCode(super.hashCode(), description, tasks, id, name); - } - - @Override - public ToStringHelper string() { - return super.string().add("description", description).add("tasks", tasks).add("id", id).add("name", name); - } -} diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java index 2190de4f5f..f461490a6a 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java @@ -53,7 +53,7 @@ import com.google.common.base.Objects.ToStringHelper; * */ @XmlType(name = "File") -public class File extends EntityType { +public class File extends Entity { public static Builder builder() { return new ConcreteBuilder(); @@ -67,7 +67,7 @@ public class File extends EntityType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends EntityType.Builder { + public static abstract class Builder> extends Entity.Builder { private Long size; private Long bytesTransferred; 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 08fb5bd2ef..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 @@ -56,7 +56,7 @@ import com.google.common.collect.Sets; "usersList", "role" }) -public class Group extends EntityType { +public class Group extends Entity { public static Builder builder() { return new ConcreteBuilder(); @@ -70,7 +70,7 @@ public class Group extends EntityType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends EntityType.Builder { + public static abstract class Builder> extends Entity.Builder { private String nameInSource; private Set users = Sets.newLinkedHashSet(); 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 963a603977..7eaa5aaced 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 @@ -46,7 +46,7 @@ import com.google.common.collect.Maps; * */ @XmlRootElement(name = "Media") -public class Media extends ResourceEntityType { +public class Media extends ResourceEntity { @XmlType @XmlEnum(String.class) @@ -93,7 +93,7 @@ public class Media extends ResourceEntityType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceEntityType.Builder { + public static abstract class Builder> extends ResourceEntity.Builder { private Owner owner; private ImageType imageType; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java index 4e590fdf05..bd020be889 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java @@ -44,7 +44,7 @@ import com.google.common.collect.Sets; * @author danikov */ @XmlRootElement(name = "Metadata") -public class Metadata extends ResourceType { +public class Metadata extends Resource { public static final String MEDIA_TYPE = VCloudDirectorMediaType.METADATA; @@ -60,7 +60,7 @@ public class Metadata extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private Set metadataEntries = Sets.newLinkedHashSet(); @@ -86,7 +86,7 @@ public class Metadata extends ResourceType { } public B fromMetadata(Metadata in) { - return fromResourceType(in).entries(in.getMetadataEntries()); + return fromResource(in).entries(in.getMetadataEntries()); } } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java index 910df170d3..0319146d8a 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java @@ -43,7 +43,7 @@ import com.google.common.collect.Sets; * @author danikov */ @XmlRootElement(name = "MetadataEntry") -public class MetadataEntry extends ResourceType { +public class MetadataEntry extends Resource { public static final String MEDIA_TYPE = VCloudDirectorMediaType.METADATA_ENTRY; @@ -59,7 +59,7 @@ public class MetadataEntry extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private String key; private String value; @@ -131,7 +131,7 @@ public class MetadataEntry extends ResourceType { } public B fromMetadataEntry(MetadataEntry in) { - return fromResourceType(in).entry(key, value); + return fromResource(in).entry(key, value); } } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataValue.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataValue.java index cd4a79ed18..6a6969489a 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataValue.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataValue.java @@ -43,7 +43,7 @@ import com.google.common.collect.Sets; * @author grkvlt@apache.org */ @XmlRootElement(name = "MetadataValue") -public class MetadataValue extends ResourceType { +public class MetadataValue extends Resource { public static final String MEDIA_TYPE = VCloudDirectorMediaType.METADATA_ENTRY; @@ -59,7 +59,7 @@ public class MetadataValue extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private String value; /** @@ -112,7 +112,7 @@ public class MetadataValue extends ResourceType { } public B fromMetadataValue(MetadataValue in) { - return fromResourceType(in).value(value); + return fromResource(in).value(value); } } 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 b06d483e68..7b568ccb2e 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 @@ -38,7 +38,7 @@ import com.google.common.base.Objects.ToStringHelper; */ @XmlRootElement(name = "Owner") @XmlType(name = "OwnerType") -public class Owner extends ResourceType { +public class Owner extends Resource { public static Builder builder() { return new ConcreteBuilder(); @@ -52,7 +52,7 @@ public class Owner extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private Reference user; @@ -70,7 +70,7 @@ public class Owner extends ResourceType { } public B fromOwner(Owner in) { - return fromResourceType(in) + return fromResource(in) .user(in.getUser()); } } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java index 80472eeb2b..52df0dd820 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java @@ -56,7 +56,7 @@ import com.google.common.collect.Sets; */ @XmlRootElement(name = "ProductSectionList") @XmlType(name = "ProductSectionListType") -public class ProductSectionList extends ResourceType implements Set { +public class ProductSectionList extends Resource implements Set { public static Builder builder() { return new ConcreteBuilder(); @@ -70,7 +70,7 @@ public class ProductSectionList extends ResourceType implements Set { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private Set productSections = Sets.newLinkedHashSet(); @@ -96,7 +96,7 @@ public class ProductSectionList extends ResourceType implements Set { +public class RasdItemsList extends Resource implements Set { public static Builder builder() { return new ConcreteBuilder(); @@ -58,7 +60,7 @@ public class RasdItemsList extends ResourceType implements Set { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private Set items = Sets.newLinkedHashSet(); @@ -85,7 +87,7 @@ public class RasdItemsList extends ResourceType implements Set { } public B fromRasdItemsList(RasdItemsList in) { - return fromResourceType(in).items(in.getItems()); + return fromResource(in).items(in.getItems()); } } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java index 90b5299815..f9b4526107 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java @@ -119,7 +119,7 @@ public class Reference { return href(in.getHref()).id(in.getId()).name(in.getName()).type(in.getType()); } - public B fromEntity(EntityType in) { + public B fromEntity(Entity in) { return href(in.getHref()).id(in.getId()).name(in.getName()).type(in.getType()); } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java index 279137df6d..aee041f8a9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to jclouds, Inc. (jclouds) under one or more * contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -18,21 +18,49 @@ */ package org.jclouds.vcloud.director.v1_5.domain; +import static com.google.common.base.Objects.equal; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.net.URI; +import java.util.Collections; +import java.util.Set; + +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 org.jclouds.logging.Logger; + +import com.google.common.base.Objects; +import com.google.common.base.Objects.ToStringHelper; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; /** - * A resource. + * The base type for all objects in the vCloud model. * - * @author grkvlt@apache.org + * Has an optional list of links and href and type attributes. + * + * 
+ * <xs:complexType name="ResourceType" />
+ *
+ * + * @author Adrian Cole + * + * @since 0.9 */ @XmlRootElement(name = "Resource") -public class Resource extends ResourceType { +@XmlType(name = "ResourceType") +public class Resource { + @javax.annotation.Resource + protected static Logger logger = Logger.NULL; + public static Builder builder() { return new ConcreteBuilder(); } - @Override public Builder toBuilder() { return builder().fromResource(this); } @@ -40,26 +68,112 @@ public class Resource extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> { + private URI href; + private String type; + private Set links; + + @SuppressWarnings("unchecked") + protected B self() { + return (B) this; + } + + /** + * @see ResourceType#getHref() + */ + public B href(URI href) { + this.href = href; + return self(); + } + + /** + * @see ResourceType#getType() + */ + public B type(String type) { + this.type = type; + return self(); + } + + /** + * @see ResourceType#getLinks() + */ + public B links(Set links) { + this.links = Sets.newLinkedHashSet(checkNotNull(links, "links")); + return self(); + } + + /** + * @see ResourceType#getLinks() + */ + public B link(Link link) { + if (links == null) + links = Sets.newLinkedHashSet(); + this.links.add(checkNotNull(link, "link")); + return self(); + } - @Override public Resource build() { return new Resource(this); } protected B fromResource(Resource in) { - return fromResourceType(in); + return href(in.getHref()).type(in.getType()).links(Sets.newLinkedHashSet(in.getLinks())); } } - protected Resource(Builder builder) { - super(builder); - } + @XmlAttribute + private URI href; + @XmlAttribute + private String type; + @XmlElement(name = "Link") + private Set links = Sets.newLinkedHashSet(); + protected Resource(Builder builder) { + this.href = builder.href; + this.type = builder.type; + this.links = builder.links == null ? Collections.emptySet() : builder.links; + } + protected Resource() { // For JAXB } + /** + * Contains the URI to the entity. + * + * An object reference, expressed in URL format. Because this URL includes the object identifier + * portion of the id attribute value, it uniquely identifies the object, persists for the life of + * the object, and is never reused. The value of the href attribute is a reference to a view of + * the object, and can be used to access a representation of the object that is valid in a + * particular context. Although URLs have a well-known syntax and a well-understood + * interpretation, a client should treat each href as an opaque string. The rules that govern how + * the server constructs href strings might change in future releases. + * + * @return an opaque reference and should never be parsed + */ + public URI getHref() { + return href; + } + + /** + * Contains the type of the the entity. + * + * The object type, specified as a MIME content type, of the object that the link references. + * This attribute is present only for links to objects. It is not present for links to actions. + * + * @return type definition, type, expressed as an HTTP Content-Type + */ + public String getType() { + return type; + } + + /** + * Set of optional links to an entity or operation associated with this object. + */ + public Set getLinks() { + return links == null ? ImmutableSet.of() : Collections.unmodifiableSet(links); + } + @Override public boolean equals(Object o) { if (this == o) @@ -67,6 +181,29 @@ public class Resource extends ResourceType { if (o == null || getClass() != o.getClass()) return false; Resource that = Resource.class.cast(o); - return super.equals(that); + return equal(this.href, that.href) && equal(this.links, that.links) && equal(this.type, that.type); } -} \ No newline at end of file + + public boolean clone(Object o) { + if (this == o) + return false; + if (o == null || getClass() != o.getClass()) + return false; + Resource that = Resource.class.cast(o); + return equal(this.type, that.type); + } + + @Override + public int hashCode() { + return Objects.hashCode(href, links, type); + } + + @Override + public String toString() { + return string().toString(); + } + + protected ToStringHelper string() { + return Objects.toStringHelper("").add("href", href).add("links", links).add("type", type); + } +} diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntityType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java similarity index 95% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntityType.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java index ff3b64de00..fd889a449d 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntityType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java @@ -49,7 +49,7 @@ import com.google.common.collect.Iterables; * @author grkvlt@apache.org */ @XmlType(name = "ResourceEntityType") -public abstract class ResourceEntityType extends EntityType { +public abstract class ResourceEntity extends Entity { @XmlType(name = "ResourceEntityTypeStatus") @XmlEnum(Integer.class) @@ -138,7 +138,7 @@ public abstract class ResourceEntityType extends EntityType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends EntityType.Builder { + public static abstract class Builder> extends Entity.Builder { private Set files; private Status status; @@ -166,7 +166,7 @@ public abstract class ResourceEntityType extends EntityType { return self(); } - public B fromResourceEntityType(ResourceEntityType in) { + public B fromResourceEntityType(ResourceEntity in) { return fromEntityType(in).files(in.getFiles()).status(in.getStatus()); } } @@ -177,13 +177,13 @@ public abstract class ResourceEntityType extends EntityType { @XmlAttribute private Status status; - public ResourceEntityType(Builder builder) { + public ResourceEntity(Builder builder) { super(builder); this.files = builder.files; this.status = builder.status; } - protected ResourceEntityType() { + protected ResourceEntity() { // for JAXB } @@ -207,7 +207,7 @@ public abstract class ResourceEntityType extends EntityType { return true; if (o == null || getClass() != o.getClass()) return false; - ResourceEntityType that = ResourceEntityType.class.cast(o); + ResourceEntity that = ResourceEntity.class.cast(o); return super.equals(that) && equal(this.files, that.files) && equal(this.status, that.status); } @@ -217,7 +217,7 @@ public abstract class ResourceEntityType extends EntityType { return false; if (o == null || getClass() != o.getClass()) return false; - ResourceEntityType that = ResourceEntityType.class.cast(o); + ResourceEntity that = ResourceEntity.class.cast(o); return super.clone(that) && equal(this.files, that.files); } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceType.java deleted file mode 100644 index 7f618dc7d5..0000000000 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceType.java +++ /dev/null @@ -1,207 +0,0 @@ -/* - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.jclouds.vcloud.director.v1_5.domain; - -import static com.google.common.base.Objects.equal; -import static com.google.common.base.Preconditions.checkNotNull; - -import java.net.URI; -import java.util.Collections; -import java.util.Set; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -import org.jclouds.logging.Logger; - -import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; - -/** - * The base type for all objects in the vCloud model. - * - * Has an optional list of links and href and type attributes. - * - * 
- * <xs:complexType name="ResourceType" />
- *
- * - * @author Adrian Cole - * - * @since 0.9 - */ -@XmlType(name = "ResourceType") -public class ResourceType { - - @javax.annotation.Resource - protected static Logger logger = Logger.NULL; - - public static Builder builder() { - return new ConcreteBuilder(); - } - - public Builder toBuilder() { - return builder().fromResourceType(this); - } - - private static class ConcreteBuilder extends Builder { - } - - public static abstract class Builder> { - private URI href; - private String type; - private Set links; - - @SuppressWarnings("unchecked") - protected B self() { - return (B) this; - } - - /** - * @see ResourceType#getHref() - */ - public B href(URI href) { - this.href = href; - return self(); - } - - /** - * @see ResourceType#getType() - */ - public B type(String type) { - this.type = type; - return self(); - } - - /** - * @see ResourceType#getLinks() - */ - public B links(Set links) { - this.links = Sets.newLinkedHashSet(checkNotNull(links, "links")); - return self(); - } - - /** - * @see ResourceType#getLinks() - */ - public B link(Link link) { - if (links == null) - links = Sets.newLinkedHashSet(); - this.links.add(checkNotNull(link, "link")); - return self(); - } - - public ResourceType build() { - return new ResourceType(this); - } - - protected B fromResourceType(ResourceType in) { - return href(in.getHref()).type(in.getType()).links(Sets.newLinkedHashSet(in.getLinks())); - } - } - - @XmlAttribute - private URI href; - @XmlAttribute - private String type; - @XmlElement(name = "Link") - private Set links = Sets.newLinkedHashSet(); - - protected ResourceType(Builder builder) { - this.href = builder.href; - this.type = builder.type; - this.links = builder.links == null ? Collections.emptySet() : builder.links; - } - - protected ResourceType() { - // For JAXB - } - - /** - * Contains the URI to the entity. - * - * An object reference, expressed in URL format. Because this URL includes the object identifier - * portion of the id attribute value, it uniquely identifies the object, persists for the life of - * the object, and is never reused. The value of the href attribute is a reference to a view of - * the object, and can be used to access a representation of the object that is valid in a - * particular context. Although URLs have a well-known syntax and a well-understood - * interpretation, a client should treat each href as an opaque string. The rules that govern how - * the server constructs href strings might change in future releases. - * - * @return an opaque reference and should never be parsed - */ - public URI getHref() { - return href; - } - - /** - * Contains the type of the the entity. - * - * The object type, specified as a MIME content type, of the object that the link references. - * This attribute is present only for links to objects. It is not present for links to actions. - * - * @return type definition, type, expressed as an HTTP Content-Type - */ - public String getType() { - return type; - } - - /** - * Set of optional links to an entity or operation associated with this object. - */ - public Set getLinks() { - return links == null ? ImmutableSet.of() : Collections.unmodifiableSet(links); - } - - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; - ResourceType that = ResourceType.class.cast(o); - return equal(this.href, that.href) && equal(this.links, that.links) && equal(this.type, that.type); - } - - public boolean clone(Object o) { - if (this == o) - return false; - if (o == null || getClass() != o.getClass()) - return false; - ResourceType that = ResourceType.class.cast(o); - return equal(this.type, that.type); - } - - @Override - public int hashCode() { - return Objects.hashCode(href, links, type); - } - - @Override - public String toString() { - return string().toString(); - } - - protected ToStringHelper string() { - return Objects.toStringHelper("").add("href", href).add("links", links).add("type", type); - } -} diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReferences.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReferences.java index 93e6e6445d..8029782c08 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReferences.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReferences.java @@ -25,13 +25,7 @@ import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultReferences; /** - * - * Container for ReferenceType elements that reference RoleType objects. - * - * - *

Java class for RoleReferences complex type. - * - *

The following schema fragment specifies the expected content contained within this class. + * Container for ReferenceType elements that reference RoleType objects. * * 

  * <complexType name="RoleReferences">
@@ -45,8 +39,6 @@ import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultReferences;
  *   </complexContent>
  * </complexType>
  *
- * - * */ @XmlRootElement(name = "RoleReferences") public class RoleReferences extends QueryResultReferences { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java index 293811e34c..6499f19c34 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java @@ -53,7 +53,7 @@ import com.google.common.collect.Maps; * @author grkvlt@apache.org */ @XmlRootElement(name = "Task") -public class Task extends EntityType { +public class Task extends Entity { public static final String MEDIA_TYPE = VCloudDirectorMediaType.TASK; @@ -114,7 +114,7 @@ public class Task extends EntityType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends EntityType.Builder { + public static abstract class Builder> extends Entity.Builder { private Error error; private Reference org; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java index 1a8e4851b0..9e678945e6 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java @@ -42,7 +42,7 @@ import com.google.common.collect.Sets; * @author Adrian Cole */ @XmlRootElement(name = "TasksList") -public class TasksList extends ResourceType implements Set { +public class TasksList extends Resource implements Set { public static Builder builder() { return new ConcreteBuilder(); } @@ -55,7 +55,7 @@ public class TasksList extends ResourceType implements Set { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private String name; private Set tasks; @@ -92,7 +92,7 @@ public class TasksList extends ResourceType implements Set { } public B fromTasksList(TasksList in) { - return fromResourceType(in).tasks(in); + return fromResource(in).tasks(in); } } 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 20a54c287e..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 @@ -91,7 +91,7 @@ import com.google.common.collect.Lists; "password", "groups" }) -public class User extends EntityType { +public class User extends Entity { public static Builder builder() { return new ConcreteBuilder(); @@ -105,7 +105,7 @@ public class User extends EntityType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends EntityType.Builder { + public static abstract class Builder> extends Entity.Builder { private String fullName; private String emailAddress; 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 76813ab1db..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 @@ -37,6 +37,14 @@ import org.jclouds.dmtf.ovf.NetworkSection; import org.jclouds.dmtf.ovf.ProductSection; import org.jclouds.dmtf.ovf.SectionType; import org.jclouds.dmtf.ovf.StartupSection; +import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection; +import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection; +import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection; +import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; @@ -50,7 +58,7 @@ import com.google.common.collect.Sets; * */ @XmlRootElement(name = "VAppTemplate") -public class VAppTemplate extends ResourceEntityType { +public class VAppTemplate extends ResourceEntity { public static Builder builder() { return new ConcreteBuilder(); @@ -64,7 +72,7 @@ public class VAppTemplate extends ResourceEntityType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceEntityType.Builder { + public static abstract class Builder> extends ResourceEntity.Builder { private Owner owner; private Set children = Sets.newLinkedHashSet(); private Set sections = Sets.newLinkedHashSet(); 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 31b92ea94a..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 @@ -30,6 +30,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableSet; @@ -45,7 +46,7 @@ import com.google.common.collect.Sets; @XmlRootElement(name = "Vdc") @XmlType(name = "VdcType") @XmlSeeAlso({ AdminVdc.class }) -public class Vdc extends EntityType { +public class Vdc extends Entity { public static Builder builder() { return new ConcreteBuilder(); @@ -59,7 +60,7 @@ public class Vdc extends EntityType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends EntityType.Builder { + public static abstract class Builder> extends Entity.Builder { private String allocationModel; private CapacityWithUsage storageCapacity; private ComputeCapacity computeCapacity; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java index a2d51d9bed..f1ad49e911 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java @@ -39,7 +39,7 @@ import com.google.common.base.Objects.ToStringHelper; * @author grkvlt@apache.org */ @XmlType(name = "VmPendingQuestion") -public class VmPendingQuestion extends ResourceType { +public class VmPendingQuestion extends Resource { public static Builder builder() { return new ConcreteBuilder(); @@ -53,7 +53,7 @@ public class VmPendingQuestion extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private String question; private String questionId; @@ -90,7 +90,7 @@ public class VmPendingQuestion extends ResourceType { } public B fromVmPendingQuestion(VmPendingQuestion in) { - return fromResourceType(in).question(in.getQuestion()).questionId(in.getQuestionId()).choices(in.getChoices()); + return fromResource(in).question(in.getQuestion()).questionId(in.getQuestionId()).choices(in.getChoices()); } } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Envelope.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/Envelope.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Envelope.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/Envelope.java index a23500485a..a475c5f140 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Envelope.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/Envelope.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.dmtf; import static org.jclouds.dmtf.DMTFConstants.OVF_NS; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItem.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java similarity index 94% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItem.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java index cf812ff5c2..ec1bc84ce1 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItem.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.dmtf; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; +import static org.jclouds.dmtf.DMTFConstants.OVF_NS; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS; import java.net.URI; @@ -31,6 +32,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSchemaType; import org.jclouds.dmtf.cim.ResourceAllocationSettingData; +import org.jclouds.vcloud.director.v1_5.domain.Link; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; @@ -38,13 +40,11 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; /** - * The ResourceAllocationSettingData class represents settings specifically - * related to an allocated resource that are outside the scope of the CIM class - * typically used to represent the resource itself. + * A vCloud specific {@link ResourceAllocationSettingData} extension. * * @author grkvlt@apache.org */ -@XmlRootElement(name = "Item", namespace = VCLOUD_1_5_NS) +@XmlRootElement(name = "Item", namespace = OVF_NS) public class RasdItem extends ResourceAllocationSettingData { public static Builder builder() { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VirtualSystem.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java similarity index 95% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VirtualSystem.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java index 2f1eb49d48..22167157f1 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VirtualSystem.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.dmtf; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -28,6 +28,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import org.jclouds.dmtf.ovf.internal.BaseVirtualSystem; +import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection; +import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/package-info.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/package-info.java new file mode 100644 index 0000000000..e4de819d6b --- /dev/null +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/package-info.java @@ -0,0 +1,35 @@ +/* + * Licensed to jclouds, Inc. (jclouds) under one or more + * contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. jclouds licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +@XmlSchema(namespace = VCLOUD_1_5_NS, + elementFormDefault = XmlNsForm.QUALIFIED, + xmlns = { + @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS) + } +) +@XmlAccessorType(XmlAccessType.FIELD) +package org.jclouds.vcloud.director.v1_5.domain.dmtf; + +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlNs; +import javax.xml.bind.annotation.XmlNsForm; +import javax.xml.bind.annotation.XmlSchema; + diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/DhcpService.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/DhcpService.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java index ca8b6b848f..e0582ae0b9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/DhcpService.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ExternalNetwork.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ExternalNetwork.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java index bd05d84056..c12006093f 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ExternalNetwork.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; @@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; /** diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FirewallRule.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FirewallRule.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java index 9ce90b4f82..c39d30933f 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FirewallRule.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FirewallRuleProtocols.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FirewallRuleProtocols.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java index dfbb179335..b40245cfdd 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FirewallRuleProtocols.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FirewallService.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FirewallService.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java index caa26ec66d..c14c3acf85 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FirewallService.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpAddresses.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpAddresses.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java index 6d7a39923f..049c1de4eb 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpAddresses.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRange.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRange.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java index 4d620b9ee3..8ff8d652d2 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRange.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRanges.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRanges.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java index 1e074bb507..c053fd3d3d 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRanges.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpScope.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpScope.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java index 109739dbdf..5c497b4300 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpScope.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnLocalPeer.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnLocalPeer.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnLocalPeer.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnLocalPeer.java index e102ecbb18..93a2de0b9a 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnLocalPeer.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnLocalPeer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import javax.xml.bind.annotation.XmlRootElement; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnManagedPeerType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeerType.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnManagedPeerType.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeerType.java index a268f41a68..e461e82fd7 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnManagedPeerType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeerType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnPeerType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnPeerType.java similarity index 94% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnPeerType.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnPeerType.java index 03128b0d32..919314999e 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnPeerType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnPeerType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import javax.xml.bind.annotation.XmlSeeAlso; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnRemotePeer.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnRemotePeer.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java index f7aeb13dc1..7a075b781c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnRemotePeer.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnService.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnService.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java index 0a7cdd17ce..df639fb8ff 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnService.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnThirdPartyPeer.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnThirdPartyPeer.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnThirdPartyPeer.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnThirdPartyPeer.java index e4813a8aa6..17f59ddc44 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnThirdPartyPeer.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnThirdPartyPeer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import javax.xml.bind.annotation.XmlRootElement; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnTunnel.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnTunnel.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java index 6ef223afd9..89dd25c6ee 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnTunnel.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnUnmanagedPeerType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnUnmanagedPeerType.java similarity index 94% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnUnmanagedPeerType.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnUnmanagedPeerType.java index ed92c5d415..5938c2445f 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnUnmanagedPeerType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnUnmanagedPeerType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import javax.xml.bind.annotation.XmlSeeAlso; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatOneToOneBasicRule.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatOneToOneBasicRule.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java index 7792d5f91f..afe0f5ca83 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatOneToOneBasicRule.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatOneToOneVmRule.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatOneToOneVmRule.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java index 2aeade3071..928f89da87 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatOneToOneVmRule.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatPortForwardingRule.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatPortForwardingRule.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java index 11f5afb9ed..358a1cefc1 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatPortForwardingRule.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatRule.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatRule.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java index c713226072..0a84e291cd 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatRule.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatService.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatService.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java index 5727e22aba..fd495a22c9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatService.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatVmRule.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatVmRule.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java index 8dae8887d1..bb14532a12 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatVmRule.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Network.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java similarity index 93% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Network.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java index d556416003..53b1ead067 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Network.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -30,6 +30,10 @@ import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Entity; +import org.jclouds.vcloud.director.v1_5.domain.Entity.Builder; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork; + import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; @@ -38,7 +42,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; @XmlSeeAlso({ OrgNetwork.class, ExternalNetwork.class }) -public abstract class Network extends EntityType { +public abstract class Network extends Entity { @XmlType @XmlEnum(String.class) @@ -75,7 +79,7 @@ public abstract class Network extends EntityType { } } - public abstract static class Builder> extends EntityType.Builder { + public abstract static class Builder> extends Entity.Builder { protected NetworkConfiguration networkConfiguration; /** diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkAssignment.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkAssignment.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java index 43fe6924d7..ee4a7230d6 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkAssignment.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConfiguration.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConfiguration.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java index eda312e713..e23b4673fc 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConfiguration.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -25,7 +25,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.jclouds.vcloud.director.v1_5.domain.Network.FenceMode; +import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.domain.network.Network.FenceMode; import com.google.common.base.Objects; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnection.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java index 7d1d3f981b..60f71eb726 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkFeatures.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkFeatures.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java index 00dd15f323..e8d3714923 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkFeatures.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkServiceType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkServiceType.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkServiceType.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkServiceType.java index 79da3f27e9..3de01fb07d 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkServiceType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkServiceType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RouterInfo.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RouterInfo.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java index ed474d92c9..63a48e48d0 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RouterInfo.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SmtpServerSettings.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SmtpServerSettings.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java index 02a06a7b53..3ec82df287 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SmtpServerSettings.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java index 75e7b80ff5..ab9b3f8eda 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoutingService.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoutingService.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java index 4202bd17bf..a2ec914dde 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoutingService.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SyslogServerSettings.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SyslogServerSettings.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java index 5ebac9170f..8ef2210165 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SyslogServerSettings.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppNetwork.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppNetwork.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java index 1ecbbf9a61..98fbe5d763 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppNetwork.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppNetworkConfiguration.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java similarity index 94% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppNetworkConfiguration.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java index 8f4874dc71..3049f24ad6 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppNetworkConfiguration.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.network; import static com.google.common.base.Objects.equal; @@ -25,6 +25,9 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Resource; +import org.jclouds.vcloud.director.v1_5.domain.Resource.Builder; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; @@ -37,7 +40,7 @@ import com.google.common.base.Objects.ToStringHelper; */ @XmlRootElement(name = "NetworkConfiguration") @XmlType(name = "VAppNetworkConfiguration") -public class VAppNetworkConfiguration extends ResourceType { +public class VAppNetworkConfiguration extends Resource { public static Builder builder() { return new ConcreteBuilder(); @@ -51,7 +54,7 @@ public class VAppNetworkConfiguration extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private String description; private NetworkConfiguration configuration; @@ -96,7 +99,7 @@ public class VAppNetworkConfiguration extends ResourceType { } public B fromVAppNetworkConfiguration(VAppNetworkConfiguration in) { - return fromResourceType(in) + return fromResource(in) .description(in.getDescription()) .configuration(in.getConfiguration()) .isDeployed(in.isDeployed()) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/package-info.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/package-info.java new file mode 100644 index 0000000000..9b9713c319 --- /dev/null +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/package-info.java @@ -0,0 +1,35 @@ +/* + * Licensed to jclouds, Inc. (jclouds) under one or more + * contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. jclouds licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +@XmlSchema(namespace = VCLOUD_1_5_NS, + elementFormDefault = XmlNsForm.QUALIFIED, + xmlns = { + @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS) + } +) +@XmlAccessorType(XmlAccessType.FIELD) +package org.jclouds.vcloud.director.v1_5.domain.network; + +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlNs; +import javax.xml.bind.annotation.XmlNsForm; +import javax.xml.bind.annotation.XmlSchema; + diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminOrg.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminOrg.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java index 4ab924e91e..e92df61ba5 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminOrg.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -28,6 +28,8 @@ import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Reference; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CustomOrgLdapSettings.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CustomOrgLdapSettings.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java index fea50b3925..b7fcb57ad9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CustomOrgLdapSettings.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; + import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java similarity index 94% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java index 766f743bf5..4f686bb150 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; @@ -25,6 +25,8 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import org.jclouds.vcloud.director.v1_5.domain.Entity; +import org.jclouds.vcloud.director.v1_5.domain.Entity.Builder; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; @@ -42,7 +44,7 @@ import com.google.common.base.Objects.ToStringHelper; */ @XmlRootElement(name = "Org") @XmlSeeAlso({ AdminOrg.class }) -public class Org extends EntityType { +public class Org extends Entity { public static final String MEDIA_TYPE = VCloudDirectorMediaType.ORG; @@ -58,7 +60,7 @@ public class Org extends EntityType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends EntityType.Builder { + public static abstract class Builder> extends Entity.Builder { private String fullName; private Boolean isEnabled; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgEmailSettings.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgEmailSettings.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java index 9ea7f3e9e9..65fa7863e6 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgEmailSettings.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -27,6 +27,10 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Resource; +import org.jclouds.vcloud.director.v1_5.domain.Resource.Builder; +import org.jclouds.vcloud.director.v1_5.domain.network.SmtpServerSettings; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableList; @@ -63,7 +67,7 @@ import com.google.common.collect.ImmutableList; "alertEmailTo", "smtpServerSettings" }) -public class OrgEmailSettings extends ResourceType { +public class OrgEmailSettings extends Resource { public static Builder builder() { return new ConcreteBuilder(); @@ -77,7 +81,7 @@ public class OrgEmailSettings extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private boolean isDefaultSmtpServer; private boolean isDefaultOrgEmail; @@ -157,7 +161,7 @@ public class OrgEmailSettings extends ResourceType { } public B fromOrgEmailSettings(OrgEmailSettings in) { - return fromResourceType(in) + return fromResource(in) .isDefaultSmtpServer(in.isDefaultSmtpServer()) .isDefaultOrgEmail(in.isDefaultOrgEmail()) .fromEmailAddress(in.getFromEmailAddress()) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgGeneralSettings.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgGeneralSettings.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java index b6da767354..578ba49010 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgGeneralSettings.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; @@ -24,6 +24,9 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Resource; +import org.jclouds.vcloud.director.v1_5.domain.Resource.Builder; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; @@ -55,7 +58,7 @@ import com.google.common.base.Objects.ToStringHelper; "useServerBootSequence", "delayAfterPowerOnSeconds" }) -public class OrgGeneralSettings extends ResourceType { +public class OrgGeneralSettings extends Resource { public static Builder builder() { return new ConcreteBuilder(); @@ -69,7 +72,7 @@ public class OrgGeneralSettings extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private Boolean canPublishCatalogs; private Integer deployedVMQuota; @@ -123,7 +126,7 @@ public class OrgGeneralSettings extends ResourceType { } public B fromOrgGeneralSettings(OrgGeneralSettings in) { - return fromResourceType(in) + return fromResource(in) .canPublishCatalogs(in.canPublishCatalogs()) .deployedVMQuota(in.getDeployedVMQuota()) .storedVmQuota(in.getStoredVmQuota()) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgLdapGroupAttributes.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgLdapGroupAttributes.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java index db8a3b56cc..77babb9f3c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgLdapGroupAttributes.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgLdapSettings.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgLdapSettings.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java index 93df7dd3b7..82fa539d69 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgLdapSettings.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -30,6 +30,9 @@ import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Resource; +import org.jclouds.vcloud.director.v1_5.domain.Resource.Builder; + import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; @@ -60,7 +63,7 @@ import com.google.common.collect.Maps; "customUsersOu", "customOrgLdapSettings" }) -public class OrgLdapSettings extends ResourceType { +public class OrgLdapSettings extends Resource { @XmlType @XmlEnum(String.class) @@ -108,7 +111,7 @@ public class OrgLdapSettings extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private LdapMode ldapMode; private String customUsersOu; @@ -152,7 +155,7 @@ public class OrgLdapSettings extends ResourceType { } public B fromOrgLdapSettings(OrgLdapSettings in) { - return fromResourceType(in) + return fromResource(in) .ldapMode(in.getLdapMode()) .customUsersOu(in.getCustomUsersOu()) .customOrgLdapSettings(in.getCustomOrgLdapSettings()); diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgLdapUserAttributes.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgLdapUserAttributes.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java index dd945b1b98..c31f0b0c5e 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgLdapUserAttributes.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgLeaseSettings.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java similarity index 95% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgLeaseSettings.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java index 9082f11771..0f9109c137 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgLeaseSettings.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; @@ -24,6 +24,9 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Resource; +import org.jclouds.vcloud.director.v1_5.domain.Resource.Builder; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; @@ -51,7 +54,7 @@ import com.google.common.base.Objects.ToStringHelper; "deploymentLeaseSeconds", "storageLeaseSeconds" }) -public class OrgLeaseSettings extends ResourceType { +public class OrgLeaseSettings extends Resource { public static Builder builder() { return new ConcreteBuilder(); } @@ -64,7 +67,7 @@ public class OrgLeaseSettings extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private Boolean deleteOnStorageLeaseExpiration; private Integer deploymentLeaseSeconds; @@ -100,7 +103,7 @@ public class OrgLeaseSettings extends ResourceType { } public B fromOrgLeaseSettings(OrgLeaseSettings in) { - return fromResourceType(in) + return fromResource(in) .deleteOnStorageLeaseExpiration(in.deleteOnStorageLeaseExpiration()) .deploymentLeaseSeconds(in.getDeploymentLeaseSeconds()) .storageLeaseSeconds(in.getStorageLeaseSeconds()); diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgList.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgList.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java index 0788641c73..716479dfc1 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgList.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import org.jclouds.vcloud.director.v1_5.domain.Reference; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgNetwork.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgNetwork.java similarity index 92% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgNetwork.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgNetwork.java index 6ba622207b..0c8034df0e 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgNetwork.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgNetwork.java @@ -16,13 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.domain.network.IpAddresses; +import org.jclouds.vcloud.director.v1_5.domain.network.Network; +import org.jclouds.vcloud.director.v1_5.domain.network.Network.Builder; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgPasswordPolicySettings.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java similarity index 94% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgPasswordPolicySettings.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java index a19d74caff..a2793b7207 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgPasswordPolicySettings.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; @@ -24,6 +24,9 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Resource; +import org.jclouds.vcloud.director.v1_5.domain.Resource.Builder; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; @@ -40,7 +43,7 @@ import com.google.common.base.Objects.ToStringHelper; "invalidLoginsBeforeLockout", "accountLockoutIntervalMinutes" }) -public class OrgPasswordPolicySettings extends ResourceType { +public class OrgPasswordPolicySettings extends Resource { public static Builder builder() { return new ConcreteBuilder(); } @@ -53,7 +56,7 @@ public class OrgPasswordPolicySettings extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private boolean accountLockoutEnabled; private int invalidLoginsBeforeLockout; @@ -89,7 +92,7 @@ public class OrgPasswordPolicySettings extends ResourceType { } public B fromOrgPasswordPolicySettings(OrgPasswordPolicySettings in) { - return fromResourceType(in) + return fromResource(in) .accountLockoutEnabled(in.isAccountLockoutEnabled()) .invalidLoginsBeforeLockout(in.getInvalidLoginsBeforeLockout()) .accountLockoutIntervalMinutes(in.getAccountLockoutIntervalMinutes()); diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgSettings.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgSettings.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java index 64aa4b1b65..d4e896d5c5 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgSettings.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; @@ -24,6 +24,9 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Resource; +import org.jclouds.vcloud.director.v1_5.domain.Resource.Builder; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; /** @@ -59,7 +62,7 @@ import com.google.common.base.Objects.ToStringHelper; "emailSettings", "passwordPolicy" }) -public class OrgSettings extends ResourceType { +public class OrgSettings extends Resource { public static Builder builder() { return new ConcreteBuilder(); } @@ -72,7 +75,7 @@ public class OrgSettings extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private OrgGeneralSettings generalSettings; private OrgLeaseSettings vAppLeaseSettings; @@ -135,7 +138,7 @@ public class OrgSettings extends ResourceType { } public B fromOrgSettings(OrgSettings in) { - return fromResourceType(in) + return fromResource(in) .generalSettings(in.getGeneralSettings()) .vAppLeaseSettings(in.getVAppLeaseSettings()) .vAppTemplateLeaseSettings(in.getVAppTemplateLeaseSettings()) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgVAppTemplateLeaseSettings.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java similarity index 94% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgVAppTemplateLeaseSettings.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java index e649d87a29..743cae4373 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgVAppTemplateLeaseSettings.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.org; import static com.google.common.base.Objects.equal; @@ -24,6 +24,9 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Resource; +import org.jclouds.vcloud.director.v1_5.domain.Resource.Builder; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; @@ -49,7 +52,7 @@ import com.google.common.base.Objects.ToStringHelper; "deleteOnStorageLeaseExpiration", "storageLeaseSeconds" }) -public class OrgVAppTemplateLeaseSettings extends ResourceType { +public class OrgVAppTemplateLeaseSettings extends Resource { public static Builder builder() { return new ConcreteBuilder(); } @@ -62,7 +65,7 @@ public class OrgVAppTemplateLeaseSettings extends ResourceType { private static class ConcreteBuilder extends Builder { } - public static abstract class Builder> extends ResourceType.Builder { + public static abstract class Builder> extends Resource.Builder { private Boolean deleteOnStorageLeaseExpiration; private Integer storageLeaseSeconds; @@ -90,7 +93,7 @@ public class OrgVAppTemplateLeaseSettings extends ResourceType { } public B fromOrgVAppTemplateLeaseSettings(OrgVAppTemplateLeaseSettings in) { - return fromResourceType(in) + return fromResource(in) .deleteOnStorageLeaseExpiration(in.deleteOnStorageLeaseExpiration()) .storageLeaseSeconds(in.getStorageLeaseSeconds()); } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/package-info.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/package-info.java new file mode 100644 index 0000000000..bef902de02 --- /dev/null +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/package-info.java @@ -0,0 +1,35 @@ +/* + * Licensed to jclouds, Inc. (jclouds) under one or more + * contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. jclouds licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +@XmlSchema(namespace = VCLOUD_1_5_NS, + elementFormDefault = XmlNsForm.QUALIFIED, + xmlns = { + @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS) + } +) +@XmlAccessorType(XmlAccessType.FIELD) +package org.jclouds.vcloud.director.v1_5.domain.org; + +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlNs; +import javax.xml.bind.annotation.XmlNsForm; +import javax.xml.bind.annotation.XmlSchema; + diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java similarity index 90% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java index 4836a09b6c..a9fb259c0b 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -37,6 +37,15 @@ import org.jclouds.dmtf.ovf.NetworkSection; import org.jclouds.dmtf.ovf.ProductSection; import org.jclouds.dmtf.ovf.SectionType; import org.jclouds.dmtf.ovf.StartupSection; +import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection; +import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection; +import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection; +import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneMediaParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneMediaParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java index 1988a5f5ed..7efebdb644 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneMediaParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; @@ -25,6 +25,9 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.domain.params.ParamsType.Builder; + import com.google.common.base.Objects; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppParams.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppParams.java index 96b44d4f41..5cb6e10d5c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppTemplateParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppTemplateParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java index aa4e4ac76f..2040f92a3c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppTemplateParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; @@ -27,6 +27,9 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.domain.params.ParamsType.Builder; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComposeVAppParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComposeVAppParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java index 4e149a2920..fbdcc3fed0 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComposeVAppParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -28,6 +28,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.params.VAppCreationParams.Builder; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableList; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ControlAccessParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ControlAccessParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java index 05eedca941..dd1c66f3c9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ControlAccessParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -30,6 +30,8 @@ import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.AccessSetting; + import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/DeployVAppParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/DeployVAppParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java index 367e33428c..03d8f61a71 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/DeployVAppParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiateOvfParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateOvfParams.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiateOvfParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateOvfParams.java index 0c62584046..d88e6fe0b0 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiateOvfParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateOvfParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; @@ -24,6 +24,8 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.params.VAppCreationParams.Builder; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiateVAppParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiateVAppParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java index 2c4baef1c4..438901d96e 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiateVAppParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; @@ -28,6 +28,8 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.domain.params.VAppCreationParams.Builder; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiateVAppTemplateParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiateVAppTemplateParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java index d004efc0cd..a321683f46 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiateVAppTemplateParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java similarity index 89% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java index c3e3e59255..9fed19580d 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -35,6 +35,14 @@ import org.jclouds.dmtf.ovf.NetworkSection; import org.jclouds.dmtf.ovf.ProductSection; import org.jclouds.dmtf.ovf.SectionType; import org.jclouds.dmtf.ovf.StartupSection; +import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection; +import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection; +import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection; +import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MediaInsertOrEjectParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MediaInsertOrEjectParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java index 12c568c436..362cbc4797 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MediaInsertOrEjectParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; @@ -24,6 +24,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Reference; + import com.google.common.base.Objects; /** diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ParamsType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ParamsType.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java index f90fb4b735..5c2805ad63 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ParamsType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/PublishCatalogParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/PublishCatalogParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java index 2436f06bee..1bd9b81b03 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/PublishCatalogParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RecomposeVAppParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RecomposeVAppParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java index db4549871a..ba809358c5 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RecomposeVAppParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; @@ -27,6 +27,9 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.domain.Vm; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RelocateParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RelocateParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java index 26f7d24fef..7425e027c3 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RelocateParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -26,6 +26,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Reference; + import com.google.common.base.Objects; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SourcedCompositionItemParam.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SourcedCompositionItemParam.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java index 37e6c5b523..e76d24ffd7 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SourcedCompositionItemParam.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -29,6 +29,9 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkAssignment; + import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/UndeployVAppParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/UndeployVAppParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java index 9dae45bca0..dcb37b6ab9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/UndeployVAppParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/UploadVAppTemplateParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/UploadVAppTemplateParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java index d40715e3df..0b6f67a63f 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/UploadVAppTemplateParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; @@ -24,6 +24,8 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.params.ParamsType.Builder; + import com.google.common.base.Objects; /** diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppCreationParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppCreationParams.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java index 41da48e1e6..c558d1c1c6 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppCreationParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.params; import static com.google.common.base.Objects.equal; @@ -25,6 +25,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Reference; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/package-info.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/package-info.java new file mode 100644 index 0000000000..b37b11c7c1 --- /dev/null +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/package-info.java @@ -0,0 +1,35 @@ +/* + * Licensed to jclouds, Inc. (jclouds) under one or more + * contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. jclouds licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +@XmlSchema(namespace = VCLOUD_1_5_NS, + elementFormDefault = XmlNsForm.QUALIFIED, + xmlns = { + @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS) + } +) +@XmlAccessorType(XmlAccessType.FIELD) +package org.jclouds.vcloud.director.v1_5.domain.params; + +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlNs; +import javax.xml.bind.annotation.XmlNsForm; +import javax.xml.bind.annotation.XmlSchema; + diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java index 659c7b4917..ecc343f327 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java @@ -23,7 +23,7 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlAttribute; -import org.jclouds.vcloud.director.v1_5.domain.ResourceType; +import org.jclouds.vcloud.director.v1_5.domain.Resource; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; @@ -37,7 +37,7 @@ import com.google.common.base.Objects.ToStringHelper; * * @author grkvlt@apache.org */ -public class ContainerType extends ResourceType { +public class ContainerType extends Resource { public static Builder builder() { return new ConcreteBuilder(); @@ -48,7 +48,7 @@ public class ContainerType extends ResourceType { return builder().fromContainerType(this); } - public static class Builder> extends ResourceType.Builder { + public static class Builder> extends Resource.Builder { private String name; private Integer page; @@ -93,7 +93,7 @@ public class ContainerType extends ResourceType { } public B fromContainerType(ContainerType in) { - return fromResourceType(in).name(in.getName()).page(in.getPage()).pageSize(in.getPageSize()).total(in.getTotal()); + return fromResource(in).name(in.getName()).page(in.getPage()).pageSize(in.getPageSize()).total(in.getTotal()); } } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CustomizationSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/CustomizationSection.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CustomizationSection.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/CustomizationSection.java index 471395d1bf..fa2fb84f5e 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CustomizationSection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/CustomizationSection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.section; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -31,6 +31,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSchemaType; import org.jclouds.dmtf.ovf.SectionType; +import org.jclouds.vcloud.director.v1_5.domain.Link; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/GuestCustomizationSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/GuestCustomizationSection.java similarity index 99% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/GuestCustomizationSection.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/GuestCustomizationSection.java index 3d0d17bbac..99f1ec2f97 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/GuestCustomizationSection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/GuestCustomizationSection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.section; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -32,6 +32,7 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import org.jclouds.dmtf.ovf.SectionType; +import org.jclouds.vcloud.director.v1_5.domain.Link; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/LeaseSettingsSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/LeaseSettingsSection.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/LeaseSettingsSection.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/LeaseSettingsSection.java index 8d838d828a..ee98abc55c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/LeaseSettingsSection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/LeaseSettingsSection.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.section; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -34,6 +34,7 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import org.jclouds.dmtf.ovf.SectionType; +import org.jclouds.vcloud.director.v1_5.domain.Link; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConfigSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConfigSection.java similarity index 96% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConfigSection.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConfigSection.java index a7a258d7a9..ad8ed2846c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConfigSection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConfigSection.java @@ -17,7 +17,7 @@ * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.section; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -33,6 +33,8 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import org.jclouds.dmtf.ovf.SectionType; +import org.jclouds.vcloud.director.v1_5.domain.Link; +import org.jclouds.vcloud.director.v1_5.domain.network.VAppNetworkConfiguration; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnectionSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConnectionSection.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnectionSection.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConnectionSection.java index 65b37518f6..1b1265ec3f 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnectionSection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConnectionSection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.section; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -31,6 +31,8 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import org.jclouds.dmtf.ovf.SectionType; +import org.jclouds.vcloud.director.v1_5.domain.Link; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OperatingSystemSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OperatingSystemSection.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java index 654fc6d0fe..48634bdb37 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OperatingSystemSection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.section; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -33,6 +33,8 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Link; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RuntimeInfoSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java similarity index 97% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RuntimeInfoSection.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java index a923eff86f..1df7da8198 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RuntimeInfoSection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.section; import static com.google.common.base.Objects.equal; @@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import org.jclouds.dmtf.ovf.SectionType; +import org.jclouds.vcloud.director.v1_5.domain.VMWareTools; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VirtualHardwareSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java similarity index 98% rename from labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VirtualHardwareSection.java rename to labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java index 34961da6c0..e457ab535c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VirtualHardwareSection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.jclouds.vcloud.director.v1_5.domain; +package org.jclouds.vcloud.director.v1_5.domain.section; import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; @@ -33,6 +33,8 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; +import org.jclouds.vcloud.director.v1_5.domain.Link; + import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/package-info.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/package-info.java new file mode 100644 index 0000000000..021aada8f9 --- /dev/null +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/package-info.java @@ -0,0 +1,35 @@ +/* + * Licensed to jclouds, Inc. (jclouds) under one or more + * contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. jclouds licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +@XmlSchema(namespace = VCLOUD_1_5_NS, + elementFormDefault = XmlNsForm.QUALIFIED, + xmlns = { + @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS) + } +) +@XmlAccessorType(XmlAccessType.FIELD) +package org.jclouds.vcloud.director.v1_5.domain.section; + +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlNs; +import javax.xml.bind.annotation.XmlNsForm; +import javax.xml.bind.annotation.XmlSchema; + diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogAsyncClient.java index ef431db0b3..9786535ebe 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogAsyncClient.java @@ -38,7 +38,7 @@ import org.jclouds.rest.binders.BindToXMLPayload; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.CatalogItem; -import org.jclouds.vcloud.director.v1_5.domain.CatalogType; +import org.jclouds.vcloud.director.v1_5.domain.Catalog; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; import com.google.common.util.concurrent.ListenableFuture; @@ -57,7 +57,7 @@ public interface CatalogAsyncClient { @Consumes @JAXBResponseParser @ExceptionParser(ReturnNullOnNotFoundOr404.class) - ListenableFuture getCatalog(@EndpointParam URI catalogUri); + ListenableFuture getCatalog(@EndpointParam URI catalogUri); /** * Creates a catalog item in a catalog. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogClient.java index d5e4e53aad..c48029947a 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogClient.java @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; import org.jclouds.rest.annotations.Delegate; import org.jclouds.vcloud.director.v1_5.domain.CatalogItem; -import org.jclouds.vcloud.director.v1_5.domain.CatalogType; +import org.jclouds.vcloud.director.v1_5.domain.Catalog; /** * Provides synchronous access to {@link Catalog} objects. @@ -45,7 +45,7 @@ public interface CatalogClient { * @param catalogUri the reference for the catalog * @return a catalog */ - CatalogType getCatalog(URI catalogUri); + Catalog getCatalog(URI catalogUri); /** * Creates a catalog item in a catalog. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncClient.java index 07ee05a84f..bad50893c3 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncClient.java @@ -37,10 +37,10 @@ import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.binders.BindToXMLPayload; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; -import org.jclouds.vcloud.director.v1_5.domain.CloneMediaParams; import org.jclouds.vcloud.director.v1_5.domain.Media; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; import com.google.common.util.concurrent.ListenableFuture; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaClient.java index 6180e9f33e..2d1c955743 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaClient.java @@ -23,10 +23,10 @@ import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.vcloud.director.v1_5.domain.CloneMediaParams; import org.jclouds.vcloud.director.v1_5.domain.Media; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams; /** * Provides synchronous access to {@link Media}. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkAsyncClient.java index bc1eaca164..bf10e6eac4 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkAsyncClient.java @@ -29,7 +29,7 @@ import org.jclouds.rest.annotations.ExceptionParser; import org.jclouds.rest.annotations.JAXBResponseParser; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; -import org.jclouds.vcloud.director.v1_5.domain.Network; +import org.jclouds.vcloud.director.v1_5.domain.network.Network; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; import com.google.common.util.concurrent.ListenableFuture; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkClient.java index 95131d43d9..bbbc09af9e 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkClient.java @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.vcloud.director.v1_5.domain.Network; +import org.jclouds.vcloud.director.v1_5.domain.network.Network; /** * Provides synchronous access to {@link Network}. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgAsyncClient.java index e7264b232d..5f077e3bc7 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgAsyncClient.java @@ -37,9 +37,9 @@ import org.jclouds.rest.annotations.JAXBResponseParser; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.binders.BindToXMLPayload; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; -import org.jclouds.vcloud.director.v1_5.domain.ControlAccessParams; -import org.jclouds.vcloud.director.v1_5.domain.Org; -import org.jclouds.vcloud.director.v1_5.domain.OrgList; +import org.jclouds.vcloud.director.v1_5.domain.org.Org; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgList; +import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; import com.google.common.util.concurrent.ListenableFuture; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgClient.java index b2d226cd71..6776fd6a83 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgClient.java @@ -23,9 +23,9 @@ import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.vcloud.director.v1_5.domain.ControlAccessParams; -import org.jclouds.vcloud.director.v1_5.domain.Org; -import org.jclouds.vcloud.director.v1_5.domain.OrgList; +import org.jclouds.vcloud.director.v1_5.domain.org.Org; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgList; +import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams; /** * Provides synchronous access to {@link Org}. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java index 6793f86307..3da8d44b23 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java @@ -61,28 +61,28 @@ import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.ResponseParser; import org.jclouds.rest.binders.BindToXMLPayload; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; -import org.jclouds.vcloud.director.v1_5.domain.ControlAccessParams; -import org.jclouds.vcloud.director.v1_5.domain.DeployVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection; -import org.jclouds.vcloud.director.v1_5.domain.LeaseSettingsSection; -import org.jclouds.vcloud.director.v1_5.domain.MediaInsertOrEjectParams; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection; -import org.jclouds.vcloud.director.v1_5.domain.OperatingSystemSection; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList; -import org.jclouds.vcloud.director.v1_5.domain.RasdItem; import org.jclouds.vcloud.director.v1_5.domain.RasdItemsList; -import org.jclouds.vcloud.director.v1_5.domain.RecomposeVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.RelocateParams; -import org.jclouds.vcloud.director.v1_5.domain.RuntimeInfoSection; import org.jclouds.vcloud.director.v1_5.domain.ScreenTicket; import org.jclouds.vcloud.director.v1_5.domain.Task; -import org.jclouds.vcloud.director.v1_5.domain.UndeployVAppParams; import org.jclouds.vcloud.director.v1_5.domain.VApp; -import org.jclouds.vcloud.director.v1_5.domain.VirtualHardwareSection; import org.jclouds.vcloud.director.v1_5.domain.VmPendingQuestion; import org.jclouds.vcloud.director.v1_5.domain.VmQuestionAnswer; +import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem; +import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams; +import org.jclouds.vcloud.director.v1_5.domain.params.DeployVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.MediaInsertOrEjectParams; +import org.jclouds.vcloud.director.v1_5.domain.params.RecomposeVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.RelocateParams; +import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection; +import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection; +import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection; +import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; import org.jclouds.vcloud.director.v1_5.functions.ReturnPayloadBytes; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppClient.java index 4dbc9aae6f..f8dc431db4 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppClient.java @@ -25,28 +25,28 @@ import org.jclouds.concurrent.Timeout; import org.jclouds.dmtf.ovf.NetworkSection; import org.jclouds.dmtf.ovf.StartupSection; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.vcloud.director.v1_5.domain.ControlAccessParams; -import org.jclouds.vcloud.director.v1_5.domain.DeployVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection; -import org.jclouds.vcloud.director.v1_5.domain.LeaseSettingsSection; -import org.jclouds.vcloud.director.v1_5.domain.MediaInsertOrEjectParams; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection; -import org.jclouds.vcloud.director.v1_5.domain.OperatingSystemSection; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList; -import org.jclouds.vcloud.director.v1_5.domain.RasdItem; import org.jclouds.vcloud.director.v1_5.domain.RasdItemsList; -import org.jclouds.vcloud.director.v1_5.domain.RecomposeVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.RelocateParams; -import org.jclouds.vcloud.director.v1_5.domain.RuntimeInfoSection; import org.jclouds.vcloud.director.v1_5.domain.ScreenTicket; import org.jclouds.vcloud.director.v1_5.domain.Task; -import org.jclouds.vcloud.director.v1_5.domain.UndeployVAppParams; import org.jclouds.vcloud.director.v1_5.domain.VApp; -import org.jclouds.vcloud.director.v1_5.domain.VirtualHardwareSection; import org.jclouds.vcloud.director.v1_5.domain.VmPendingQuestion; import org.jclouds.vcloud.director.v1_5.domain.VmQuestionAnswer; +import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem; +import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams; +import org.jclouds.vcloud.director.v1_5.domain.params.DeployVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.MediaInsertOrEjectParams; +import org.jclouds.vcloud.director.v1_5.domain.params.RecomposeVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.RelocateParams; +import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection; +import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection; +import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection; +import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection; /** * Provides synchronous access to {@link VApp} objects. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncClient.java index 1a60ee16b8..28afee0431 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncClient.java @@ -49,18 +49,18 @@ import org.jclouds.rest.annotations.JAXBResponseParser; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.binders.BindToXMLPayload; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; -import org.jclouds.vcloud.director.v1_5.domain.CustomizationSection; -import org.jclouds.vcloud.director.v1_5.domain.Envelope; -import org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection; -import org.jclouds.vcloud.director.v1_5.domain.LeaseSettingsSection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList; import org.jclouds.vcloud.director.v1_5.domain.References; -import org.jclouds.vcloud.director.v1_5.domain.RelocateParams; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; +import org.jclouds.vcloud.director.v1_5.domain.dmtf.Envelope; +import org.jclouds.vcloud.director.v1_5.domain.params.RelocateParams; +import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; import com.google.common.util.concurrent.ListenableFuture; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClient.java index 4f5a74a5bb..8bcfc9e6b5 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClient.java @@ -24,18 +24,18 @@ import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; import org.jclouds.dmtf.ovf.NetworkSection; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.vcloud.director.v1_5.domain.CustomizationSection; -import org.jclouds.vcloud.director.v1_5.domain.Envelope; -import org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection; -import org.jclouds.vcloud.director.v1_5.domain.LeaseSettingsSection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList; import org.jclouds.vcloud.director.v1_5.domain.References; -import org.jclouds.vcloud.director.v1_5.domain.RelocateParams; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; +import org.jclouds.vcloud.director.v1_5.domain.dmtf.Envelope; +import org.jclouds.vcloud.director.v1_5.domain.params.RelocateParams; +import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection; /** * Provides synchronous access to {@link VAppTemplate} objects. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcAsyncClient.java index 1a27f482c9..5f5e203c05 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcAsyncClient.java @@ -35,17 +35,17 @@ import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.binders.BindToXMLPayload; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; -import org.jclouds.vcloud.director.v1_5.domain.CaptureVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.CloneMediaParams; -import org.jclouds.vcloud.director.v1_5.domain.CloneVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.CloneVAppTemplateParams; -import org.jclouds.vcloud.director.v1_5.domain.ComposeVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.InstantiateVAppParams; import org.jclouds.vcloud.director.v1_5.domain.Media; -import org.jclouds.vcloud.director.v1_5.domain.UploadVAppTemplateParams; import org.jclouds.vcloud.director.v1_5.domain.VApp; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.domain.Vdc; +import org.jclouds.vcloud.director.v1_5.domain.params.CaptureVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppTemplateParams; +import org.jclouds.vcloud.director.v1_5.domain.params.ComposeVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.InstantiateVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.UploadVAppTemplateParams; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; import com.google.common.util.concurrent.ListenableFuture; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcClient.java index d80c0ba680..b496e60dad 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcClient.java @@ -23,17 +23,17 @@ import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.vcloud.director.v1_5.domain.CaptureVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.CloneMediaParams; -import org.jclouds.vcloud.director.v1_5.domain.CloneVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.CloneVAppTemplateParams; -import org.jclouds.vcloud.director.v1_5.domain.ComposeVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.InstantiateVAppParams; import org.jclouds.vcloud.director.v1_5.domain.Media; -import org.jclouds.vcloud.director.v1_5.domain.UploadVAppTemplateParams; import org.jclouds.vcloud.director.v1_5.domain.VApp; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.domain.Vdc; +import org.jclouds.vcloud.director.v1_5.domain.params.CaptureVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppTemplateParams; +import org.jclouds.vcloud.director.v1_5.domain.params.ComposeVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.InstantiateVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.UploadVAppTemplateParams; /** * Provides synchronous access to a vDC. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogAsyncClient.java index 418c09358f..f2309d28c6 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogAsyncClient.java @@ -39,7 +39,7 @@ import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog; import org.jclouds.vcloud.director.v1_5.domain.Owner; -import org.jclouds.vcloud.director.v1_5.domain.PublishCatalogParams; +import org.jclouds.vcloud.director.v1_5.domain.params.PublishCatalogParams; import org.jclouds.vcloud.director.v1_5.features.CatalogAsyncClient; import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClient.java index 5cffad6c3b..c4c9d4308c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClient.java @@ -25,7 +25,7 @@ import org.jclouds.concurrent.Timeout; import org.jclouds.rest.annotations.Delegate; import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog; import org.jclouds.vcloud.director.v1_5.domain.Owner; -import org.jclouds.vcloud.director.v1_5.domain.PublishCatalogParams; +import org.jclouds.vcloud.director.v1_5.domain.params.PublishCatalogParams; import org.jclouds.vcloud.director.v1_5.features.CatalogClient; import org.jclouds.vcloud.director.v1_5.features.MetadataClient; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkAsyncClient.java index 883a8f4a85..31c553ee04 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkAsyncClient.java @@ -36,9 +36,9 @@ import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.binders.BindToXMLPayload; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; -import org.jclouds.vcloud.director.v1_5.domain.ExternalNetwork; -import org.jclouds.vcloud.director.v1_5.domain.OrgNetwork; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.domain.network.ExternalNetwork; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork; import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient; import org.jclouds.vcloud.director.v1_5.features.NetworkAsyncClient; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClient.java index 01e4884ebc..a40a17ccc1 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClient.java @@ -23,9 +23,9 @@ import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.vcloud.director.v1_5.domain.Network; -import org.jclouds.vcloud.director.v1_5.domain.OrgNetwork; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.domain.network.Network; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork; import org.jclouds.vcloud.director.v1_5.features.MetadataClient; import org.jclouds.vcloud.director.v1_5.features.NetworkClient; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgAsyncClient.java index 11c303cda9..7fb8f1beb9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgAsyncClient.java @@ -35,14 +35,14 @@ import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.binders.BindToXMLPayload; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; -import org.jclouds.vcloud.director.v1_5.domain.AdminOrg; -import org.jclouds.vcloud.director.v1_5.domain.OrgEmailSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgGeneralSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgLdapSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgLeaseSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgPasswordPolicySettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgVAppTemplateLeaseSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.AdminOrg; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgEmailSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgGeneralSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLeaseSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgPasswordPolicySettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgVAppTemplateLeaseSettings; import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient; import org.jclouds.vcloud.director.v1_5.features.OrgAsyncClient; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClient.java index ac86ada421..89a11cb38a 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClient.java @@ -23,14 +23,14 @@ import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; import org.jclouds.rest.annotations.Delegate; -import org.jclouds.vcloud.director.v1_5.domain.AdminOrg; -import org.jclouds.vcloud.director.v1_5.domain.OrgEmailSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgGeneralSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgLdapSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgLeaseSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgPasswordPolicySettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgVAppTemplateLeaseSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.AdminOrg; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgEmailSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgGeneralSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLeaseSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgPasswordPolicySettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgVAppTemplateLeaseSettings; import org.jclouds.vcloud.director.v1_5.features.MetadataClient; import org.jclouds.vcloud.director.v1_5.features.OrgClient; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgReferenceToTaskListEndpoint.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgReferenceToTaskListEndpoint.java index 0bbc020763..5cef088899 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgReferenceToTaskListEndpoint.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgReferenceToTaskListEndpoint.java @@ -26,7 +26,7 @@ import javax.inject.Singleton; import org.jclouds.rest.ResourceNotFoundException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.Link; -import org.jclouds.vcloud.director.v1_5.domain.Org; +import org.jclouds.vcloud.director.v1_5.domain.org.Org; import org.jclouds.vcloud.director.v1_5.features.OrgClient; import com.google.common.base.Function; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/EntityPredicates.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/EntityPredicates.java index 8d6f07e629..bdd71dc257 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/EntityPredicates.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/EntityPredicates.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; -import org.jclouds.vcloud.director.v1_5.domain.EntityType; +import org.jclouds.vcloud.director.v1_5.domain.Entity; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; @@ -41,7 +41,7 @@ public class EntityPredicates { * @param name value of the name attribute of the entity * @return predicate that will match entities of the given name */ - public static Predicate nameEquals(final String name) { + public static Predicate nameEquals(final String name) { checkNotNull(name, "name must be defined"); return new Predicate() { @@ -64,7 +64,7 @@ public class EntityPredicates { * @param name prefix of the name attribute of the entity * @return predicate that will match entities with names starting with the given prefix */ - public static Predicate nameStartsWith(final String prefix) { + public static Predicate nameStartsWith(final String prefix) { checkNotNull(prefix, "prefix must be defined"); return new Predicate() { @@ -88,7 +88,7 @@ public class EntityPredicates { * @param names collection of values for the name attribute of the entity * @return predicate that will match entities with names starting with the given prefix */ - public static Predicate nameIn(final Iterable names) { + public static Predicate nameIn(final Iterable names) { checkNotNull(names, "names must be defined"); return new Predicate() { @@ -113,7 +113,7 @@ public class EntityPredicates { * @return predicate that will match entities of the given type * @see VCloudDirectorMediaType */ - public static Predicate typeEquals(final String type) { + public static Predicate typeEquals(final String type) { checkNotNull(type, "type must be defined"); return new Predicate() { @@ -137,7 +137,7 @@ public class EntityPredicates { * @return predicate that will match entities with the given URI * @see VCloudDirectorMediaType */ - public static Predicate hrefEquals(final URI href) { + public static Predicate hrefEquals(final URI href) { checkNotNull(href, "href must be defined"); return new Predicate() { diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/AbstractVAppClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/AbstractVAppClientLiveTest.java index b74fcf888a..df302c2c27 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/AbstractVAppClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/AbstractVAppClientLiveTest.java @@ -37,12 +37,12 @@ import org.jclouds.dmtf.cim.CimBoolean; import org.jclouds.dmtf.cim.CimString; import org.jclouds.dmtf.cim.CimUnsignedInt; import org.jclouds.dmtf.cim.CimUnsignedLong; -import org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection; -import org.jclouds.vcloud.director.v1_5.domain.RasdItem; import org.jclouds.vcloud.director.v1_5.domain.RasdItemsList; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status; +import org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status; +import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.VApp; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/HttpClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/HttpClientLiveTest.java index 5f648123cb..01a27187df 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/HttpClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/HttpClientLiveTest.java @@ -30,8 +30,8 @@ import org.jclouds.crypto.CryptoStreams; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.util.Strings2; -import org.jclouds.vcloud.director.v1_5.domain.OrgList; import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgList; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.jclouds.xml.internal.JAXBParser; import org.testng.annotations.Test; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/domain/Checks.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/domain/Checks.java index b637c229ef..15b9f8a2dd 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/domain/Checks.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/domain/Checks.java @@ -57,12 +57,50 @@ import org.jclouds.dmtf.ovf.SectionType; import org.jclouds.dmtf.ovf.StartupSection; import org.jclouds.dmtf.ovf.environment.EnvironmentType; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; -import org.jclouds.vcloud.director.v1_5.domain.CustomOrgLdapSettings.AuthenticationMechanism; -import org.jclouds.vcloud.director.v1_5.domain.CustomOrgLdapSettings.ConnectorType; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnection.IpAddressAllocationMode; -import org.jclouds.vcloud.director.v1_5.domain.OrgLdapSettings.LdapMode; +import org.jclouds.vcloud.director.v1_5.domain.dmtf.Envelope; +import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem; +import org.jclouds.vcloud.director.v1_5.domain.dmtf.VirtualSystem; +import org.jclouds.vcloud.director.v1_5.domain.network.ExternalNetwork; +import org.jclouds.vcloud.director.v1_5.domain.network.IpAddresses; +import org.jclouds.vcloud.director.v1_5.domain.network.IpRange; +import org.jclouds.vcloud.director.v1_5.domain.network.IpRanges; +import org.jclouds.vcloud.director.v1_5.domain.network.IpScope; +import org.jclouds.vcloud.director.v1_5.domain.network.Network; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkFeatures; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkServiceType; +import org.jclouds.vcloud.director.v1_5.domain.network.RouterInfo; +import org.jclouds.vcloud.director.v1_5.domain.network.SyslogServerSettings; +import org.jclouds.vcloud.director.v1_5.domain.network.VAppNetworkConfiguration; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection.IpAddressAllocationMode; +import org.jclouds.vcloud.director.v1_5.domain.org.AdminOrg; +import org.jclouds.vcloud.director.v1_5.domain.org.CustomOrgLdapSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.Org; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgEmailSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgGeneralSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapGroupAttributes; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapUserAttributes; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLeaseSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgPasswordPolicySettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgVAppTemplateLeaseSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.CustomOrgLdapSettings.AuthenticationMechanism; +import org.jclouds.vcloud.director.v1_5.domain.org.CustomOrgLdapSettings.ConnectorType; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapSettings.LdapMode; +import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams; import org.jclouds.vcloud.director.v1_5.domain.query.ContainerType; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecordType; +import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection; +import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection; +import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection; +import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection; import com.beust.jcommander.internal.Maps; import com.google.common.base.Splitter; @@ -75,11 +113,11 @@ import com.google.common.net.InetAddresses; */ public class Checks { - public static void checkResourceEntityType(ResourceEntityType resourceEntity) { + public static void checkResourceEntityType(ResourceEntity resourceEntity) { checkResourceEntityType(resourceEntity, true); } - public static void checkResourceEntityType(ResourceEntityType resourceEntity, boolean ready) { + public static void checkResourceEntityType(ResourceEntity resourceEntity, boolean ready) { // Check optional fields // NOTE status cannot be checked (TODO: doesn't status have a range of valid values?) Set files = resourceEntity.getFiles(); @@ -91,7 +129,7 @@ public class Checks { checkEntityType(resourceEntity); } - public static void checkEntityType(EntityType entity) { + public static void checkEntityType(Entity entity) { // Check required fields assertNotNull(entity.getName(), String.format(NOT_NULL_OBJ_FIELD_FMT, "Name", "EntityType")); @@ -139,18 +177,18 @@ public class Checks { * * @see #checkResourceType(ResourceType, Collection) */ - public static void checkResourceType(ResourceType resource) { + public static void checkResourceType(Resource resource) { checkResourceType(resource, VCloudDirectorMediaType.ALL); } /** * @see #checkResourceType(ResourceType, Collection) */ - public static void checkResourceType(ResourceType resource, String type) { + public static void checkResourceType(Resource resource, String type) { checkResourceType(resource, ImmutableSet.of(type)); } - public static void checkResourceType(ResourceType resource, Collection validTypes) { + public static void checkResourceType(Resource resource, Collection validTypes) { // Check optional fields URI href = resource.getHref(); if (href != null) checkHref(href); @@ -331,7 +369,7 @@ public class Checks { checkCatalogType(catalog); } - public static void checkCatalogType(CatalogType catalog) { + public static void checkCatalogType(Catalog catalog) { // Check optional elements/attributes Owner owner = catalog.getOwner(); if (owner != null) checkOwner(owner); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientExpectTest.java index 0335daf5ad..cbc0ffbdd9 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientExpectTest.java @@ -27,7 +27,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.vcloud.director.v1_5.VCloudDirectorClientExpectTest; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.CatalogItem; -import org.jclouds.vcloud.director.v1_5.domain.CatalogType; +import org.jclouds.vcloud.director.v1_5.domain.Catalog; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; @@ -66,7 +66,7 @@ public class CatalogClientExpectTest extends VCloudDirectorClientExpectTest { VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, catalogRequest, catalogResponse); - CatalogType expected = catalog(); + Catalog expected = catalog(); URI catalogURI = URI.create(endpoint + "/catalog/7212e451-76e1-4631-b2de-ba1dfd8080e4"); assertEquals(client.getCatalogClient().getCatalog(catalogURI), expected); @@ -375,8 +375,8 @@ public class CatalogClientExpectTest extends VCloudDirectorClientExpectTest { assertEquals(client.getCatalogClient().getCatalogItemMetadataClient().deleteMetadataEntry(catalogItemURI, "KEY"), expected); } - public static final CatalogType catalog() { - return CatalogType.builder() + public static final Catalog catalog() { + return Catalog.builder() .name("QunyingTestCatalog") .type("application/vnd.vmware.vcloud.catalog+xml") .id("urn:vcloud:catalog:7212e451-76e1-4631-b2de-ba1dfd8080e4") diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java index bb92d538d3..ddf7c76c24 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java @@ -38,7 +38,7 @@ import static org.testng.Assert.assertTrue; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog; import org.jclouds.vcloud.director.v1_5.domain.CatalogItem; -import org.jclouds.vcloud.director.v1_5.domain.CatalogType; +import org.jclouds.vcloud.director.v1_5.domain.Catalog; import org.jclouds.vcloud.director.v1_5.domain.Checks; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Media; @@ -136,7 +136,7 @@ public class CatalogClientLiveTest extends BaseVCloudDirectorClientLiveTest { @Test(description = "GET /catalog/{id}") public void testGetCatalog() { - CatalogType catalog = catalogClient.getCatalog(catalogRef.getHref()); + Catalog catalog = catalogClient.getCatalog(catalogRef.getHref()); assertNotNull(catalog); // Double check it's pointing at the correct catalog assertEquals(catalog.getHref(), catalogRef.getHref()); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java index be405a174c..d485fc1614 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientExpectTest.java @@ -26,12 +26,12 @@ import java.net.URI; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; -import org.jclouds.vcloud.director.v1_5.domain.CloneMediaParams; import org.jclouds.vcloud.director.v1_5.domain.Error; import org.jclouds.vcloud.director.v1_5.domain.File; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Media; import org.jclouds.vcloud.director.v1_5.domain.Media.ImageType; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams; import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientLiveTest.java index 4776eb7557..e0e7c16440 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/MediaClientLiveTest.java @@ -52,7 +52,6 @@ import java.util.Set; import org.jclouds.io.Payloads; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.Checks; -import org.jclouds.vcloud.director.v1_5.domain.CloneMediaParams; import org.jclouds.vcloud.director.v1_5.domain.File; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Media; @@ -63,6 +62,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.Vdc; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates; import org.testng.annotations.AfterClass; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java index 64842221e4..df628d4e62 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientExpectTest.java @@ -26,22 +26,22 @@ import java.net.URI; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; -import org.jclouds.vcloud.director.v1_5.domain.DhcpService; import org.jclouds.vcloud.director.v1_5.domain.Error; -import org.jclouds.vcloud.director.v1_5.domain.IpAddresses; -import org.jclouds.vcloud.director.v1_5.domain.IpRange; -import org.jclouds.vcloud.director.v1_5.domain.IpRanges; -import org.jclouds.vcloud.director.v1_5.domain.IpScope; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; -import org.jclouds.vcloud.director.v1_5.domain.Network; -import org.jclouds.vcloud.director.v1_5.domain.Network.FenceMode; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfiguration; -import org.jclouds.vcloud.director.v1_5.domain.NetworkFeatures; -import org.jclouds.vcloud.director.v1_5.domain.OrgNetwork; -import org.jclouds.vcloud.director.v1_5.domain.SyslogServerSettings; +import org.jclouds.vcloud.director.v1_5.domain.network.DhcpService; +import org.jclouds.vcloud.director.v1_5.domain.network.IpAddresses; +import org.jclouds.vcloud.director.v1_5.domain.network.IpRange; +import org.jclouds.vcloud.director.v1_5.domain.network.IpRanges; +import org.jclouds.vcloud.director.v1_5.domain.network.IpScope; +import org.jclouds.vcloud.director.v1_5.domain.network.Network; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkFeatures; +import org.jclouds.vcloud.director.v1_5.domain.network.SyslogServerSettings; +import org.jclouds.vcloud.director.v1_5.domain.network.Network.FenceMode; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork; import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientLiveTest.java index 7f98d5df26..ad50ecd926 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/NetworkClientLiveTest.java @@ -34,9 +34,9 @@ import org.jclouds.vcloud.director.v1_5.domain.Checks; import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; -import org.jclouds.vcloud.director.v1_5.domain.Network; -import org.jclouds.vcloud.director.v1_5.domain.OrgNetwork; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.domain.network.Network; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java index 2bcf6eb09e..70008826d1 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientExpectTest.java @@ -31,9 +31,9 @@ import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; -import org.jclouds.vcloud.director.v1_5.domain.Org; -import org.jclouds.vcloud.director.v1_5.domain.OrgList; import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.domain.org.Org; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgList; import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.Test; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientLiveTest.java index 6630bd1cdd..33dd982ad6 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientLiveTest.java @@ -34,13 +34,13 @@ import java.net.URI; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog; -import org.jclouds.vcloud.director.v1_5.domain.ControlAccessParams; import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; -import org.jclouds.vcloud.director.v1_5.domain.Org; -import org.jclouds.vcloud.director.v1_5.domain.OrgList; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.domain.org.Org; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgList; +import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientLiveTest.java index ceff2b4b55..9230ecf877 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientLiveTest.java @@ -36,7 +36,7 @@ import java.util.Set; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.Entity; import org.jclouds.vcloud.director.v1_5.domain.Link; -import org.jclouds.vcloud.director.v1_5.domain.ResourceType; +import org.jclouds.vcloud.director.v1_5.domain.Resource; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.VApp; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; @@ -232,9 +232,9 @@ public class QueryClientLiveTest extends BaseVCloudDirectorClientLiveTest { return hrefs; } - private Set toHrefs(Iterable resources) { + private Set toHrefs(Iterable resources) { Set hrefs = new LinkedHashSet(); - for (ResourceType resource : resources) { + for (Resource resource : resources) { hrefs.add(resource.getHref()); } return hrefs; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientLiveTest.java index 3db51c5ee8..674ef8da77 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/TaskClientLiveTest.java @@ -25,11 +25,11 @@ import static org.testng.Assert.assertNotNull; import java.net.URI; -import org.jclouds.vcloud.director.v1_5.domain.OrgList; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.TasksList; import org.jclouds.vcloud.director.v1_5.domain.VApp; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgList; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java index b54e0626cb..700fd453ca 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientExpectTest.java @@ -25,31 +25,31 @@ import java.net.URI; import org.jclouds.dmtf.ovf.NetworkSection; import org.jclouds.dmtf.ovf.StartupSection; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; -import org.jclouds.vcloud.director.v1_5.domain.ControlAccessParams; -import org.jclouds.vcloud.director.v1_5.domain.DeployVAppParams; import org.jclouds.vcloud.director.v1_5.domain.Error; -import org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection; -import org.jclouds.vcloud.director.v1_5.domain.LeaseSettingsSection; import org.jclouds.vcloud.director.v1_5.domain.Link; -import org.jclouds.vcloud.director.v1_5.domain.MediaInsertOrEjectParams; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection; -import org.jclouds.vcloud.director.v1_5.domain.OperatingSystemSection; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList; -import org.jclouds.vcloud.director.v1_5.domain.RasdItem; import org.jclouds.vcloud.director.v1_5.domain.RasdItemsList; -import org.jclouds.vcloud.director.v1_5.domain.RecomposeVAppParams; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.domain.RelocateParams; -import org.jclouds.vcloud.director.v1_5.domain.RuntimeInfoSection; import org.jclouds.vcloud.director.v1_5.domain.ScreenTicket; import org.jclouds.vcloud.director.v1_5.domain.Task; -import org.jclouds.vcloud.director.v1_5.domain.UndeployVAppParams; import org.jclouds.vcloud.director.v1_5.domain.VApp; -import org.jclouds.vcloud.director.v1_5.domain.VirtualHardwareSection; import org.jclouds.vcloud.director.v1_5.domain.VmPendingQuestion; import org.jclouds.vcloud.director.v1_5.domain.VmQuestionAnswer; +import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem; +import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams; +import org.jclouds.vcloud.director.v1_5.domain.params.DeployVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.MediaInsertOrEjectParams; +import org.jclouds.vcloud.director.v1_5.domain.params.RecomposeVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.RelocateParams; +import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection; +import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection; +import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection; +import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection; import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient; import org.testng.annotations.BeforeClass; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientLiveTest.java index e5051647ba..476fa75c4e 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppClientLiveTest.java @@ -80,40 +80,40 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.AccessSetting; import org.jclouds.vcloud.director.v1_5.domain.Checks; -import org.jclouds.vcloud.director.v1_5.domain.ControlAccessParams; -import org.jclouds.vcloud.director.v1_5.domain.DeployVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection; -import org.jclouds.vcloud.director.v1_5.domain.LeaseSettingsSection; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Media; -import org.jclouds.vcloud.director.v1_5.domain.MediaInsertOrEjectParams; import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnection.IpAddressAllocationMode; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection; -import org.jclouds.vcloud.director.v1_5.domain.OperatingSystemSection; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList; -import org.jclouds.vcloud.director.v1_5.domain.RasdItem; import org.jclouds.vcloud.director.v1_5.domain.RasdItemsList; -import org.jclouds.vcloud.director.v1_5.domain.RecomposeVAppParams; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.domain.RelocateParams; -import org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status; -import org.jclouds.vcloud.director.v1_5.domain.RuntimeInfoSection; +import org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status; import org.jclouds.vcloud.director.v1_5.domain.ScreenTicket; import org.jclouds.vcloud.director.v1_5.domain.Task; -import org.jclouds.vcloud.director.v1_5.domain.UndeployVAppParams; import org.jclouds.vcloud.director.v1_5.domain.VApp; -import org.jclouds.vcloud.director.v1_5.domain.VirtualHardwareSection; import org.jclouds.vcloud.director.v1_5.domain.VmPendingQuestion; import org.jclouds.vcloud.director.v1_5.domain.VmQuestionAnswer; import org.jclouds.vcloud.director.v1_5.domain.VmQuestionAnswerChoice; +import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection.IpAddressAllocationMode; +import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams; +import org.jclouds.vcloud.director.v1_5.domain.params.DeployVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.MediaInsertOrEjectParams; +import org.jclouds.vcloud.director.v1_5.domain.params.RecomposeVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.RelocateParams; +import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecordType; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection; +import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection; +import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection; +import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java index e42ea30c9e..c78a3f5746 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java @@ -41,31 +41,31 @@ import java.util.TimeZone; import org.jclouds.rest.ResourceNotFoundException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; -import org.jclouds.vcloud.director.v1_5.domain.CustomizationSection; -import org.jclouds.vcloud.director.v1_5.domain.FirewallRule; -import org.jclouds.vcloud.director.v1_5.domain.FirewallRuleProtocols; -import org.jclouds.vcloud.director.v1_5.domain.FirewallService; -import org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection; -import org.jclouds.vcloud.director.v1_5.domain.IpRange; -import org.jclouds.vcloud.director.v1_5.domain.IpRanges; -import org.jclouds.vcloud.director.v1_5.domain.IpScope; -import org.jclouds.vcloud.director.v1_5.domain.LeaseSettingsSection; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; -import org.jclouds.vcloud.director.v1_5.domain.NatOneToOneVmRule; -import org.jclouds.vcloud.director.v1_5.domain.NatRule; -import org.jclouds.vcloud.director.v1_5.domain.NatService; -import org.jclouds.vcloud.director.v1_5.domain.Network.FenceMode; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfiguration; -import org.jclouds.vcloud.director.v1_5.domain.NetworkFeatures; +import org.jclouds.vcloud.director.v1_5.domain.network.FirewallRule; +import org.jclouds.vcloud.director.v1_5.domain.network.FirewallRuleProtocols; +import org.jclouds.vcloud.director.v1_5.domain.network.FirewallService; +import org.jclouds.vcloud.director.v1_5.domain.network.IpRange; +import org.jclouds.vcloud.director.v1_5.domain.network.IpRanges; +import org.jclouds.vcloud.director.v1_5.domain.network.IpScope; +import org.jclouds.vcloud.director.v1_5.domain.network.NatOneToOneVmRule; +import org.jclouds.vcloud.director.v1_5.domain.network.NatRule; +import org.jclouds.vcloud.director.v1_5.domain.network.NatService; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkFeatures; +import org.jclouds.vcloud.director.v1_5.domain.network.VAppNetworkConfiguration; +import org.jclouds.vcloud.director.v1_5.domain.network.Network.FenceMode; +import org.jclouds.vcloud.director.v1_5.domain.params.RelocateParams; +import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.domain.RelocateParams; import org.jclouds.vcloud.director.v1_5.domain.Task; -import org.jclouds.vcloud.director.v1_5.domain.VAppNetworkConfiguration; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.testng.annotations.Test; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java index 674084686f..85b5607211 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java @@ -48,25 +48,25 @@ import java.util.Set; import org.jclouds.dmtf.ovf.NetworkSection; import org.jclouds.vcloud.director.v1_5.AbstractVAppClientLiveTest; import org.jclouds.vcloud.director.v1_5.domain.Checks; -import org.jclouds.vcloud.director.v1_5.domain.CloneVAppTemplateParams; -import org.jclouds.vcloud.director.v1_5.domain.CustomizationSection; -import org.jclouds.vcloud.director.v1_5.domain.Envelope; -import org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection; -import org.jclouds.vcloud.director.v1_5.domain.LeaseSettingsSection; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Link.Rel; import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnection.IpAddressAllocationMode; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection; +import org.jclouds.vcloud.director.v1_5.domain.dmtf.Envelope; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection.IpAddressAllocationMode; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppTemplateParams; +import org.jclouds.vcloud.director.v1_5.domain.params.RelocateParams; +import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection; +import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.References; -import org.jclouds.vcloud.director.v1_5.domain.RelocateParams; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.testng.annotations.AfterClass; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java index 37872d3518..1039da78a5 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java @@ -28,21 +28,21 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.Capabilities; import org.jclouds.vcloud.director.v1_5.domain.CapacityWithUsage; -import org.jclouds.vcloud.director.v1_5.domain.CaptureVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.CloneMediaParams; -import org.jclouds.vcloud.director.v1_5.domain.CloneVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.CloneVAppTemplateParams; -import org.jclouds.vcloud.director.v1_5.domain.ComposeVAppParams; import org.jclouds.vcloud.director.v1_5.domain.ComputeCapacity; import org.jclouds.vcloud.director.v1_5.domain.Error; -import org.jclouds.vcloud.director.v1_5.domain.InstantiateVAppTemplateParams; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Media; import org.jclouds.vcloud.director.v1_5.domain.Media.ImageType; +import org.jclouds.vcloud.director.v1_5.domain.params.CaptureVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppTemplateParams; +import org.jclouds.vcloud.director.v1_5.domain.params.ComposeVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.InstantiateVAppTemplateParams; +import org.jclouds.vcloud.director.v1_5.domain.params.UploadVAppTemplateParams; import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.domain.UploadVAppTemplateParams; import org.jclouds.vcloud.director.v1_5.domain.VApp; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.domain.Vdc; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientLiveTest.java index 4db5a17c49..4cbc4c783a 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientLiveTest.java @@ -31,24 +31,24 @@ import static org.testng.Assert.fail; import java.util.Map; import java.util.Set; -import org.jclouds.vcloud.director.v1_5.domain.CaptureVAppParams; import org.jclouds.vcloud.director.v1_5.domain.Checks; -import org.jclouds.vcloud.director.v1_5.domain.CloneVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.CloneVAppTemplateParams; -import org.jclouds.vcloud.director.v1_5.domain.ComposeVAppParams; -import org.jclouds.vcloud.director.v1_5.domain.InstantiateVAppTemplateParams; -import org.jclouds.vcloud.director.v1_5.domain.InstantiationParams; import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; -import org.jclouds.vcloud.director.v1_5.domain.Network.FenceMode; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfiguration; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration; +import org.jclouds.vcloud.director.v1_5.domain.network.VAppNetworkConfiguration; +import org.jclouds.vcloud.director.v1_5.domain.network.Network.FenceMode; +import org.jclouds.vcloud.director.v1_5.domain.params.CaptureVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppTemplateParams; +import org.jclouds.vcloud.director.v1_5.domain.params.ComposeVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.params.InstantiateVAppTemplateParams; +import org.jclouds.vcloud.director.v1_5.domain.params.InstantiationParams; +import org.jclouds.vcloud.director.v1_5.domain.params.UploadVAppTemplateParams; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType; +import org.jclouds.vcloud.director.v1_5.domain.ResourceEntity; import org.jclouds.vcloud.director.v1_5.domain.Task; -import org.jclouds.vcloud.director.v1_5.domain.UploadVAppTemplateParams; import org.jclouds.vcloud.director.v1_5.domain.VApp; -import org.jclouds.vcloud.director.v1_5.domain.VAppNetworkConfiguration; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.domain.Vdc; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; @@ -308,8 +308,8 @@ public class VdcClientLiveTest extends BaseVCloudDirectorClientLiveTest { assertEquals(uploadedVAppTemplate.getName(), name, String.format(OBJ_FIELD_EQ, "VAppTemplate", "name", name, uploadedVAppTemplate.getName())); - ResourceEntityType.Status expectedStatus = ResourceEntityType.Status.UNRESOLVED; - ResourceEntityType.Status actualStatus = uploadedVAppTemplate.getStatus(); + ResourceEntity.Status expectedStatus = ResourceEntity.Status.UNRESOLVED; + ResourceEntity.Status actualStatus = uploadedVAppTemplate.getStatus(); assertEquals(actualStatus, expectedStatus, String.format(OBJ_FIELD_EQ, "VAppTemplate", "status", expectedStatus, actualStatus)); diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClientExpectTest.java index 4d2b5433a0..ad2ab171a6 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClientExpectTest.java @@ -27,9 +27,9 @@ import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Owner; -import org.jclouds.vcloud.director.v1_5.domain.PublishCatalogParams; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.domain.params.PublishCatalogParams; import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.testng.annotations.Test; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClientLiveTest.java index 957f6b331d..fbe9820376 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClientLiveTest.java @@ -38,9 +38,9 @@ import org.jclouds.vcloud.director.v1_5.domain.Checks; import org.jclouds.vcloud.director.v1_5.domain.Error; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.Owner; -import org.jclouds.vcloud.director.v1_5.domain.PublishCatalogParams; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.User; +import org.jclouds.vcloud.director.v1_5.domain.params.PublishCatalogParams; import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.AfterClass; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClientExpectTest.java index 7ff0c808d3..77ed62c295 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClientExpectTest.java @@ -25,9 +25,9 @@ import java.net.URI; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; import org.jclouds.vcloud.director.v1_5.domain.Link; -import org.jclouds.vcloud.director.v1_5.domain.OrgNetwork; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork; import org.jclouds.vcloud.director.v1_5.features.NetworkClientExpectTest; import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.testng.annotations.Test; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClientLiveTest.java index 0ecbd05541..1b96b13bcc 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClientLiveTest.java @@ -31,16 +31,16 @@ import static org.testng.Assert.fail; import java.util.Collections; import org.jclouds.vcloud.director.v1_5.domain.Checks; -import org.jclouds.vcloud.director.v1_5.domain.ExternalNetwork; -import org.jclouds.vcloud.director.v1_5.domain.IpScope; -import org.jclouds.vcloud.director.v1_5.domain.Network; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfiguration; -import org.jclouds.vcloud.director.v1_5.domain.NetworkFeatures; -import org.jclouds.vcloud.director.v1_5.domain.OrgNetwork; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.domain.RouterInfo; -import org.jclouds.vcloud.director.v1_5.domain.SyslogServerSettings; import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.domain.network.ExternalNetwork; +import org.jclouds.vcloud.director.v1_5.domain.network.IpScope; +import org.jclouds.vcloud.director.v1_5.domain.network.Network; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkFeatures; +import org.jclouds.vcloud.director.v1_5.domain.network.RouterInfo; +import org.jclouds.vcloud.director.v1_5.domain.network.SyslogServerSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork; import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.BeforeClass; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClientExpectTest.java index 4c57f0fb25..4fc6b8ac7a 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClientExpectTest.java @@ -24,17 +24,17 @@ import java.net.URI; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; -import org.jclouds.vcloud.director.v1_5.domain.AdminOrg; import org.jclouds.vcloud.director.v1_5.domain.Link; -import org.jclouds.vcloud.director.v1_5.domain.OrgEmailSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgGeneralSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgLdapSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgLeaseSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgPasswordPolicySettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgVAppTemplateLeaseSettings; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.domain.SmtpServerSettings; +import org.jclouds.vcloud.director.v1_5.domain.network.SmtpServerSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.AdminOrg; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgEmailSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgGeneralSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLeaseSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgPasswordPolicySettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgVAppTemplateLeaseSettings; import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorAdminClientExpectTest; import org.testng.annotations.Test; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClientLiveTest.java index cb8ee41e50..53e85123cd 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClientLiveTest.java @@ -24,17 +24,17 @@ import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.R import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import org.jclouds.vcloud.director.v1_5.domain.AdminOrg; import org.jclouds.vcloud.director.v1_5.domain.Checks; -import org.jclouds.vcloud.director.v1_5.domain.OrgEmailSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgGeneralSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgLdapSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgLeaseSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgPasswordPolicySettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgSettings; -import org.jclouds.vcloud.director.v1_5.domain.OrgVAppTemplateLeaseSettings; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.domain.SmtpServerSettings; +import org.jclouds.vcloud.director.v1_5.domain.network.SmtpServerSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.AdminOrg; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgEmailSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgGeneralSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLeaseSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgPasswordPolicySettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgSettings; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgVAppTemplateLeaseSettings; import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.BeforeClass; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupClientLiveTest.java index 3490762c10..e1213e9571 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupClientLiveTest.java @@ -26,8 +26,8 @@ import static org.testng.Assert.fail; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.domain.Checks; import org.jclouds.vcloud.director.v1_5.domain.Group; -import org.jclouds.vcloud.director.v1_5.domain.OrgLdapSettings; import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgLdapSettings; import org.jclouds.vcloud.director.v1_5.features.admin.GroupClient; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.BeforeClass; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/UserClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/UserClientLiveTest.java index 81ac32bcb0..959893ea9b 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/UserClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/admin/UserClientLiveTest.java @@ -30,9 +30,9 @@ import static org.testng.AssertJUnit.assertFalse; import java.net.URI; import org.jclouds.rest.AuthorizationException; -import org.jclouds.vcloud.director.v1_5.domain.OrgPasswordPolicySettings; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Role.DefaultRoles; +import org.jclouds.vcloud.director.v1_5.domain.org.OrgPasswordPolicySettings; import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken; import org.jclouds.vcloud.director.v1_5.domain.User; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java index 03501d9110..2ebe42c5c4 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorClientLiveTest.java @@ -47,23 +47,23 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminAsyncClient; import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient; -import org.jclouds.vcloud.director.v1_5.domain.InstantiateVAppTemplateParams; -import org.jclouds.vcloud.director.v1_5.domain.InstantiationParams; import org.jclouds.vcloud.director.v1_5.domain.Link; -import org.jclouds.vcloud.director.v1_5.domain.Network; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConfiguration; -import org.jclouds.vcloud.director.v1_5.domain.Org; import org.jclouds.vcloud.director.v1_5.domain.Reference; -import org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status; +import org.jclouds.vcloud.director.v1_5.domain.ResourceEntity.Status; import org.jclouds.vcloud.director.v1_5.domain.Role.DefaultRoles; +import org.jclouds.vcloud.director.v1_5.domain.network.Network; +import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConfiguration; +import org.jclouds.vcloud.director.v1_5.domain.network.VAppNetworkConfiguration; +import org.jclouds.vcloud.director.v1_5.domain.org.Org; +import org.jclouds.vcloud.director.v1_5.domain.params.InstantiateVAppTemplateParams; +import org.jclouds.vcloud.director.v1_5.domain.params.InstantiationParams; +import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams; +import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection; import org.jclouds.vcloud.director.v1_5.domain.RoleReferences; import org.jclouds.vcloud.director.v1_5.domain.Session; import org.jclouds.vcloud.director.v1_5.domain.Task; -import org.jclouds.vcloud.director.v1_5.domain.UndeployVAppParams; import org.jclouds.vcloud.director.v1_5.domain.User; import org.jclouds.vcloud.director.v1_5.domain.VApp; -import org.jclouds.vcloud.director.v1_5.domain.VAppNetworkConfiguration; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.domain.Vdc; import org.jclouds.vcloud.director.v1_5.features.TaskClient;